We'll configure like this

flake.nix

@@ -24,8 +24,7 @@
           system = "x86_64-linux";
           specialArgs = { inherit unstablePkgs updatePkgs nixos-hardware; };
           modules = [
-            ./configuration.nix
-            ./sandy-hardware.nix
+            ./hosts/sandy/configuration.nix
             home-manager.nixosModules.home-manager
             {
               home-manager = {
@@ -44,8 +43,7 @@
           system = "x86_64-linux";
           specialArgs = { inherit unstablePkgs ; };
           modules = [
-            ./configuration.nix
-            ./minis-hardware.nix
+            ./hosts/minis/configuration.nix
             home-manager.nixosModules.home-manager
             {
               home-manager = {

hosts/common/configuration.nix

@@ -4,18 +4,8 @@ let
 in
 {
   imports = [
-    ./hardware-configuration.nix
-    ./sunshine.nix
-    nixos-hardware.nixosModules.framework-11th-gen-intel
   ];
 
-  networking = {
-    hostId = "7be305c3";
-    hostName = "sandy";
-    networkmanager.enable = true;
-  };
-
-  # Xander, uncomment this line to update the kernel to 6.10.~
   boot.kernelPackages = pkgs.linuxPackages_6_12;
   boot.loader = {
     systemd-boot.enable = true;
@@ -149,46 +139,6 @@ in
     sudo.wheelNeedsPassword = false;
   };
 
-  users.users.nshields = {
-    isNormalUser = true;
-    shell = pkgs.zsh;
-    description = "Nikolai Shields";
-    extraGroups = [ "lp" "docker" "networkmanager" "wheel" "podman" ];
-    openssh.authorizedKeys.keys = keys.nshields;
-  };
-
-  users.users.benson = {
-    isNormalUser = true;
-    shell = pkgs.bash;
-    description = "Benson Chu";
-    extraGroups = [ "wheel" ];
-    openssh.authorizedKeys.keys = keys.benson;
-  };
-
-  users.users.hodgson = {
-    isNormalUser = true;
-    shell = pkgs.zsh;
-    description = "[Ralph] Peter Hodgson";
-    extraGroups = [ "lp" "wheel" ];
-    openssh.authorizedKeys.keys = keys.hodgson;
-  };
-
-  users.users.peter = {
-    isNormalUser = true;
-    shell = pkgs.zsh;
-    description = "Peter Hodgson";
-    extraGroups = [ "lp" "wheel" "input" ];
-    openssh.authorizedKeys.keys = keys.hodgson;
-  };
-
-  users.users.zander = {
-    isNormalUser = true;
-    shell = pkgs.bash;
-    description = "Alexander Thannhauser";
-    extraGroups = [ "lp" "wheel" "input" ];
-    openssh.authorizedKeys.keys = keys.zander;
-  };
-
   environment.systemPackages = with pkgs; [
     gnome.gnome-tweaks
     gnome.networkmanager-openconnect
@@ -251,6 +201,4 @@ in
   networking.hosts = {
     "10.0.0.142" = ["BRWBCF4D445BCC3.local"];
   };
-
-  system.stateVersion = "24.11"; # Did you read the comment?
 }

hosts/minis/configuration.nix

@@ -0,0 +1,57 @@
+{ config, pkgs, updatePkgs, unstablePkgs, nixos-hardware, ... }:
+let
+  keys = import ./ssh-keys.nix;
+in
+{
+  imports = [
+    ../common/configuration.nix
+  ];
+
+  networking = {
+    hostId = "7be305c3";
+    hostName = "minis";
+    networkmanager.enable = true;
+  };
+
+  users.users.nshields = {
+    isNormalUser = true;
+    shell = pkgs.zsh;
+    description = "Nikolai Shields";
+    extraGroups = [ "lp" "docker" "networkmanager" "wheel" "podman" ];
+    openssh.authorizedKeys.keys = keys.nshields;
+  };
+
+  users.users.benson = {
+    isNormalUser = true;
+    shell = pkgs.bash;
+    description = "Benson Chu";
+    extraGroups = [ "wheel" ];
+    openssh.authorizedKeys.keys = keys.benson;
+  };
+
+  users.users.hodgson = {
+    isNormalUser = true;
+    shell = pkgs.zsh;
+    description = "[Ralph] Peter Hodgson";
+    extraGroups = [ "lp" "wheel" ];
+    openssh.authorizedKeys.keys = keys.hodgson;
+  };
+
+  users.users.peter = {
+    isNormalUser = true;
+    shell = pkgs.zsh;
+    description = "Peter Hodgson";
+    extraGroups = [ "lp" "wheel" "input" ];
+    openssh.authorizedKeys.keys = keys.hodgson;
+  };
+
+  users.users.zander = {
+    isNormalUser = true;
+    shell = pkgs.bash;
+    description = "Alexander Thannhauser";
+    extraGroups = [ "lp" "wheel" "input" ];
+    openssh.authorizedKeys.keys = keys.zander;
+  };
+
+  system.stateVersion = "24.11"; # Did you read the comment?
+}

hosts/sandy/configuration.nix

@@ -0,0 +1,60 @@
+{ config, pkgs, updatePkgs, unstablePkgs, nixos-hardware, ... }:
+let
+  keys = import ./ssh-keys.nix;
+in
+{
+  imports = [
+    ../common/configuration.nix
+    ./hardware-configuration.nix
+    ./sunshine.nix
+    nixos-hardware.nixosModules.framework-11th-gen-intel
+  ];
+
+  networking = {
+    hostId = "7be305c3";
+    hostName = "sandy";
+    networkmanager.enable = true;
+  };
+
+  users.users.nshields = {
+    isNormalUser = true;
+    shell = pkgs.zsh;
+    description = "Nikolai Shields";
+    extraGroups = [ "lp" "docker" "networkmanager" "wheel" "podman" ];
+    openssh.authorizedKeys.keys = keys.nshields;
+  };
+
+  users.users.benson = {
+    isNormalUser = true;
+    shell = pkgs.bash;
+    description = "Benson Chu";
+    extraGroups = [ "wheel" ];
+    openssh.authorizedKeys.keys = keys.benson;
+  };
+
+  users.users.hodgson = {
+    isNormalUser = true;
+    shell = pkgs.zsh;
+    description = "[Ralph] Peter Hodgson";
+    extraGroups = [ "lp" "wheel" ];
+    openssh.authorizedKeys.keys = keys.hodgson;
+  };
+
+  users.users.peter = {
+    isNormalUser = true;
+    shell = pkgs.zsh;
+    description = "Peter Hodgson";
+    extraGroups = [ "lp" "wheel" "input" ];
+    openssh.authorizedKeys.keys = keys.hodgson;
+  };
+
+  users.users.zander = {
+    isNormalUser = true;
+    shell = pkgs.bash;
+    description = "Alexander Thannhauser";
+    extraGroups = [ "lp" "wheel" "input" ];
+    openssh.authorizedKeys.keys = keys.zander;
+  };
+
+  system.stateVersion = "24.11"; # Did you read the comment?
+}