Switching --no-build-nix to --fast because it fixes remote deploys to machines with different architectures.

I thought these flags were synonymous?
Update to linux 6.14.
2025-05-04 14:50:14 -04:00 · 2025-05-04 12:09:57 -04:00
13 changed files with 51 additions and 36 deletions
--- a/nix/configuration/configuration.nix
+++ b/nix/configuration/configuration.nix
@ -79,6 +79,9 @@
  # boot.kernelPackages = pkgs.linuxPackages_6_11;
  hardware.enableRedistributableFirmware = true;

+  # Use nixos-rebuild-ng
+  # system.rebuild.enableNg = true;
+
  services.getty = {
    autologinUser = "talexander"; # I use full disk encryption so the user password is irrelevant.
    autologinOnce = true;
@ -105,12 +108,6 @@
  home-manager.users.talexander =
    { pkgs, ... }:
    {
-      home.packages = [
-        pkgs.atool
-        pkgs.httpie
-      ];
-      programs.bash.enable = true;
-
      # The state version is required and should stay at the version you
      # originally installed.
      home.stateVersion = "24.11";
--- a/nix/configuration/flake.lock
+++ b/nix/configuration/flake.lock
@ -8,15 +8,14 @@
        ]
      },
      "locked": {
-        "lastModified": 1,
-        "narHash": "sha256-c4Ds4E/10Zj5AQLuJ3JvJTuDK8o2WjVXLcIL7eyhTfw=",
        "path": "flakes/ansible-sshjail",
        "type": "path"
      },
      "original": {
        "path": "flakes/ansible-sshjail",
        "type": "path"
-      }
+      },
+      "parent": []
    },
    "crane": {
      "locked": {
@ -155,11 +154,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1745858959,
-        "narHash": "sha256-B1FQwPCFLL3cbHc2nxT3/UI1uprHp2h1EA6M2JVe0oQ=",
+        "lastModified": 1746369725,
+        "narHash": "sha256-m3ai7LLFYsymMK0uVywCceWfUhP0k3CALyFOfcJACqE=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "d0d9d0a1454d5a0200693570618084d80a8b336c",
+        "rev": "1a1793f6d940d22c6e49753548c5b6cb7dc5545d",
        "type": "github"
      },
      "original": {
@ -211,11 +210,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1745526057,
-        "narHash": "sha256-ITSpPDwvLBZBnPRS2bUcHY3gZSwis/uTe255QgMtTLA=",
+        "lastModified": 1746232882,
+        "narHash": "sha256-MHmBH2rS8KkRRdoU/feC/dKbdlMkcNkB5mwkuipVHeQ=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "f771eb401a46846c1aebd20552521b233dd7e18b",
+        "rev": "7a2622e2c0dbad5c4493cb268aba12896e28b008",
        "type": "github"
      },
      "original": {
@ -259,11 +258,11 @@
    },
    "nixpkgs-unoptimized": {
      "locked": {
-        "lastModified": 1745526057,
-        "narHash": "sha256-ITSpPDwvLBZBnPRS2bUcHY3gZSwis/uTe255QgMtTLA=",
+        "lastModified": 1746232882,
+        "narHash": "sha256-MHmBH2rS8KkRRdoU/feC/dKbdlMkcNkB5mwkuipVHeQ=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "f771eb401a46846c1aebd20552521b233dd7e18b",
+        "rev": "7a2622e2c0dbad5c4493cb268aba12896e28b008",
        "type": "github"
      },
      "original": {
@ -372,15 +371,14 @@
        ]
      },
      "locked": {
-        "lastModified": 1,
-        "narHash": "sha256-5DWw7GnwVZ98HUp/UUJcyUmmy9Bh/mcQB8MQQ0t3ZRo=",
        "path": "flakes/zsh-histdb",
        "type": "path"
      },
      "original": {
        "path": "flakes/zsh-histdb",
        "type": "path"
-      }
+      },
+      "parent": []
    }
  },
  "root": "root",
--- a/nix/configuration/hosts/hydra/DEPLOY_BOOT
+++ b/nix/configuration/hosts/hydra/DEPLOY_BOOT
@ -14,6 +14,6 @@ nix flake update zsh-histdb --flake "$DIR/../../"
 nix flake update ansible-sshjail --flake "$DIR/../../"
 for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done

-nixos-rebuild boot --flake "$DIR/../../#hydra" --target-host "$TARGET" --build-host "$TARGET" --no-build-nix --use-remote-sudo --max-jobs "$JOBS" "${@}" |& nom
+nixos-rebuild boot --flake "$DIR/../../#hydra" --target-host "$TARGET" --build-host "$TARGET" --fast --use-remote-sudo --max-jobs "$JOBS" "${@}" |& nom

 # rsync -av --progress --delete --exclude=.git "$DIR/../../../configuration" "talexander@${TARGET}:/persist/manual/" && ssh talexander@${TARGET} 'cd /persist/manual/configuration && nix flake update zsh-histdb && nix flake update ansible-sshjail && doas nice -n 19 nixos-rebuild boot --flake /persist/manual/configuration#hydra'
