modules: merge base and nixos

4 files changed, 6 insertions, 7 deletions

diff --git a/hosts/default.nix b/hosts/default.nix
index d059b40..ef269e1 100644
--- a/hosts/default.nix
+++ b/hosts/default.nix
@@ -76,7 +76,7 @@ in {
       };
     };
 
-    nixosModules.getchoo = import ../modules;
+    nixosModules.getchoo = import ../modules/nixos;
   };
 
   perSystem = {
diff --git a/hosts/glados-wsl/default.nix b/hosts/glados-wsl/default.nix
index 9133679..a05f3ea 100644
--- a/hosts/glados-wsl/default.nix
+++ b/hosts/glados-wsl/default.nix
@@ -11,7 +11,7 @@
     wslu
   ];
 
-  getchoo.nixos.networking.enable = false;
+  getchoo.base.networking.enable = false;
 
   wsl = {
     enable = true;
diff --git a/hosts/glados/default.nix b/hosts/glados/default.nix
index b9f6ff9..4aef9e7 100644
--- a/hosts/glados/default.nix
+++ b/hosts/glados/default.nix
@@ -5,12 +5,12 @@ _: {
   ];
 
   getchoo = {
+    base.virtualisation.enable = true;
     desktop.gnome.enable = true;
     hardware = {
       enable = true;
       nvidia.enable = true;
     };
-    nixos.virtualisation.enable = true;
   };
 
   home-manager.users.seth = {
diff --git a/hosts/profiles.nix b/hosts/profiles.nix
index ba49050..21f0a90 100644
--- a/hosts/profiles.nix
+++ b/hosts/profiles.nix
@@ -55,7 +55,7 @@ in {
           };
         };
 
-        getchoo.nixos.enable = true;
+        getchoo.base.enable = true;
         system.stateVersion = "23.05";
       }
     ];
@@ -68,9 +68,8 @@ in {
 
     modules = [
       ragenix.nixosModules.default
-      ../modules/base
-      ../modules/nixos
-      ../modules/server
+      ../modules/nixos/base
+      ../modules/nixos/server
 
       {
         getchoo.server.enable = true;