Compare commits

...

3 commits

3 changed files with 20 additions and 6 deletions

View file

@ -1,20 +1,24 @@
{ {
description = "My NixOS config flake"; description = "My NixOS config flake";
outputs = inputs: let outputs = inputs: let
pkgs = inputs.nixpkgs.legacyPackages.x86_64-linux; inherit (inputs.nixpkgs) lib;
eachSystem = inputs.nixpkgs.lib.genAttrs (import inputs.systems); eachSystem = lib.genAttrs (import inputs.systems);
pkgsFor = inputs.nixpkgs.legacyPackages; pkgsFor = inputs.nixpkgs.legacyPackages;
in { in {
nixosConfigurations = import ./hosts inputs; nixosConfigurations = import ./hosts inputs;
devShells.x86_64-linux.default = pkgs.callPackage ./shell.nix {}; devShells =
lib.mapAttrs (system: pkgs: {
default = pkgs.callPackage ./shell.nix {};
})
pkgsFor;
formatter.x86_64-linux = pkgs.alejandra; formatter.x86_64-linux = inputs.nixpkgs.legacyPackages.x86_64-linux.alejandra;
packages = eachSystem ( packages = eachSystem (
system: { system: {
inherit inherit
(import ./packages { (import ./packages rec {
pkgs = pkgsFor.${system}; pkgs = pkgsFor.${system};
helix = inputs.helix.packages.${pkgs.system}.default; helix = inputs.helix.packages.${pkgs.system}.default;
}) })

View file

@ -47,6 +47,7 @@ in {
nheko nheko
nicotine-plus nicotine-plus
obsidian obsidian
oculante
swww swww
pandoc pandoc
pavucontrol pavucontrol

View file

@ -42,6 +42,7 @@
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;
@ -54,7 +55,6 @@
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,10 +86,19 @@
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";};
}; };
}; };
}; };