Enable wine on odo and update nix_builder.

nix/configuration/flake.lock

@@ -170,11 +170,11 @@
         "rust-overlay": "rust-overlay_2"
       },
       "locked": {
-        "lastModified": 1785893798,
+        "lastModified": 1784398011,
-        "narHash": "sha256-69nKdvM+E/66sj9R2HEK8i0p0TOt/0MSqfXiZjcJ9nI=",
+        "narHash": "sha256-RMBrYkNpcOlPvX3LaI3qdZfqgX+R3/D3tsJhxLJJiak=",
         "ref": "refs/heads/main",
-        "rev": "6386febdb81eb1e072ad7cb568019f06618008fe",
+        "rev": "59fdbf41efdd0bbd0341a7534738149b33bd557f",
-        "revCount": 41,
+        "revCount": 37,
         "type": "git",
         "url": "https://code.fizz.buzz/talexander/nix_builder.git"
       },

nix/configuration/hosts/family_disks/distributed_build.nix

@@ -4,15 +4,13 @@
   config = {
     me.distributed_build.enable = true;
     me.distributed_build.machines.quark = {
-      enable_build = false;
+      enable = false;
-      enable_substituter = false;
       additional_config = {
         speedFactor = 2;
       };
     };
     me.distributed_build.machines.hydra = {
-      enable_build = false;
+      enable = true;
-      enable_substituter = true;
       additional_config = {
         speedFactor = 2;
       };

nix/configuration/hosts/i_only_boot_zfs/distributed_build.nix

@@ -4,19 +4,10 @@
   config = {
     me.distributed_build.enable = true;
     me.distributed_build.machines.quark = {
-      enable_build = false;
+      enable = true;
-      enable_substituter = false;
       additional_config = {
         speedFactor = 2;
       };
     };
-    me.distributed_build.machines.hydra = {
-      enable_build = false;
-      enable_substituter = true;
-      additional_config = {
-        speedFactor = 2;
-      };
-      substituter_url = "ssh-ng://nixworker@ns1.fizz.buzz:65122?compress=true&ssh-key=/persist/manual/ssh/root/keys/id_ed25519&remote-store=local?root=/.disk/root";
-    };
   };
 }

nix/configuration/hosts/odo/default.nix

@@ -152,7 +152,7 @@
     me.wasm.enable = true;
     me.waybar.enable = true;
     me.webcam.enable = true;
-    me.wine.enable = false;
+    me.wine.enable = true;
     me.wireguard.activated = [
       "drmario"
       "wgh"

nix/configuration/hosts/odo/distributed_build.nix

@@ -4,15 +4,13 @@
   config = {
     me.distributed_build.enable = true;
     me.distributed_build.machines.quark = {
-      enable_build = false;
+      enable = false;
-      enable_substituter = false;
       additional_config = {
         speedFactor = 2;
       };
     };
     me.distributed_build.machines.hydra = {
-      enable_build = false;
+      enable = true;
-      enable_substituter = true;
       additional_config = {
         speedFactor = 2;
       };

nix/configuration/hosts/odowork/distributed_build.nix

@@ -4,15 +4,13 @@
   config = {
     me.distributed_build.enable = true;
     me.distributed_build.machines.quark = {
-      enable_build = false;
+      enable = false;
-      enable_substituter = false;
       additional_config = {
         speedFactor = 2;
       };
     };
     me.distributed_build.machines.hydra = {
-      enable_build = false;
+      enable = true;
-      enable_substituter = true;
       additional_config = {
         speedFactor = 2;
       };

nix/configuration/hosts/quark/distributed_build.nix

@@ -3,16 +3,8 @@
 
   config = {
     me.distributed_build.enable = true;
-    me.distributed_build.machines.quark = {
-      enable_build = false;
-      enable_substituter = false;
-      additional_config = {
-        speedFactor = 2;
-      };
-    };
     me.distributed_build.machines.hydra = {
-      enable_build = false;
+      enable = true;
-      enable_substituter = true;
       additional_config = {
         speedFactor = 2;
       };

nix/configuration/hosts/recovery/distributed_build.nix

@@ -4,19 +4,10 @@
   config = {
     me.distributed_build.enable = true;
     me.distributed_build.machines.quark = {
-      enable_build = false;
+      enable = true;
-      enable_substituter = false;
       additional_config = {
         speedFactor = 2;
       };
     };
-    me.distributed_build.machines.hydra = {
-      enable_build = false;
-      enable_substituter = true;
-      additional_config = {
-        speedFactor = 2;
-      };
-      substituter_url = "ssh-ng://nixworker@ns1.fizz.buzz:65122?compress=true&ssh-key=/persist/manual/ssh/root/keys/id_ed25519&remote-store=local?root=/.disk/root";
-    };
   };
 }

nix/configuration/roles/distributed_build/default.nix

@@ -10,14 +10,7 @@
 
 let
   make_machine_config = name: {
-    enable_build = lib.mkOption {
+    enable = lib.mkOption {
-      type = lib.types.bool;
-      default = false;
-      example = true;
-      description = "Whether we want to use the ${name} machine during distributed builds.";
-    };
-
-    enable_substituter = lib.mkOption {
       type = lib.types.bool;
       default = false;
       example = true;
@@ -66,30 +59,11 @@ let
       hostName = lib.mkForce "hydra?remote-store=local?root=/.disk/root";
     };
   };
-  build_machine_list = (
-    map (
-      hostname:
-      (lib.mkIf config.me.distributed_build.machines."${hostname}".enable_build (
-        lib.mkMerge [
-          {
-            hostName = hostname;
-            sshUser = "nixworker";
-            sshKey = "/persist/manual/ssh/root/keys/id_ed25519";
-            maxJobs = 1;
-            supportedFeatures = all_nixos_configs."${hostname}".config.me.optimizations.system_features;
-            protocol = "ssh-ng";
-          }
-          static_host_configs."${hostname}"
-          config.me.distributed_build.machines."${hostname}".additional_config
-        ]
-      ))
-    ) (builtins.attrNames all_nixos_configs)
-  );
   substituters_list = (
     map (
       hostname:
       (lib.mkIf (
-        config.me.distributed_build.machines."${hostname}".enable_substituter
+        config.me.distributed_build.machines."${hostname}".enable
         && config.me.distributed_build.machines."${hostname}".substituter_url != null
       ) (config.me.distributed_build.machines."${hostname}".substituter_url))
     ) (builtins.attrNames all_nixos_configs)
@@ -138,7 +112,25 @@ in
         ];
       }
       {
-        nix.buildMachines = build_machine_list;
+        nix.buildMachines = (
+          map (
+            hostname:
+            (lib.mkIf config.me.distributed_build.machines."${hostname}".enable (
+              lib.mkMerge [
+                {
+                  hostName = hostname;
+                  sshUser = "nixworker";
+                  sshKey = "/persist/manual/ssh/root/keys/id_ed25519";
+                  maxJobs = 1;
+                  supportedFeatures = all_nixos_configs."${hostname}".config.me.optimizations.system_features;
+                  protocol = "ssh-ng";
+                }
+                static_host_configs."${hostname}"
+                config.me.distributed_build.machines."${hostname}".additional_config
+              ]
+            ))
+          ) (builtins.attrNames all_nixos_configs)
+        );
       }
       (lib.mkIf has_any_substituters {
         nix.settings.substitute = lib.mkForce true;

nix/configuration/roles/hydra/default.nix

@@ -83,10 +83,7 @@
           "worker2_update"
           "family_disks"
           "family_disks_update"
-          "nixbsd"
+          # "nixbsd" # Disabled due to onetbb tests hanging on one-cpu machines.
-          "nix_builder_develop"
-          "organic_develop"
-          "natter_develop"
         ];
         build_flags = lib.concatMap (target: [
           "--target"

nix/configuration/roles/hydra/files/nix_builder.toml

@@ -178,30 +178,9 @@ output_directory = "/home/nixworker/persist/nix_builder"
   update = true
   update_branch = "nix_update"
 
-[[targets]]
+# [[targets]]
-  name = "nixbsd"
+#   name = "nixbsd"
-  repo = "https://github.com/nixos-bsd/nixbsd.git"
+#   repo = "https://github.com/nixos-bsd/nixbsd.git"
-  revision = "2b512eda58e6d77378bd20d6027802b158942e24"
+#   revision = "828ff7a3c4ee91f548de65a963fca40eaedb171c"
-  path = "."
+#   path = "."
-  attr = "base.vmClosureInfo"
+#   attr = "base.vmClosureInfo"
-
-[[targets]]
-  name = "nix_builder_develop"
-  repo = "https://code.fizz.buzz/talexander/nix_builder.git"
-  branch = "main"
-  path = "."
-  attr = "devShells.x86_64-linux.default"
-
-[[targets]]
-  name = "organic_develop"
-  repo = "https://code.fizz.buzz/talexander/organic.git"
-  branch = "main"
-  path = "."
-  attr = "devShells.x86_64-linux.default"
-
-[[targets]]
-  name = "natter_develop"
-  repo = "https://code.fizz.buzz/talexander/natter.git"
-  branch = "main"
-  path = "."
-  attr = "devShells.x86_64-linux.default"

nix/configuration/roles/network/default.nix

@@ -68,15 +68,7 @@ in
       10.217.1.1		drmario
       10.217.2.1		mrmanager
       fdfd:5e8a:ee2d::2:2 mrmanager
-      172.16.16.1		unifi
-      172.16.16.231		plug1
-      172.16.16.232		plug2
-      172.16.16.233		plug3
-      172.16.16.234		plug4
-      172.16.16.235		temperature1
-      172.16.16.236		temperature2
       172.16.16.245		turtle
-      172.16.16.250		sauna
       172.16.16.251		stream
     '';
 

nix/configuration/roles/wine/default.nix

@@ -22,7 +22,6 @@
       # wineWowPackages.stable # supports 32 + 64 bit
       wineWow64Packages.waylandFull # Supports 32 + 64 bit with native wayland support.
       # winetricks
-      # lutris
     ];
   };
 }

nix/kubernetes/keys/package/mrmanager-repo-secrets/package.nix

@@ -63,7 +63,6 @@ let
               username = builtins.readFile "${./secrets/flux-system/registry-credentials/username}";
               password = builtins.readFile "${./secrets/flux-system/registry-credentials/password}";
               email = builtins.readFile "${./secrets/flux-system/registry-credentials/email}";
-              address = builtins.readFile "${./secrets/flux-system/registry-credentials/address}";
             })
             // {
               # "__annotations" = {
@@ -208,19 +207,14 @@ let
       username,
       password,
       email,
-      address,
     }:
     let
     in
     {
       "__type" = "kubernetes.io/dockerconfigjson";
       ".dockerconfigjson" = builtins.toJSON {
-        auths = {
+        inherit username password email;
-          "${address}" = {
+        "auth" = toBase64 "${username}:${password}";
-            inherit username password email;
-            "auth" = toBase64 "${username}:${password}";
-          };
-        };
       };
     };
   ## dex