export nixos configurations as standard flake outputs

common/base-server/default.nix

@@ -11,7 +11,6 @@ in
     time.timeZone = "Etc/UTC";
 
     # Allow remote deployment with colmena
-    deployment.targetUser = null;
     security.sudo.wheelNeedsPassword = false;
     nix.settings.trusted-users = [ "@wheel" ];
   };

flake.nix

@@ -27,32 +27,7 @@
   };
 
   outputs = inputs@{ self, nixpkgs, home-manager, plasma-manager, nur, agenix, birdsong, ... }: {
-    # The name of this output type is not standardised. I have picked
-    # "homeManagerModules" as the discussion here suggests it's the most common:
-    # https://github.com/nix-community/home-manager/issues/1783
-    #
-    # However, note CppNix >= 2.22.3, >= 2.24 has blessed "homeModules":
-    # https://github.com/NixOS/nix/pull/10858
-    homeManagerModules = {
-      "qenya".imports = [
-        plasma-manager.homeManagerModules.plasma-manager
-        ./home/qenya
-      ];
-
-      "qenya@shaw".imports = [ ./hosts/shaw/home.nix ];
-    };
-
-    colmena = {
-      meta = {
-        nixpkgs = import nixpkgs { system = "x86_64-linux"; };
-        nodeNixpkgs = {
-          kalessin = import nixpkgs { system = "aarch64-linux"; }; # TODO: this should be generated from the host config somehow
-        };
-      };
-
-      defaults = { name, nodes, ... }: {
-        networking.hostName = name;
-
+    nixosModules.default = {
       nix.settings.experimental-features = "nix-command flakes";
       nix.nixPath = [ "nixpkgs=flake:nixpkgs" ];
       nixpkgs.config.allowUnfree = true;
@@ -73,11 +48,55 @@
       ];
     };
 
+    # TODO: simplify
+    nixosConfigurations = {
+      "kilgharrah" = nixpkgs.lib.nixosSystem { modules = [ ./hosts/kilgharrah self.nixosModules.default ]; };
+      "tohru" = nixpkgs.lib.nixosSystem { modules = [ ./hosts/tohru self.nixosModules.default ]; };
+      "yevaud" = nixpkgs.lib.nixosSystem { modules = [ ./hosts/yevaud self.nixosModules.default ]; };
+      "orm" = nixpkgs.lib.nixosSystem { modules = [ ./hosts/orm self.nixosModules.default ]; };
+      "kalessin" = nixpkgs.lib.nixosSystem { modules = [ ./hosts/kalessin self.nixosModules.default ]; };
+    };
+
+    # The name of this output type is not standardised. I have picked
+    # "homeManagerModules" as the discussion here suggests it's the most common:
+    # https://github.com/nix-community/home-manager/issues/1783
+    #
+    # However, note CppNix >= 2.22.3, >= 2.24 has blessed "homeModules":
+    # https://github.com/NixOS/nix/pull/10858
+    homeManagerModules = {
+      "qenya".imports = [
+        plasma-manager.homeManagerModules.plasma-manager
+        ./home/qenya
+      ];
+
+      "qenya@shaw".imports = [ ./hosts/shaw/home.nix ];
+    };
+
+    colmena = {
+      meta = {
+        nixpkgs = import nixpkgs { system = "x86_64-linux"; };
+        nodeNixpkgs = builtins.mapAttrs (name: value: value.pkgs) self.nixosConfigurations;
+      };
+
+      # TODO: eliminate duplication with nixosConfigurations
+      defaults.imports = [ self.nixosModules.default ];
       kilgharrah.imports = [ ./hosts/kilgharrah ];
       tohru.imports = [ ./hosts/tohru ];
       yevaud.imports = [ ./hosts/yevaud ];
       orm.imports = [ ./hosts/orm ];
       kalessin.imports = [ ./hosts/kalessin ];
+
+      defaults.deployment = {
+        allowLocalDeployment = true;
+        buildOnTarget = true;
+        targetUser = null;
+      };
+
+      kilgharrah.deployment.targetHost = null;
+      tohru.deployment.targetHost = null;
+      yevaud.deployment.targetHost = "yevaud.birdsong.network";
+      orm.deployment.targetHost = "orm.birdsong.network";
+      kalessin.deployment.targetHost = "kalessin.birdsong.network";
     };
 
     # TODO: have this work on other systems too

hosts/kalessin/default.nix

@@ -5,11 +5,8 @@
     ./hardware-configuration.nix
   ];
 
+  networking.hostName = "kalessin";
   networking.hostId = "534b538e";
-  deployment = {
-    targetHost = "kalessin.birdsong.network";
-    buildOnTarget = true;
-  };
 
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;

hosts/kilgharrah/default.nix

@@ -9,13 +9,9 @@
   ];
 
   nixpkgs.hostPlatform = "x86_64-linux";
+  networking.hostName = "kilgharrah";
   networking.hostId = "72885bb5";
 
-  deployment = {
-    allowLocalDeployment = true;
-    targetHost = null; # disallow remote deployment
-  };
-
   qenya.base-graphical.enable = true;
   qenya.base-graphical.desktop = "plasma6";
 

hosts/orm/default.nix

@@ -5,8 +5,8 @@
     ./hardware-configuration.nix
   ];
 
+  networking.hostName = "orm";
   networking.hostId = "00000000";
-  deployment.targetHost = "orm.birdsong.network";
 
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;

hosts/tohru/default.nix

@@ -11,13 +11,9 @@
   ];
 
   nixpkgs.hostPlatform = "x86_64-linux";
+  networking.hostName = "tohru";
   networking.hostId = "31da19c1";
 
-  deployment = {
-    allowLocalDeployment = true;
-    targetHost = null; # disallow remote deployment
-  };
-
   qenya.base-graphical.enable = true;
 
   time.timeZone = "Europe/London";

hosts/yevaud/default.nix

@@ -5,8 +5,8 @@
     ./hardware-configuration.nix
   ];
 
+  networking.hostName = "yevaud";
   networking.hostId = "09673d65";
-  deployment.targetHost = "yevaud.birdsong.network";
 
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;