tohru, yevaud, orm: build remotely on kilgharrah instead of kalessin

flake.lock

@@ -115,39 +115,6 @@
         "type": "github"
       }
     },
-    "flake-utils_2": {
-      "inputs": {
-        "systems": "systems_2"
-      },
-      "locked": {
-        "lastModified": 1726560853,
-        "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "flakey-profile": {
-      "locked": {
-        "lastModified": 1712898590,
-        "narHash": "sha256-FhGIEU93VHAChKEXx905TSiPZKga69bWl1VB37FK//I=",
-        "owner": "lf-",
-        "repo": "flakey-profile",
-        "rev": "243c903fd8eadc0f63d205665a92d4df91d42d9d",
-        "type": "github"
-      },
-      "original": {
-        "owner": "lf-",
-        "repo": "flakey-profile",
-        "type": "github"
-      }
-    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -210,44 +177,6 @@
         "type": "github"
       }
     },
-    "lix": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1729298361,
-        "narHash": "sha256-hiGtfzxFkDc9TSYsb96Whg0vnqBVV7CUxyscZNhed0U=",
-        "rev": "ad9d06f7838a25beec425ff406fe68721fef73be",
-        "type": "tarball",
-        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/ad9d06f7838a25beec425ff406fe68721fef73be.tar.gz?rev=ad9d06f7838a25beec425ff406fe68721fef73be"
-      },
-      "original": {
-        "type": "tarball",
-        "url": "https://git.lix.systems/lix-project/lix/archive/2.91.1.tar.gz"
-      }
-    },
-    "lix-module": {
-      "inputs": {
-        "flake-utils": "flake-utils_2",
-        "flakey-profile": "flakey-profile",
-        "lix": "lix",
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1729360442,
-        "narHash": "sha256-6U0CyPycIBc04hbYy2hBINnVso58n/ZyywY2BD3hu+s=",
-        "ref": "stable",
-        "rev": "2bbdcd73b9a464f8acf45a7100feb979883ba485",
-        "revCount": 110,
-        "type": "git",
-        "url": "https://git.lix.systems/lix-project/nixos-module"
-      },
-      "original": {
-        "ref": "stable",
-        "type": "git",
-        "url": "https://git.lix.systems/lix-project/nixos-module"
-      }
-    },
     "nix-github-actions": {
       "inputs": {
         "nixpkgs": [
@@ -395,7 +324,6 @@
         "colmena": "colmena",
         "home-manager": "home-manager_2",
         "home-manager-unstable": "home-manager-unstable",
-        "lix-module": "lix-module",
         "nixpkgs": "nixpkgs",
         "nixpkgs-small": "nixpkgs-small",
         "nixpkgs-unstable": "nixpkgs-unstable",
@@ -435,21 +363,6 @@
         "repo": "default",
         "type": "github"
       }
-    },
-    "systems_2": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
     }
   },
   "root": "root",

flake.nix

@@ -5,11 +5,6 @@
     nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
     nixpkgs-unstable-small.url = "github:NixOS/nixpkgs/nixos-unstable-small";
 
-    lix-module = {
-      url = "git+https://git.lix.systems/lix-project/nixos-module?ref=stable";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-
     home-manager = {
       url = "github:nix-community/home-manager/release-24.05";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -55,7 +50,7 @@
     birdsong.url = "git+https://git.qenya.tel/qenya/birdsong?ref=main";
   };
 
-  outputs = inputs@{ self, nixpkgs, nixpkgs-small, lix-module, home-manager, plasma-manager, nur, agenix, colmena, randomcat, actual, birdsong, ... }: {
+  outputs = inputs@{ self, nixpkgs, nixpkgs-small, home-manager, plasma-manager, nur, agenix, colmena, randomcat, actual, birdsong, ... }: {
     nixosConfigurations = (colmena.lib.makeHive self.outputs.colmena).nodes;
 
     # The name of this output type is not standardised. I have picked
@@ -92,7 +87,6 @@
         deployment.targetHost = lib.mkDefault null;
 
         imports = [
-          lix-module.nixosModules.default
           home-manager.nixosModules.home-manager
           nur.nixosModules.nur
           { nixpkgs.overlays = [ nur.overlay ]; }

hosts/kalessin/default.nix

@@ -22,10 +22,12 @@ in
   qenya.services.remote-builder = {
     enable = true;
     authorizedKeys.keys = [
-      keys.machines.kilgharrah
       keys.machines.tohru
+      keys.machines.yevaud
+      keys.machines.orm
     ];
   };
+  boot.binfmt.emulatedSystems = [ "x86_64-linux" ];
 
   system.stateVersion = "23.11";
 }

hosts/kilgharrah/default.nix

@@ -40,12 +40,11 @@ in
 
   qenya.services.remote-builder = {
     enable = true;
-    authorizedKeys.keys = [ keys.machines.tohru ];
+    authorizedKeys.keys = [
-  };
+      keys.machines.tohru
-  qenya.services.distributed-builds = {
+      keys.machines.yevaud
-    enable = true;
+      keys.machines.orm
-    keyFile = "/etc/ssh/ssh_host_ed25519_key";
+    ];
-    builders = [ "kalessin" ];
   };
 
   programs.steam.enable = true;

hosts/orm/default.nix

@@ -14,6 +14,12 @@
   users.users.qenya.extraGroups = [ "wheel" ];
   qenya.base-server.enable = true;
 
+  qenya.services.distributed-builds = {
+    enable = true;
+    keyFile = "/etc/ssh/ssh_host_ed25519_key";
+    builders = [ "kilgharrah" ];
+  };
+
   randomcat.services.zfs.datasets = {
     "rpool_orm/state" = { mountpoint = "none"; };
     "rpool_orm/state/actual" = { mountpoint = "/var/lib/actual"; };

hosts/tohru/default.nix

@@ -49,7 +49,7 @@
   qenya.services.distributed-builds = {
     enable = true;
     keyFile = "/etc/ssh/ssh_host_ed25519_key";
-    builders = [ "kilgharrah" "kalessin" ];
+    builders = [ "kilgharrah" ];
   };
 
   programs.evolution.enable = true; # not in home-manager yet; not declaratively configurable yet

hosts/yevaud/default.nix

@@ -14,6 +14,12 @@
   users.users.qenya.extraGroups = [ "wheel" ];
   qenya.base-server.enable = true;
 
+  qenya.services.distributed-builds = {
+    enable = true;
+    keyFile = "/etc/ssh/ssh_host_ed25519_key";
+    builders = [ "kilgharrah" ];
+  };
+
   services.bind = {
     # enable = true;
     cacheNetworks = [ "10.127.0.0/16" "fd70:81ca:0f8f::/48" ];

services/distributed-builds.nix

@@ -38,9 +38,8 @@ in
         hostName = config.birdsong.hosts."kalessin".ipv4;
         sshUser = "remotebuild";
         sshKey = cfg.keyFile;
-        systems = [ "aarch64-linux" ];
+        systems = [ "aarch64-linux" "x86_64-linux" ];
-        maxJobs = 2;
+        supportedFeatures = [ ];
-        supportedFeatures = [ "big-parallel" ];
       })
       ++ (optional (elem "kilgharrah" cfg.builders) {
         hostName = config.birdsong.hosts."kilgharrah".ipv4;