highly vibed modularization

flake.nix

@@ -43,7 +43,7 @@
         inherit inputs;
       };
       sharedModules = [
-        ./hosts/common/default.nix
+        ./hosts/base.nix
         stylix.nixosModules.stylix
         home-manager.nixosModules.home-manager
         ({ config, ...}: {
@@ -64,10 +64,10 @@
           inherit pkgs;
           specialArgs = sharedSpecialArgs // {};
           modules = sharedModules ++ [
-            ./hosts/electra/configuration.nix
+            ./hosts/hosts/electra.nix
-            ./hosts/common/workstation.nix
+            ./hosts/workstation.nix
-            ./hosts/common/wm/sway.nix
+            ./hosts/modules/wm/sway/default.nix
-            ./hosts/common/stylix.nix
+            ./hosts/modules/stylix.nix
             home-manager.nixosModules.home-manager
             ({ config, ...}: {
               home-manager.users.alisceon.imports = [
@@ -87,10 +87,10 @@
           inherit pkgs;
           specialArgs = sharedSpecialArgs // {};
           modules = sharedModules ++ [
-            ./hosts/tower/configuration.nix
+            ./hosts/hosts/tower.nix
-            ./hosts/common/workstation.nix
+            ./hosts/workstation.nix
-            ./hosts/common/wm/sway.nix
+            ./hosts/modules/wm/sway/default.nix
-            ./hosts/common/stylix.nix
+            ./hosts/modules/stylix.nix
             home-manager.nixosModules.home-manager
             ({ config, ...}: {
               home-manager.users.alisceon.imports = [
@@ -110,8 +110,8 @@
           inherit pkgs;
           specialArgs = sharedSpecialArgs // {};
           modules = sharedModules ++ [
-            ./hosts/common/server.nix
+            ./hosts/server.nix
-            ./hosts/tesla-nixos/configuration.nix
+            ./hosts/hosts/tesla-nixos.nix
             nix-minecraft.nixosModules.minecraft-servers
             { nixpkgs.overlays = [ inputs.nix-minecraft.overlay ]; }
             home-manager.nixosModules.home-manager
@@ -131,8 +131,8 @@
           inherit pkgs;
           specialArgs = sharedSpecialArgs // {};
           modules = sharedModules ++ [
-            ./hosts/common/server.nix
+            ./hosts/server.nix
-            ./hosts/nuc/configuration.nix
+            ./hosts/hosts/nuc.nix
             home-manager.nixosModules.home-manager
             ({ config, ...}: {
               home-manager.users.alisceon.imports = [

hosts/base.nix

@@ -0,0 +1,6 @@
+{ ... }:
+{
+  imports = [
+    ./default.nix
+  ];
+} # end file

hosts/default.nix

@@ -0,0 +1,6 @@
+{ ... }:
+{
+  imports = [
+    ./common/default.nix
+  ];
+} # end file

hosts/hosts/electra.nix

@@ -0,0 +1,6 @@
+{ ... }:
+{
+  imports = [
+    ../electra/configuration.nix
+  ];
+} # end file

hosts/hosts/nuc.nix

@@ -0,0 +1,6 @@
+{ ... }:
+{
+  imports = [
+    ../nuc/configuration.nix
+  ];
+} # end file

hosts/hosts/tesla-nixos.nix

@@ -0,0 +1,6 @@
+{ ... }:
+{
+  imports = [
+    ../tesla-nixos/configuration.nix
+  ];
+} # end file

hosts/hosts/tower.nix

@@ -0,0 +1,6 @@
+{ ... }:
+{
+  imports = [
+    ../tower/configuration.nix
+  ];
+} # end file

hosts/modules/stylix.nix

@@ -0,0 +1,6 @@
+{ ... }:
+{
+  imports = [
+    ../common/stylix.nix
+  ];
+} # end file

hosts/modules/wm/gnome/default.nix

@@ -0,0 +1,6 @@
+{ ... }:
+{
+  imports = [
+    ../../../common/wm/gnome.nix
+  ];
+} # end file

hosts/modules/wm/sway/default.nix

@@ -0,0 +1,6 @@
+{ ... }:
+{
+  imports = [
+    ../../../common/wm/sway.nix
+  ];
+} # end file

hosts/server.nix

@@ -0,0 +1,6 @@
+{ ... }:
+{
+  imports = [
+    ./common/server.nix
+  ];
+} # end file

hosts/workstation.nix

@@ -0,0 +1,6 @@
+{ ... }:
+{
+  imports = [
+    ./common/workstation.nix
+  ];
+} # end file