--- a/nix/configuration/hosts/hydra/DEPLOY_SWITCH
+++ b/nix/configuration/hosts/hydra/DEPLOY_SWITCH
@ -14,6 +14,6 @@ nix flake update zsh-histdb --flake "$DIR/../../"
 nix flake update ansible-sshjail --flake "$DIR/../../"
 for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done

-nixos-rebuild switch --flake "$DIR/../../#hydra" --target-host "$TARGET" --build-host "$TARGET" --no-build-nix --use-remote-sudo --max-jobs "$JOBS" "${@}" |& nom
+nixos-rebuild switch --flake "$DIR/../../#hydra" --target-host "$TARGET" --build-host "$TARGET" --fast --use-remote-sudo --max-jobs "$JOBS" "${@}" |& nom

 # rsync -av --progress --delete --exclude=.git "$DIR/../../../configuration" "talexander@${TARGET}:/persist/manual/" && ssh talexander@${TARGET} 'cd /persist/manual/configuration && nix flake update zsh-histdb && nix flake update ansible-sshjail && doas nice -n 19 nixos-rebuild switch --flake /persist/manual/configuration#hydra'
--- a/nix/configuration/hosts/hydra/optimized_build.nix
+++ b/nix/configuration/hosts/hydra/optimized_build.nix
@ -58,7 +58,7 @@
                  HZ_1000 = lib.kernel.no;
                }
                (
-                  optimizeWithFlags prev.linux_6_13 [
+                  optimizeWithFlags prev.linux_6_14 [
                    "-march=znver4"
                    "-mtune=znver4"
                  ]
--- a/nix/configuration/hosts/neelix/DEPLOY_BOOT
+++ b/nix/configuration/hosts/neelix/DEPLOY_BOOT
@ -14,6 +14,6 @@ nix flake update zsh-histdb --flake "$DIR/../../"
 nix flake update ansible-sshjail --flake "$DIR/../../"
 for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done

-nixos-rebuild boot --flake "$DIR/../../#neelix" --target-host "$TARGET" --build-host "$TARGET" --no-build-nix --use-remote-sudo --max-jobs "$JOBS" "${@}" |& nom
+nixos-rebuild boot --flake "$DIR/../../#neelix" --target-host "$TARGET" --build-host "$TARGET" --fast --use-remote-sudo --max-jobs "$JOBS" "${@}" |& nom

 # rsync -av --progress --delete --exclude=.git "$DIR/../../../configuration" "talexander@${TARGET}:/persist/manual/" && ssh talexander@${TARGET} 'cd /persist/manual/configuration && nix flake update zsh-histdb && nix flake update ansible-sshjail && doas nice -n 19 nixos-rebuild boot --flake /persist/manual/configuration#neelix'
--- a/nix/configuration/hosts/neelix/DEPLOY_SWITCH
+++ b/nix/configuration/hosts/neelix/DEPLOY_SWITCH
@ -14,6 +14,6 @@ nix flake update zsh-histdb --flake "$DIR/../../"
 nix flake update ansible-sshjail --flake "$DIR/../../"
 for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done

-nixos-rebuild switch --flake "$DIR/../../#neelix" --target-host "$TARGET" --build-host "$TARGET" --no-build-nix --use-remote-sudo --max-jobs "$JOBS" "${@}" |& nom
+nixos-rebuild switch --flake "$DIR/../../#neelix" --target-host "$TARGET" --build-host "$TARGET" --fast --use-remote-sudo --max-jobs "$JOBS" "${@}" |& nom

 # rsync -av --progress --delete --exclude=.git "$DIR/../../../configuration" "talexander@${TARGET}:/persist/manual/" && ssh talexander@${TARGET} 'cd /persist/manual/configuration && nix flake update zsh-histdb && nix flake update ansible-sshjail && doas nice -n 19 nixos-rebuild switch --flake /persist/manual/configuration#neelix'
--- a/nix/configuration/hosts/odo/distributed_build.nix
+++ b/nix/configuration/hosts/odo/distributed_build.nix
@ -30,6 +30,26 @@
            "gccarch-x86-64-v4"
          ];
        }
+        {
+          hostName = "quark";
+          sshUser = "talexander";
+          systems = [
+            "x86_64-linux"
+            # "aarch64-linux"
+          ];
+          maxJobs = 1;
+          speedFactor = 2;
+          supportedFeatures = [
+            # "nixos-test"
+            "benchmark"
+            "big-parallel"
+            # "kvm"
+            "gccarch-znver4"
+            "gccarch-x86-64-v3"
+            "gccarch-x86-64-v4"
+            "gccarch-znver5"
+          ];
+        }
      ];
    }
  ];
--- a/nix/configuration/hosts/odo/optimized_build.nix
+++ b/nix/configuration/hosts/odo/optimized_build.nix
@ -61,7 +61,7 @@
              HZ = lib.kernel.freeform "300";
              HZ_300 = lib.kernel.yes;
              HZ_1000 = lib.kernel.no;
