flake.nix

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

hosts/temperance/programs.nix

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

packages/helix.nix

@@ -42,7 +42,6 @@
     editor = {
       cursorline = false;
       color-modes = true;
-      true-color = true;
       indent-guides.render = true;
       lsp = {
         enable = true;
@@ -55,6 +54,7 @@
         hidden = true;
       };
       line-number = "relative";
+      true-color = true;
       auto-format = true;
       completion-timeout = 5;
       mouse = true;
@@ -86,19 +86,10 @@
         A-r = ":reload";
         A-x = "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 = {
         A-x = "extend_to_line_bounds";
         X = ["extend_line_up" "extend_to_line_bounds"];
-        g = {e = "goto_file_end";};
       };
     };
   };