5 files changed, 42 insertions, 29 deletions
diff --git a/systems/atlas/default.nix b/systems/atlas/default.nix
index df55b62..7145297 100644
--- a/systems/atlas/default.nix
+++ b/systems/atlas/default.nix
@@ -27,7 +27,10 @@
     loader.efi.canTouchEfiVariables = true;
   };
 
-  networking.domain = "getchoo.com";
+  networking = {
+    domain = "getchoo.com";
+    hostName = "atlas";
+  };
 
   system.stateVersion = "23.05";
 }
diff --git a/systems/caroline/default.nix b/systems/caroline/default.nix
index f41ae12..932e85c 100644
--- a/systems/caroline/default.nix
+++ b/systems/caroline/default.nix
@@ -8,7 +8,10 @@
     "prismlauncher"
   ];
 
-  networking.computerName = config.networking.hostName;
+  networking = {
+    computerName = config.networking.hostName;
+    hostName = "caroline";
+  };
 
   nix.settings.trusted-users = ["seth"];
 
diff --git a/systems/default.nix b/systems/default.nix
index c608e9c..33736e6 100644
--- a/systems/default.nix
+++ b/systems/default.nix
@@ -3,26 +3,29 @@
   self,
   ...
 }: {
-  darwinConfigurations = {
-    caroline = {
-      system = "x86_64-darwin";
+  configurations = {
+    darwin = {
+      caroline = {
+        modules = [./caroline];
+      };
     };
-  };
 
-  nixosConfigurations = let
-    stable = inputs.nixpkgs-stable.lib.nixosSystem;
-  in {
-    glados = {
-      system = "x86_64-linux";
-    };
+    nixos = let
+      stable = inputs.nixpkgs-stable.lib.nixosSystem;
+    in {
+      glados = {
+        modules = [./glados];
+      };
 
-    glados-wsl = {
-      system = "x86_64-linux";
-    };
+      glados-wsl = {
+        modules = [./glados-wsl];
+      };
 
-    atlas = {
-      builder = stable;
-      system = "aarch64-linux";
+      atlas = {
+        builder = stable;
+        modules = [./atlas];
+        system = "aarch64-linux";
+      };
     };
   };
 
diff --git a/systems/glados-wsl/default.nix b/systems/glados-wsl/default.nix
index a0b02bf..88b5184 100644
--- a/systems/glados-wsl/default.nix
+++ b/systems/glados-wsl/default.nix
@@ -30,6 +30,10 @@
     ];
   };
 
+  networking.hostName = "glados-wsl";
+
+  system.stateVersion = "23.11";
+
   traits.tailscale.enable = true;
 
   wsl = {
@@ -43,6 +47,4 @@
     startMenuLaunchers = false;
     interop.includePath = false;
   };
-
-  system.stateVersion = "23.11";
 }
diff --git a/systems/glados/default.nix b/systems/glados/default.nix
index a0654f8..491285d 100644
--- a/systems/glados/default.nix
+++ b/systems/glados/default.nix
@@ -13,15 +13,7 @@
 
   environment.systemPackages = [pkgs.obs-studio];
 
-  traits = {
-    containers.enable = true;
-    nvidia = {
-      enable = true;
-      nvk.enable = true;
-    };
-    tailscale.enable = true;
-    zram.enable = true;
-  };
+  networking.hostName = "glados";
 
   security.tpm2 = {
     enable = true;
@@ -35,4 +27,14 @@
   };
 
   system.stateVersion = "23.11";
+
+  traits = {
+    containers.enable = true;
+    nvidia = {
+      enable = true;
+      nvk.enable = true;
+    };
+    tailscale.enable = true;
+    zram.enable = true;
+  };
 }