-            } prev.linux_6_13;
+            } prev.linux_6_14;
            # gsl = prev.gsl.overrideAttrs (old: {
            #   # gsl tests fails when optimizations are enabled.
            #   # > FAIL: cholesky_invert unscaled hilbert (  4,  4)[0,2]: 2.55795384873636067e-13                        0
@ -104,7 +104,7 @@
      boot.kernelPackages = pkgs.linuxPackagesFor pkgs.linux_me;
    })
    (lib.mkIf (config.me.buildingIso) {
-      boot.kernelPackages = pkgs.linuxPackagesFor pkgs.linux_6_13;
+      boot.kernelPackages = pkgs.linuxPackagesFor pkgs.linux_6_14;
      boot.supportedFilesystems.zfs = true;
    })
  ];
--- a/nix/configuration/hosts/quark/DEPLOY_BOOT
+++ b/nix/configuration/hosts/quark/DEPLOY_BOOT
@ -6,14 +6,14 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"

 : "${JOBS:="1"}"

-#TARGET=10.216.1.14
+TARGET=10.216.1.15
 # TARGET=192.168.211.250
-TARGET=quark
+#TARGET=quark

 nix flake update zsh-histdb --flake "$DIR/../../"
 nix flake update ansible-sshjail --flake "$DIR/../../"
 for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done

-nixos-rebuild boot --flake "$DIR/../../#quark" --target-host "$TARGET" --build-host "$TARGET" --no-build-nix --use-remote-sudo --max-jobs "$JOBS" "${@}" |& nom
+nixos-rebuild boot --flake "$DIR/../../#quark" --target-host "$TARGET" --build-host "$TARGET" --fast --use-remote-sudo --max-jobs "$JOBS" "${@}" |& nom

 # rsync -av --progress --delete --exclude=.git "$DIR/../../../configuration" "talexander@${TARGET}:/persist/manual/" && ssh talexander@${TARGET} 'cd /persist/manual/configuration && nix flake update zsh-histdb && nix flake update ansible-sshjail && doas nice -n 19 nixos-rebuild boot --flake /persist/manual/configuration#quark'
--- a/nix/configuration/hosts/quark/DEPLOY_SWITCH
+++ b/nix/configuration/hosts/quark/DEPLOY_SWITCH
@ -14,6 +14,6 @@ nix flake update zsh-histdb --flake "$DIR/../../"
 nix flake update ansible-sshjail --flake "$DIR/../../"
 for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done

-nixos-rebuild switch --flake "$DIR/../../#quark" --target-host "$TARGET" --build-host "$TARGET" --no-build-nix --use-remote-sudo --max-jobs "$JOBS" "${@}" |& nom
+nixos-rebuild switch --flake "$DIR/../../#quark" --target-host "$TARGET" --build-host "$TARGET" --fast --use-remote-sudo --max-jobs "$JOBS" "${@}" |& nom

 # rsync -av --progress --delete --exclude=.git "$DIR/../../../configuration" "talexander@${TARGET}:/persist/manual/" && ssh talexander@${TARGET} 'cd /persist/manual/configuration && nix flake update zsh-histdb && nix flake update ansible-sshjail && doas nice -n 19 nixos-rebuild switch --flake /persist/manual/configuration#quark'
--- a/nix/configuration/hosts/quark/optimized_build.nix
+++ b/nix/configuration/hosts/quark/optimized_build.nix
@ -74,7 +74,7 @@
              HZ = lib.kernel.freeform "300";
              HZ_300 = lib.kernel.yes;
              HZ_1000 = lib.kernel.no;
-            } prev.linux_6_13;
+            } prev.linux_6_14;
          }
        )
        (final: prev: {
@ -111,7 +111,7 @@
      boot.kernelPackages = pkgs.linuxPackagesFor pkgs.linux_me;
    })
    (lib.mkIf (config.me.buildingIso) {
-      boot.kernelPackages = pkgs.linuxPackagesFor pkgs.linux_6_13;
+      boot.kernelPackages = pkgs.linuxPackagesFor pkgs.linux_6_14;
      boot.supportedFilesystems.zfs = true;
    })
  ];
--- a/nix/configuration/roles/network/default.nix
+++ b/nix/configuration/roles/network/default.nix
@ -37,10 +37,10 @@
  # Test with: drill @127.0.0.53 odo.home.arpa
  # TODO: The 127.0.0.1 address should probably be moved to a host-specific file.
  networking.extraHosts = ''
-    127.0.0.1 odo.home.arpa quark.home.arpa
+    127.0.0.1 ${config.networking.hostName}.home.arpa
    10.216.1.1		homeserver
    10.216.1.6		media
-    #10.216.1.12		odo
+    10.216.1.12		odo
    10.216.1.14		neelix
    10.216.1.15		quark
    10.217.1.1		drmario
Author	SHA1	Message	Date
Tom Alexander	a36ebbf94c	Switching --no-build-nix to --fast because it fixes remote deploys to machines with different architectures. I thought these flags were synonymous?	2025-05-04 14:50:14 -04:00
Tom Alexander	1044aa16b0	Update to linux 6.14.	2025-05-04 12:09:57 -04:00