hosts: housekeeping

Signed-off-by: Amneesh Singh <natto@weirdnatto.in>

hosts/default.nix

@@ -6,19 +6,19 @@ let
     {
       _module.args = globalArgs;
     }
-    ./programs/neovim
+    ./common/programs/neovim
-    ./programs/nix
+    ./common/programs/nix
-    ./programs/zsh
+    ./common/programs/zsh
-    ./programs/gnupg
+    ./common/programs/gnupg
-    ./programs/git
+    ./common/programs/git
-    ./programs/doas
+    ./common/programs/doas
-    ./security
+    ./common/security
   ];
   desktopModules = [
-    ./programs/adb
+    ./common/programs/adb
-    ./programs/dconf
+    ./common/programs/dconf
-    ./services/xserver
+    ./common/services/xserver
-    ./services/pipewire
+    ./common/services/pipewire
   ];
 in
 {
@@ -26,23 +26,21 @@ in
     # Desktop
     okina = nixpkgs.lib.nixosSystem {
       system = "x86_64-linux";
-      modules =
+      modules = [
-        [
+        ./okina
-          ./okina
+      ]
-        ]
+      ++ desktopModules
-        ++ desktopModules
+      ++ commonModules;
-        ++ commonModules;
     };
 
     #Home laptop
     satori = nixpkgs.lib.nixosSystem {
       system = "x86_64-linux";
-      modules =
+      modules = [
-        [
+        ./satori
-          ./satori
+      ]
-        ]
+      ++ desktopModules
-        ++ desktopModules
+      ++ commonModules;
-        ++ commonModules;
     };
 
     #Home server (RPi4)
@@ -50,7 +48,8 @@ in
       system = "aarch64-linux";
       modules = [
         ./marisa
-      ] ++ commonModules;
+      ]
+      ++ commonModules;
     };
 
     #Oracle Cloud VM
@@ -58,9 +57,10 @@ in
       system = "x86_64-linux";
       modules = [
         ./remilia
-        ./x86builder.nix
+        ./common/x86builder.nix
         inputs.mailserver.nixosModules.mailserver
-      ] ++ commonModules;
+      ]
+      ++ commonModules;
     };
 
     #Oracle Cloud VM
@@ -68,8 +68,9 @@ in
       system = "x86_64-linux";
       modules = [
         ./hina
-        ./x86builder.nix
+        ./common/x86builder.nix
-      ] ++ commonModules;
+      ]
+      ++ commonModules;
     };
 
     #Oracle Cloud VM
@@ -78,7 +79,8 @@ in
       modules = [
         ./suwako
         inputs.mailserver.nixosModules.mailserver
-      ] ++ commonModules;
+      ]
+      ++ commonModules;
     };
   };
 }

hosts/okina/boot.nix

@@ -19,6 +19,7 @@
       ];
       kernelModules = [ ];
     };
+
     kernelParams = [ "i915.force_probe=56a1" ];
 
     #   kernelModules = [ "kvm-intel" "i2c-dev" "ddcci_backlight" ];