modularize gui

home/modules/baseline.nix

@@ -13,28 +13,18 @@ in {
   config = mkIf cfg.enable {
     xdg.enable = true;
 
-    home = {
-      packages = with pkgs; [
-        calc
-        file
-        git
-        htop
-        killall
-        man-pages
-        man-pages-posix
-        tree
-        units
-        unzip
-        vim
-        zip
-      ];
-    };
-    keyboard = {
-      layout = "us";
-      variant = "altgr-intl";
-    };
-    sessionVariables = {
-      "EDITOR" = mkDefault "vim";
-    };
+    home.packages = with pkgs; [
+      calc
+      file
+      git
+      htop
+      killall
+      man-pages
+      man-pages-posix
+      tree
+      units
+      unzip
+      zip
+    ];
   };
 }

home/modules/gui/autorandr.nix

@@ -18,12 +18,8 @@ in {
         mapAttrs (
           monitorId:
             filterAttrs
-            (k: v:
-              !elem k [
-                #list of options to exclude from this list
-                "fingerprint"
-                "initialI3Workspace"
-                "monitorId"
+            (k: v: !elem k [ #list of options to exclude from this list
+              "fingerprint" "initialI3Workspace" "monitorId"
               ])
         )
         cfg.monitors;

home/modules/gui/default.nix

@@ -51,8 +51,7 @@ with lib; let
           example = 1;
         };
       };
-      config = optionalAttrs setName {
-        # make this better later
+      config = optionalAttrs (setName) { # make this better later
         monitorId = name;
       };
     })

home/modules/gui/polybar.nix

@@ -82,8 +82,7 @@ with lib; {
 
       "bar/secondary" = {
         monitor = head (attrNames (filterAttrs (monitorId: v:
-          !v.primary)
-        config.local.gui.monitors)); # this is bad. will fail if more than 2 monitors. this sets all monitors other than the primary one for this bar.
+            !v.primary) config.local.gui.monitors)); # this is bad. will fail if more than 2 monitors. this sets all monitors other than the primary one for this bar.
         "inherit" = "bar/main";
 
         modules-left = "i3";

home/modules/neovim.nix

@@ -44,8 +44,5 @@ in {
         vim-multiple-cursors
       ];
     };
-    home.sessionVariables = {
-      "EDITOR" = "neovim";
-    };
   };
 }

home/platforms/fabian@posixlycorrect/default.nix

@@ -48,8 +48,13 @@
     username = "fabian";
     homeDirectory = "/home/fabian";
     sessionVariables = {
+      "EDITOR" = "nvim";
       "TERMINAL" = "kitty";
     };
+    keyboard = {
+      layout = "us";
+      variant = "altgr-intl";
+    };
   };
   programs.home-manager.enable = true;
 }