5 files changed, 12 insertions, 11 deletions
diff --git a/hosts/atlas/default.nix b/hosts/atlas/default.nix
index 35692bf..69390a5 100644
--- a/hosts/atlas/default.nix
+++ b/hosts/atlas/default.nix
@@ -9,7 +9,7 @@
     hercules-ci-agent.nixosModules.agent-service
   ];
 
-  server.enable = true;
+  getchoo.server.enable = true;
 
   boot = {
     cleanTmpDir = true;
diff --git a/hosts/default.nix b/hosts/default.nix
index 7abd28e..60e84e9 100644
--- a/hosts/default.nix
+++ b/hosts/default.nix
@@ -49,7 +49,7 @@ with inputs; let
           };
         };
 
-        nixos.enable = true;
+        getchoo.nixos.enable = true;
         system.stateVersion = "23.05";
       }
     ];
diff --git a/hosts/glados-wsl/default.nix b/hosts/glados-wsl/default.nix
index 25aaf5e..9133679 100644
--- a/hosts/glados-wsl/default.nix
+++ b/hosts/glados-wsl/default.nix
@@ -11,6 +11,8 @@
     wslu
   ];
 
+  getchoo.nixos.networking.enable = false;
+
   wsl = {
     enable = true;
     defaultUser = "seth";
@@ -28,8 +30,6 @@
     resolved.enable = false;
   };
 
-  nixos.networking.enable = false;
-
   networking.hostName = "glados-wsl";
 
   security = {
diff --git a/hosts/glados/default.nix b/hosts/glados/default.nix
index 26e48a8..b9f6ff9 100644
--- a/hosts/glados/default.nix
+++ b/hosts/glados/default.nix
@@ -4,14 +4,15 @@ _: {
     ./hardware-configuration.nix
   ];
 
-  myHardware = {
-    enable = true;
-    nvidia.enable = true;
+  getchoo = {
+    desktop.gnome.enable = true;
+    hardware = {
+      enable = true;
+      nvidia.enable = true;
+    };
+    nixos.virtualisation.enable = true;
   };
 
-  nixos.virtualisation.enable = true;
-  desktop.gnome.enable = true;
-
   home-manager.users.seth = {
     desktop = {
       enable = true;
diff --git a/hosts/p-body/default.nix b/hosts/p-body/default.nix
index 5b7be66..1cb6acb 100644
--- a/hosts/p-body/default.nix
+++ b/hosts/p-body/default.nix
@@ -11,7 +11,7 @@
     hercules-ci-agent.nixosModules.agent-service
   ];
 
-  server.enable = true;
+  getchoo.server.enable = true;
 
   environment.systemPackages = [
     hercules-ci-agent.packages.x86_64-linux.hercules-ci-cli