Refactor flake.nix and add key remaps script

- Refactor `flake.nix` to simplify the `outputs` section and remove redundant configurations
- Update `lsp.nix` to use hostname for NixOS and Home Manager configurations.
- Add `key-remaps.nix` script to `dwm` configuration and update `xinitrc.nix` to include it in autostart.
- Comment out non-functional `displayManager.sessionCommands` in `citadel/default.nix`.

flake.nix

@@ -53,61 +53,38 @@
 
     nix-secrets = {
       url = "git+ssh://git@git.bitlab21.com/sam/nix-secrets.git";
-      inputs = { };
+      inputs = {};
     };
   };
 
-  outputs =
+  outputs = {
-    { self
+    self,
-    , nixpkgs
+    nixpkgs,
-    , home-manager
+    home-manager,
-    , ...
+    ...
-    } @ inputs:
+  } @ inputs: let
-    let
     inherit (self) outputs;
     systems = [
       "x86_64-linux"
     ];
     forAllSystems = nixpkgs.lib.genAttrs systems;
     inherit (nixpkgs) lib;
-      configVars = import ./vars { inherit inputs lib; };
+    configVars = import ./vars {inherit inputs lib;};
     specialArgs = {
       inherit
         inputs
         outputs
         configVars
-          ; };
+        ;
-    in
+    };
-    {
+  in {
     packages = forAllSystems (system: import ./pkgs nixpkgs.legacyPackages.${system});
-#formatter = forAllSystems (system: nixpkgs.legacyPackages.${system}.alejandra);
+    overlays = import ./overlays {inherit inputs;};
-      overlays = import ./overlays { inherit inputs; };
     nixosModules = import ./modules/nixos;
     homeManagerModules = import ./modules/home-manager;
 
-
     # System level configs
     nixosConfigurations = {
-        nixdev = nixpkgs.lib.nixosSystem {
-          inherit specialArgs;
-          modules = [
-            ./hosts/nixdev
-            home-manager.nixosModules.home-manager
-            {
-              home-manager.extraSpecialArgs = specialArgs;
-            }
-          ];
-        };
-        fileserver = nixpkgs.lib.nixosSystem {
-          inherit specialArgs;
-          modules = [
-            ./hosts/fileserver
-            home-manager.nixosModules.home-manager
-            {
-              home-manager.extraSpecialArgs = specialArgs;
-            }
-          ];
-        };
       bootstrap = nixpkgs.lib.nixosSystem {
         inherit specialArgs;
         modules = [

home/common/core/nixvim/plugins/lsp.nix

@@ -1,3 +1,7 @@
+{ osConfig , ... }:
+let
+    hostname = osConfig.networking.hostName;
+in
 {
   programs.nixvim.plugins = {
     lsp = {
@@ -10,8 +14,9 @@
           settings = {
             nixpkgs.expr = "import <nixpkgs> { }";
             options = {
-              nixos.expr = "(builtins.getFlake ('git+file://' + toString ./.)).nixosConfigurations.k-on.options";
+              nixos.expr = "(builtins.getFlake \"/etc/nixos\").nixosConfigurations.${hostname}.options";
-              home_manager.expr = "(builtins.getFlake ('git+file://' + toString ./.)).homeConfigurations.'ruixi@k-on'.options";
+              # TODO get home-manager options working when hm imported as submodule
+              # home_manager.expr = "(builtins.getFlake \"github:nix-community/home-manager\").homeConfigurations.${hostname}.options";
             };
           };
         };

home/common/optional/desktop/dwm/default.nix

@@ -32,6 +32,7 @@
     ./scripts/dmenu-wifi.nix
     ./scripts/battery-status.nix
     ./scripts/dmenu-set-wm-class.nix
+    ./scripts/key-remaps.nix
   ];
 
   home.packages = [

home/common/optional/desktop/dwm/scripts/key-remaps.nix

@@ -0,0 +1,11 @@
+{pkgs, ...}: {
+  home.packages = with pkgs; [
+    (writeShellScriptBin "key-remaps" ''
+      ${xorg.xmodmap}/bin/xmodmap -e "keycode 64 = Mode_switch"
+      ${xorg.xmodmap}/bin/xmodmap -e "keycode 43 = h H Left H"
+      ${xorg.xmodmap}/bin/xmodmap -e "keycode 44 = j J Down J"
+      ${xorg.xmodmap}/bin/xmodmap -e "keycode 45 = k K Up K"
+      ${xorg.xmodmap}/bin/xmodmap -e "keycode 46 = l L Right L"
+    '')
+  ];
+}

home/common/optional/desktop/dwm/xinitrc.nix

@@ -1,4 +1,4 @@
-{pkgs, ...}: {
+{...}: {
   # TODO: configure x11 to look in .config/x11
   home.file.".xinitrc" = {
     recursive = true;
@@ -7,7 +7,7 @@
       picom -b --config ~/.config/picom/picom.conf
       xrdb -merge ~/.Xresources
 
-      autostart="clipboard-save dwmblocks feh-wallpaper-changer sxhkd"
+      autostart="clipboard-save dwmblocks feh-wallpaper-changer sxhkd key-remaps"
 
       for program in $autostart; do
       	pidof -sx "$program" || "$program" &

hosts/citadel/default.nix

@@ -77,13 +77,14 @@ in {
       xkb.options = "caps:swapescape";
       dpi = 196;
       upscaleDefaultCursor = true;
-      displayManager.sessionCommands = pkgs.writeShellScriptBin "key-remaps" ''
+  # FIXME this doesnt work for some reason
-      ${pkgs.xorg.xmodmap}/bin/xmodmap -e "keycode 64 = Mode_switch"
+  #     displayManager.sessionCommands = pkgs.writeShellScriptBin "key-remaps" ''
-      ${pkgs.xorg.xmodmap}/bin/xmodmap -e "keycode 43 = h H Left H"
+  #     ${pkgs.xorg.xmodmap}/bin/xmodmap -e "keycode 64 = Mode_switch"
-      ${pkgs.xorg.xmodmap}/bin/xmodmap -e "keycode 44 = j J Down J"
+  #     ${pkgs.xorg.xmodmap}/bin/xmodmap -e "keycode 43 = h H Left H"
-      ${pkgs.xorg.xmodmap}/bin/xmodmap -e "keycode 45 = k K Up K"
+  #     ${pkgs.xorg.xmodmap}/bin/xmodmap -e "keycode 44 = j J Down J"
-      ${pkgs.xorg.xmodmap}/bin/xmodmap -e "keycode 46 = l L Right L"
+  #     ${pkgs.xorg.xmodmap}/bin/xmodmap -e "keycode 45 = k K Up K"
-  '';
+  #     ${pkgs.xorg.xmodmap}/bin/xmodmap -e "keycode 46 = l L Right L"
+  # '';
     };
   };