Compare commits
No commits in common. "fff25b9905e2a6c4e459e2fda71729f842dce078" and "4e6bb680a3a8e3333995e460bcde4652febd9935" have entirely different histories.
fff25b9905
...
4e6bb680a3
3 changed files with 6 additions and 20 deletions
14
flake.nix
14
flake.nix
|
@ -1,24 +1,20 @@
|
||||||
{
|
{
|
||||||
description = "My NixOS config flake";
|
description = "My NixOS config flake";
|
||||||
outputs = inputs: let
|
outputs = inputs: let
|
||||||
inherit (inputs.nixpkgs) lib;
|
pkgs = inputs.nixpkgs.legacyPackages.x86_64-linux;
|
||||||
eachSystem = lib.genAttrs (import inputs.systems);
|
eachSystem = inputs.nixpkgs.lib.genAttrs (import inputs.systems);
|
||||||
pkgsFor = inputs.nixpkgs.legacyPackages;
|
pkgsFor = inputs.nixpkgs.legacyPackages;
|
||||||
in {
|
in {
|
||||||
nixosConfigurations = import ./hosts inputs;
|
nixosConfigurations = import ./hosts inputs;
|
||||||
|
|
||||||
devShells =
|
devShells.x86_64-linux.default = pkgs.callPackage ./shell.nix {};
|
||||||
lib.mapAttrs (system: pkgs: {
|
|
||||||
default = pkgs.callPackage ./shell.nix {};
|
|
||||||
})
|
|
||||||
pkgsFor;
|
|
||||||
|
|
||||||
formatter.x86_64-linux = inputs.nixpkgs.legacyPackages.x86_64-linux.alejandra;
|
formatter.x86_64-linux = pkgs.alejandra;
|
||||||
|
|
||||||
packages = eachSystem (
|
packages = eachSystem (
|
||||||
system: {
|
system: {
|
||||||
inherit
|
inherit
|
||||||
(import ./packages rec {
|
(import ./packages {
|
||||||
pkgs = pkgsFor.${system};
|
pkgs = pkgsFor.${system};
|
||||||
helix = inputs.helix.packages.${pkgs.system}.default;
|
helix = inputs.helix.packages.${pkgs.system}.default;
|
||||||
})
|
})
|
||||||
|
|
|
@ -47,7 +47,6 @@ in {
|
||||||
nheko
|
nheko
|
||||||
nicotine-plus
|
nicotine-plus
|
||||||
obsidian
|
obsidian
|
||||||
oculante
|
|
||||||
swww
|
swww
|
||||||
pandoc
|
pandoc
|
||||||
pavucontrol
|
pavucontrol
|
||||||
|
|
|
@ -42,7 +42,6 @@
|
||||||
editor = {
|
editor = {
|
||||||
cursorline = false;
|
cursorline = false;
|
||||||
color-modes = true;
|
color-modes = true;
|
||||||
true-color = true;
|
|
||||||
indent-guides.render = true;
|
indent-guides.render = true;
|
||||||
lsp = {
|
lsp = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
@ -55,6 +54,7 @@
|
||||||
hidden = true;
|
hidden = true;
|
||||||
};
|
};
|
||||||
line-number = "relative";
|
line-number = "relative";
|
||||||
|
true-color = true;
|
||||||
auto-format = true;
|
auto-format = true;
|
||||||
completion-timeout = 5;
|
completion-timeout = 5;
|
||||||
mouse = true;
|
mouse = true;
|
||||||
|
@ -86,19 +86,10 @@
|
||||||
A-r = ":reload";
|
A-r = ":reload";
|
||||||
A-x = "extend_to_line_bounds";
|
A-x = "extend_to_line_bounds";
|
||||||
X = ["extend_line_up" "extend_to_line_bounds"];
|
X = ["extend_line_up" "extend_to_line_bounds"];
|
||||||
";" = "flip_selections";
|
|
||||||
"A-;" = "collapse_selection";
|
|
||||||
|
|
||||||
# Kakoune-like config
|
|
||||||
H = "extend_char_left";
|
|
||||||
J = "extend_line_down";
|
|
||||||
K = "extend_line_up";
|
|
||||||
L = "extend_char_right";
|
|
||||||
};
|
};
|
||||||
select = {
|
select = {
|
||||||
A-x = "extend_to_line_bounds";
|
A-x = "extend_to_line_bounds";
|
||||||
X = ["extend_line_up" "extend_to_line_bounds"];
|
X = ["extend_line_up" "extend_to_line_bounds"];
|
||||||
g = {e = "goto_file_end";};
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue