Enable wine on odo and update nix_builder.

nix/configuration/configuration.nix

@@ -246,8 +246,31 @@ in
             glew = (final.glew.override { enableEGL = false; });
           };
         })
+        (final: prev: {
+          fwupd = prev.fwupd.overrideAttrs (
+            finalAttrs: prevAttrs: {
+              version = "2.1.5";
+              src = final.fetchFromGitHub {
+                owner = "fwupd";
+                repo = "fwupd";
+                tag = finalAttrs.version;
+                hash = "sha256-DzQ+N99ZmFRqZc2rN6PSqmoIMXUyrE8Kkn+KnT/AWPc=";
+              };
+            }
+          );
+        })
         (disableTests "onetbb") # oneTBB tests hang forever on machines with a single core (like my build virtual machine) https://github.com/uxlfoundation/oneTBB/issues/1557
         (disableTests "aws-c-common") # aws-c-common tests time out on my build virtual machine but run fine on my laptop.
+
+        # Works but probably sets python2's scipy to be python3:
+        #
+        # (final: prev: {
+        #   pythonPackagesExtensions = prev.pythonPackagesExtensions ++ [
+        #     (python-final: python-prev: {
+        #       scipy = final.unoptimized.python3Packages.scipy;
+        #     })
+        #   ];
+        # })
       ];
 
     # This option defines the first version of NixOS you have installed on this particular machine,

nix/configuration/flake.lock

@@ -22,11 +22,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1781152676,
+        "lastModified": 1780894562,
-        "narHash": "sha256-RxWs5ND31KzTG7wvMM+PMfUjyNpmIEr999lqNARaM5o=",
+        "narHash": "sha256-c3430xwxwhHipl3jigUGMMBfpaMylDqytW/kdmB3ZGs=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "ff8702b4de27f72b4c78573dfb89ec74e36abdf1",
+        "rev": "24fed06cac83bcc44ac8efbb57cab1a82fa0bedc",
         "type": "github"
       },
       "original": {
@@ -170,11 +170,11 @@
         "rust-overlay": "rust-overlay_2"
       },
       "locked": {
-        "lastModified": 1785248363,
+        "lastModified": 1784398011,
-        "narHash": "sha256-hx9Cn1vIa/h54t+s3ObO6+Z3xHSA1zc3YVRWxTZcigc=",
+        "narHash": "sha256-RMBrYkNpcOlPvX3LaI3qdZfqgX+R3/D3tsJhxLJJiak=",
         "ref": "refs/heads/main",
-        "rev": "0addf91edf82775a0dc5022a81065ef101305e64",
+        "rev": "59fdbf41efdd0bbd0341a7534738149b33bd557f",
-        "revCount": 38,
+        "revCount": 37,
         "type": "git",
         "url": "https://code.fizz.buzz/talexander/nix_builder.git"
       },
@@ -185,11 +185,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1785318670,
+        "lastModified": 1780749050,
-        "narHash": "sha256-dN6Ou5x/+23FZLEpYP3IffO+NyJFzUlGumt1uu3MMaY=",
+        "narHash": "sha256-3av0pIjlOWQ6rDbNOmpUSvbNnJkGORQKKjb4LtCZsIY=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "0954f7ee2f6bb3dc7d4e3d0d8bcb8fd4bde4cfc5",
+        "rev": "a799d3e3886da994fa307f817a6bc705ae538eeb",
         "type": "github"
       },
       "original": {
@@ -199,6 +199,22 @@
         "type": "github"
       }
     },
+    "nixpkgs-google": {
+      "locked": {
+        "lastModified": 1779893571,
+        "narHash": "sha256-wiwMyVCtmjRjlFCe2zaumCE6LRV9GzzN0ZH25NQkbAU=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "45f6cfaa4605b706c870e75bd74bdb5e97eee11e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "45f6cfaa4605b706c870e75bd74bdb5e97eee11e",
+        "type": "github"
+      }
+    },
     "nixpkgs-stable": {
       "locked": {
         "lastModified": 1730741070,
@@ -248,7 +264,8 @@
         "impermanence": "impermanence",
         "lanzaboote": "lanzaboote",
         "nix_builder": "nix_builder",
-        "nixpkgs": "nixpkgs"
+        "nixpkgs": "nixpkgs",
+        "nixpkgs-google": "nixpkgs-google"
       }
     },
     "rust-overlay": {

nix/configuration/flake.nix

@@ -20,6 +20,7 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+    nixpkgs-google.url = "github:NixOS/nixpkgs/45f6cfaa4605b706c870e75bd74bdb5e97eee11e";
     lanzaboote = {
       url = "github:nix-community/lanzaboote/v0.4.2";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -38,6 +39,7 @@
     {
       self,
       nixpkgs,
+      nixpkgs-google,
       disko,
       impermanence,
       lanzaboote,
@@ -97,6 +99,9 @@
                       hostPlatform.gcc.arch = "default";
                       hostPlatform.gcc.tune = "default";
                     };
+                    google = import nixpkgs-google {
+                      system = prev.stdenv.hostPlatform.system;
+                    };
                   })
                 ];
               };

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/roles/gcloud/default.nix

@@ -18,7 +18,7 @@
   };
 
   config = lib.mkIf config.me.gcloud.enable {
-    environment.systemPackages = with pkgs; [
+    environment.systemPackages = with pkgs.google; [
       (google-cloud-sdk.withExtraComponents [ google-cloud-sdk.components.gke-gcloud-auth-plugin ])
     ];
 

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/latex/default.nix

@@ -25,8 +25,8 @@
     nixpkgs.overlays = [
       (final: prev: {
         tex = (
-          pkgs.texliveSmall.withPackages (
+          pkgs.texlive.combine {
-            ps: with ps; [
+            inherit (pkgs.texlive)
               scheme-basic
               dvisvgm
               dvipng # for preview and export as html in org-mode
@@ -44,8 +44,8 @@
               upquote # emacs org-mode pdf export
               lineno # emacs org-mode pdf export
               beamer # emacs org-mode presentation pdf export
-            ]
+              ;
-          )
+          }
         );
       })
     ];

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