Separate system from home-manager again

hosts/baseline.nix

@@ -0,0 +1,218 @@
+{
+  config,
+  lib,
+  overlays,
+  pkgs,
+  self,
+  top,
+  ...
+}:
+let
+  builderHosts =
+    if self != null then
+      (lib.attrNames (
+        lib.filterAttrs (_: v: v.config.greg.remote-builder.enable) self.nixosConfigurations
+      ))
+    else
+      [ ];
+in
+{
+  imports = [
+    ./nix-conf.nix
+  ];
+
+  console = {
+    font = "Lat2-Terminus16";
+    keyMap = "us";
+  };
+
+  environment.systemPackages = with pkgs; [
+    agenix
+    bitwarden-cli
+    bmon
+    btop
+    btrfs-progs
+    coreutils-full
+    diffutils
+    efibootmgr
+    findutils
+    file
+    git
+    gnupatch
+    hms # My own home manager switcher
+    iperf
+    killall
+    nano
+    lshw
+    pciutils
+    psmisc
+    pwgen
+    unzip
+    usbutils
+    wget
+    xfsprogs
+  ];
+
+  home-manager = {
+    backupFileExtension = "bkp";
+    useGlobalPkgs = true;
+    useUserPackages = true;
+    users.greg = import ../home/home.nix;
+    extraSpecialArgs = {
+      inherit top overlays;
+      home = "/home/greg";
+      host = config.networking.hostName;
+    };
+  };
+
+  i18n.defaultLocale = "en_US.UTF-8";
+
+  nix = {
+    gc.dates = "weekly";
+    settings.auto-optimise-store = true;
+  };
+
+  nixpkgs.overlays = overlays;
+
+  # Network Manager pulls in too many deps
+  networking = {
+    search = [
+      "thehellings.lan"
+      "home"
+    ];
+    networkmanager.enable = false;
+  };
+
+  programs = {
+    xonsh = {
+      enable = true;
+      extraPackages = (
+        ps: with ps; [
+          xonsh-apipenv
+          pkgs.nur.repos.xonsh-xontribs.xonsh-direnv
+          pkgs.nur.repos.xonsh-xontribs.xontrib-vox
+        ]
+      );
+    };
+
+    ssh = {
+      extraConfig = builtins.concatStringsSep "\n" (
+        lib.map (x: ''
+          Host ${x}-builder
+            Hostname ${x}.home
+            User remote-builder-user
+        '') builderHosts
+      );
+
+      knownHosts = {
+        chronicles = {
+          extraHostNames = [
+            "chronicles.thehellings.lan"
+            "chronicles.home"
+            "nas"
+            "nas.thehellings.lan"
+            "nas.home"
+          ];
+          publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEBecZUva9OnZuXLaBun6/1ITo5f9p0YMLPD+q0egLRS";
+        };
+        dns = {
+          extraHostNames = [
+            "dns"
+            "dns.me.ts"
+            "dns.home"
+          ];
+          publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKRCXdhXWHEvw84V9JC5bAGovvj12DLVphcEnsTHDjxW";
+        };
+        "genesis" = {
+          extraHostNames = [
+            "genesis.shire-zebra.ts.net"
+            "genesis.home"
+          ];
+          publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEI9jbTPmEWQ0F2bLYmnIOLmBnag1fkKxHRjz3X8lB/k";
+        };
+        "git" = {
+          extraHostNames = [
+            "git.home"
+            "git.thehellings.lan"
+          ];
+          publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIC7hesFWwlmSbWPJWUiF8fIppy5a83yXw84O0Ytz+Zyq";
+        };
+        hosea = {
+          extraHostNames = [
+            "hosea.home"
+            "hosea.thehellings.lan"
+          ];
+          publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKLIwkTTXA56sUlUjEulXXZRvZy5H4a5ZwgKWLlpkQDz";
+        };
+        isaiah = {
+          extraHostNames = [
+            "isaiah.home"
+            "isaiah.thehellings.lan"
+            "isaiah-builder"
+          ];
+          publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHleYKtfV4W1Z63Ysu9w5Rbglqlz4F92YcZoMkucoTNf";
+        };
+        jeremiah = {
+          extraHostNames = [
+            "jeremiah.home"
+            "jeremiah.thehellings.lan"
+            "jeremiah-builder"
+          ];
+          publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOjQjXq9WYU2Ki27BR9WwJ4ZruS/lJXbjC1b0Q42Adi0";
+        };
+        jude = {
+          extraHostNames = [
+            "jude.home"
+            "jude.thehellings.lan"
+            "jude-builder"
+          ];
+          publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOos0zQePsa+T6Z2dsKbPOvEdrBQ8a6mx3s7pN6ysCI0";
+        };
+        linode = {
+          extraHostNames = [
+            "linode.home"
+            "linode.thehellings.lan"
+            "thehellings.com"
+          ];
+          publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMv9Zud3kZOl86gtmkn+uj3D4kiXWDPtyUL02VVLNR4Q";
+        };
+      };
+    };
+  };
+
+  # Enable the OpenSSH daemon for remote control
+  services = {
+    openssh = {
+      enable = true;
+      settings.X11Forwarding = true;
+    };
+  };
+
+  security.sudo.extraRules = [
+    {
+      users = [ "greg" ];
+      commands = [
+        {
+          command = "ALL";
+          options = [ "NOPASSWD" ];
+        }
+      ];
+    }
+  ];
+
+  # Define a user account. Don't forget to set a password with ‘passwd’.
+  users.users.greg = {
+    isNormalUser = true;
+    createHome = true;
+    extraGroups = [
+      "wheel"
+    ]; # Enable ‘sudo’ for the user.
+    shell = config.programs.xonsh.package;
+    initialPassword = "password";
+    openssh.authorizedKeys.keys = lib.strings.splitString "\n" (
+      builtins.readFile ../../home/ssh/authorized_keys
+    );
+  };
+
+  system.stateVersion = "24.11";
+}

hosts/default.nix

@@ -19,7 +19,6 @@ let
       name,
       system ? "x86_64-linux",
       hm ? top.hm,
-      nixvim ? top.nixvimstable,
     }:
     let
       nixpkgs = import channel { inherit system; };
@@ -32,29 +31,18 @@ let
         inherit (top) self;
       };
       modules = [
-        {
-          nixpkgs.overlays = overlays;
-          home-manager = {
-            useGlobalPkgs = true;
-            useUserPackages = true;
-            users.greg = import ../home/home.nix;
-            extraSpecialArgs = {
-              inherit top overlays;
-              home = "/home/greg";
-              host = name;
-            };
-            backupFileExtension = "bkp";
-          };
-        }
+        # Imported ones
         top.agenix.nixosModules.default
         hm.nixosModules.home-manager
-        top.self.modules.nixosModule
         top.nurpkgs.modules.nixos.default
+        # Local ones
+        ./baseline.nix
+        top.self.modules.nixosModule
         ./${name}
       ] ++ extraMods;
     };
 in
-rec {
+{
   genesis = unstable { name = "genesis"; };
   exodus = unstable { name = "exodus"; };
   jude = unstable { name = "jude"; };