Update packages.

2026-09-07 17:42:46 -04:00
91 changed files with 80 additions and 176 deletions
--- a/nix/configuration/configuration.nix
+++ b/nix/configuration/configuration.nix
@@ -78,7 +78,6 @@ in
    ./roles/postgresql_client
    ./roles/python
    ./roles/qemu
-    ./roles/rdp_client
    ./roles/recovery
    ./roles/reset
    ./roles/rpcs3
@@ -240,10 +239,10 @@ in
      in
      [
        (disableTests "deno") # Tests use too much disk space
+        (disableOptimizations "libtpms")
        (disableOptimizationsPython3 "scipy")
-        (disableTestsPython "scipy")
-        (disableOptimizations "rapidjson")
-        (disableOptimizations "gsl") # FAIL: cholesky_invert unscaled hilbert (  4,  4)[0,2]: 2.55795384873636067e-13                        0
+        (disableOptimizations "assimp")
+        (disableOptimizations "gsl")
        (final: prev: {
          rpcs3 = prev.rpcs3.override {
            glew = (final.glew.override { enableEGL = false; });
@@ -274,11 +273,6 @@ in
            }
          );
        })
-        (disableTests "ada") # [simple_abs] Checked simple_absolute_fuzz FAIL href not idempotent
-        (disableOptimizations "jujutsu") # FAIL [   0.004s] jj-lib::runner test_converge::test_find_divergent_changes_exactly_one_found
-        (disableOptimizationsPython3 "zopfli") # /nix/store/idjhlmljrapzm3i1svl5x9mdwfxxj51v-pytest-check-hook/nix-support/setup-hook: line 23:   280 Segmentation fault         (core dumped) /nix/store/87l6i0czch42nzv39ydwld5hnhcq0b65-python3-3.14.7/bin/python3.14 "${flagsArray[@]}"
-        (disableOptimizations "zopfli")
-        (disableOptimizations "nototools") # Needs to use the same version of python as the zopfli package
      ];

    # This option defines the first version of NixOS you have installed on this particular machine,
--- a/nix/configuration/flake.lock
+++ b/nix/configuration/flake.lock
@@ -22,11 +22,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1789770686,
-        "narHash": "sha256-uZkBR7yHdIKUFB5SZdfgh1qkGfI3XmYmI/lTiquxbck=",
+        "lastModified": 1781152676,
+        "narHash": "sha256-RxWs5ND31KzTG7wvMM+PMfUjyNpmIEr999lqNARaM5o=",
        "owner": "nix-community",
        "repo": "disko",
-        "rev": "725ea35e410ad83be4931d1bff7e090eacaf3563",
+        "rev": "ff8702b4de27f72b4c78573dfb89ec74e36abdf1",
        "type": "github"
      },
      "original": {
@@ -170,11 +170,11 @@
        "rust-overlay": "rust-overlay_2"
      },
      "locked": {
-        "lastModified": 1791322690,
-        "narHash": "sha256-nTH7IRoRCNciIhCCmzMRY7zyRbeLEDZfWw/pvKqpsgo=",
+        "lastModified": 1788488145,
+        "narHash": "sha256-s1UY+kbLtb+5ye4GnE/HKh0idUQ0iiIkMMtGI7cDRHk=",
        "ref": "refs/heads/main",
-        "rev": "f3378fc4009478d9c8ab6921b438c92a4f0897ef",
-        "revCount": 47,
+        "rev": "8b28dfb583e094f52fd6ab70c709cc1981d8853d",
+        "revCount": 46,
        "type": "git",
        "url": "https://code.fizz.buzz/talexander/nix_builder.git"
      },
@@ -185,11 +185,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1791260994,
-        "narHash": "sha256-Miqqk/ammqnTUxaoCyvtwoPeLbI1ksFyLxi/CazZpWY=",
+        "lastModified": 1788752844,
+        "narHash": "sha256-VaWGJ6+cIYN2erfSecbRV+4ljI185Ty2wUrXyvQbgOw=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "151fa4e8ddfdd8dd25d945ad94ed54a13de9f6e4",
+        "rev": "dc5d91f840324650bac8c379428c7037a416959a",
        "type": "github"
      },
      "original": {
--- a/nix/configuration/hosts/family_disks/DEPLOY_BOOT
+++ b/nix/configuration/hosts/family_disks/DEPLOY_BOOT
@@ -10,4 +10,4 @@ TARGET=family_disks

 for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done

-nixos-rebuild boot --flake "$DIR/../../#family_disks" --target-host "$TARGET" --build-host "$TARGET" --sudo --max-jobs "$JOBS" --log-format internal-json -v "${@}" |& nom --json
+nixos-rebuild boot --flake "$DIR/../../#family_disks" --target-host "$TARGET" --build-host "$TARGET" --sudo --max-jobs "$JOBS" --repair --log-format internal-json -v "${@}" |& nom --json
--- a/nix/configuration/hosts/family_disks/DEPLOY_SWITCH
+++ b/nix/configuration/hosts/family_disks/DEPLOY_SWITCH
@@ -10,4 +10,4 @@ TARGET=family_disks

 for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done

-nixos-rebuild switch --flake "$DIR/../../#family_disks" --target-host "$TARGET" --build-host "$TARGET" --sudo --max-jobs "$JOBS" --log-format internal-json -v "${@}" |& nom --json
+nixos-rebuild switch --flake "$DIR/../../#family_disks" --target-host "$TARGET" --build-host "$TARGET" --sudo --max-jobs "$JOBS" --repair --log-format internal-json -v "${@}" |& nom --json
--- a/nix/configuration/hosts/family_disks/ISO
+++ b/nix/configuration/hosts/family_disks/ISO
@@ -7,4 +7,4 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 : "${JOBS:="1"}"

 for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done
-nix build --extra-experimental-features nix-command --extra-experimental-features flakes "$DIR/../..#family_disks.iso" --max-jobs "$JOBS" --log-format internal-json -v "${@}" |& nom --json
+nix build --extra-experimental-features nix-command --extra-experimental-features flakes "$DIR/../..#family_disks.iso" --repair --max-jobs "$JOBS" --log-format internal-json -v "${@}" |& nom --json
--- a/nix/configuration/hosts/family_disks/SELF_BOOT
+++ b/nix/configuration/hosts/family_disks/SELF_BOOT
@@ -7,4 +7,4 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 : "${JOBS:="1"}"

 for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done
-nixos-rebuild boot --show-trace --sudo --max-jobs "$JOBS" --flake "$DIR/../../#family_disks" --log-format internal-json -v "${@}" |& nom --json
+nixos-rebuild boot --show-trace --sudo --max-jobs "$JOBS" --flake "$DIR/../../#family_disks" --repair --log-format internal-json -v "${@}" |& nom --json
--- a/nix/configuration/hosts/family_disks/SELF_BUILD
+++ b/nix/configuration/hosts/family_disks/SELF_BUILD
@@ -9,4 +9,4 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"

 for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done

-nixos-rebuild build --show-trace --sudo --max-jobs "$JOBS" --flake "$DIR/../../#family_disks" --log-format internal-json -v "${@}" |& nom --json
+nixos-rebuild build --show-trace --sudo --max-jobs "$JOBS" --flake "$DIR/../../#family_disks" --repair --log-format internal-json -v "${@}" |& nom --json
--- a/nix/configuration/hosts/family_disks/SELF_SWITCH
+++ b/nix/configuration/hosts/family_disks/SELF_SWITCH
@@ -7,4 +7,4 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 : "${JOBS:="1"}"

 for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done
-nixos-rebuild switch --show-trace --sudo --max-jobs "$JOBS" --flake "$DIR/../../#family_disks" --log-format internal-json -v "${@}" |& nom --json
+nixos-rebuild switch --show-trace --sudo --max-jobs "$JOBS" --flake "$DIR/../../#family_disks" --repair --log-format internal-json -v "${@}" |& nom --json
--- a/nix/configuration/hosts/hydra/DEPLOY_BOOT
+++ b/nix/configuration/hosts/hydra/DEPLOY_BOOT
@@ -10,4 +10,4 @@ TARGET=hydra

 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" --sudo --max-jobs "$JOBS" --log-format internal-json -v "${@}" |& nom --json
+nixos-rebuild boot --flake "$DIR/../../#hydra" --target-host "$TARGET" --build-host "$TARGET" --sudo --max-jobs "$JOBS" --repair --log-format internal-json -v "${@}" |& nom --json
--- a/nix/configuration/hosts/hydra/DEPLOY_SWITCH
+++ b/nix/configuration/hosts/hydra/DEPLOY_SWITCH
@@ -10,4 +10,4 @@ TARGET=hydra

 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" --sudo --max-jobs "$JOBS" --log-format internal-json -v "${@}" |& nom --json
+nixos-rebuild switch --flake "$DIR/../../#hydra" --target-host "$TARGET" --build-host "$TARGET" --sudo --max-jobs "$JOBS" --repair --log-format internal-json -v "${@}" |& nom --json
--- a/nix/configuration/hosts/hydra/ISO
+++ b/nix/configuration/hosts/hydra/ISO
@@ -7,4 +7,4 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 : "${JOBS:="1"}"

 for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done
-nix build --extra-experimental-features nix-command --extra-experimental-features flakes "$DIR/../..#hydra.iso" --max-jobs "$JOBS" --log-format internal-json -v "${@}" |& nom --json
+nix build --extra-experimental-features nix-command --extra-experimental-features flakes "$DIR/../..#hydra.iso" --max-jobs "$JOBS" --repair --log-format internal-json -v "${@}" |& nom --json
--- a/nix/configuration/hosts/hydra/SELF_BOOT
+++ b/nix/configuration/hosts/hydra/SELF_BOOT
@@ -7,4 +7,4 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 : "${JOBS:="1"}"

 for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done
-nixos-rebuild boot --show-trace --sudo --max-jobs "$JOBS" --flake "$DIR/../../#hydra" --log-format internal-json -v "${@}" |& nom --json
+nixos-rebuild boot --show-trace --sudo --max-jobs "$JOBS" --flake "$DIR/../../#hydra" --repair --log-format internal-json -v "${@}" |& nom --json
--- a/nix/configuration/hosts/hydra/SELF_BUILD
+++ b/nix/configuration/hosts/hydra/SELF_BUILD
@@ -7,4 +7,4 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 : "${JOBS:="1"}"

 for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done
-nixos-rebuild build --show-trace --sudo --max-jobs "$JOBS" --flake "$DIR/../../#hydra" --log-format internal-json -v "${@}" |& nom --json
+nixos-rebuild build --show-trace --sudo --max-jobs "$JOBS" --flake "$DIR/../../#hydra" --repair --log-format internal-json -v "${@}" |& nom --json
--- a/nix/configuration/hosts/hydra/SELF_SWITCH
+++ b/nix/configuration/hosts/hydra/SELF_SWITCH
@@ -7,4 +7,4 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 : "${JOBS:="1"}"

 for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done
-nixos-rebuild switch --show-trace --sudo --max-jobs "$JOBS" --flake "$DIR/../../#hydra" --log-format internal-json -v "${@}" |& nom --json
+nixos-rebuild switch --show-trace --sudo --max-jobs "$JOBS" --flake "$DIR/../../#hydra" --repair --log-format internal-json -v "${@}" |& nom --json
--- a/nix/configuration/hosts/hydra/VM_ISO
+++ b/nix/configuration/hosts/hydra/VM_ISO
@@ -7,4 +7,4 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 : "${JOBS:="1"}"

 for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done
-nix build --extra-experimental-features nix-command --extra-experimental-features flakes "$DIR/../..#hydra.vm_iso" --max-jobs "$JOBS" --log-format internal-json -v "${@}" |& nom --json
+nix build --extra-experimental-features nix-command --extra-experimental-features flakes "$DIR/../..#hydra.vm_iso" --max-jobs "$JOBS" --repair --log-format internal-json -v "${@}" |& nom --json
--- a/nix/configuration/hosts/hydra/default.nix
+++ b/nix/configuration/hosts/hydra/default.nix
@@ -20,7 +20,7 @@
  config = {
    networking =
      let
-        interface = "enp0s10";
+        interface = "enp0s2";
      in
      {
        # Generate with `head -c4 /dev/urandom | od -A none -t x4`
--- a/nix/configuration/hosts/i_only_boot_zfs/DEPLOY_BOOT
+++ b/nix/configuration/hosts/i_only_boot_zfs/DEPLOY_BOOT
@@ -10,4 +10,4 @@ TARGET=i_only_boot_zfs

 for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done

-nixos-rebuild boot --flake "$DIR/../../#i_only_boot_zfs" --target-host "$TARGET" --build-host "$TARGET" --sudo --max-jobs "$JOBS" --log-format internal-json -v "${@}" |& nom --json
+nixos-rebuild boot --flake "$DIR/../../#i_only_boot_zfs" --target-host "$TARGET" --build-host "$TARGET" --sudo --max-jobs "$JOBS" --repair --log-format internal-json -v "${@}" |& nom --json
--- a/nix/configuration/hosts/i_only_boot_zfs/DEPLOY_SWITCH
+++ b/nix/configuration/hosts/i_only_boot_zfs/DEPLOY_SWITCH
@@ -10,4 +10,4 @@ TARGET=i_only_boot_zfs

 for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done

-nixos-rebuild switch --flake "$DIR/../../#i_only_boot_zfs" --target-host "$TARGET" --build-host "$TARGET" --sudo --max-jobs "$JOBS" --log-format internal-json -v "${@}" |& nom --json
+nixos-rebuild switch --flake "$DIR/../../#i_only_boot_zfs" --target-host "$TARGET" --build-host "$TARGET" --sudo --max-jobs "$JOBS" --repair --log-format internal-json -v "${@}" |& nom --json
--- a/nix/configuration/hosts/i_only_boot_zfs/ISO
+++ b/nix/configuration/hosts/i_only_boot_zfs/ISO
@@ -7,4 +7,4 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 : "${JOBS:="1"}"

 for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done
-nix build --extra-experimental-features nix-command --extra-experimental-features flakes "$DIR/../..#i_only_boot_zfs.iso" --max-jobs "$JOBS" --log-format internal-json -v "${@}" |& nom --json
+nix build --extra-experimental-features nix-command --extra-experimental-features flakes "$DIR/../..#i_only_boot_zfs.iso" --repair --max-jobs "$JOBS" --log-format internal-json -v "${@}" |& nom --json
--- a/nix/configuration/hosts/i_only_boot_zfs/SELF_BOOT
+++ b/nix/configuration/hosts/i_only_boot_zfs/SELF_BOOT
@@ -7,4 +7,4 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 : "${JOBS:="1"}"

 for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done
-nixos-rebuild boot --show-trace --sudo --max-jobs "$JOBS" --flake "$DIR/../../#i_only_boot_zfs" --log-format internal-json -v "${@}" |& nom --json
+nixos-rebuild boot --show-trace --sudo --max-jobs "$JOBS" --flake "$DIR/../../#i_only_boot_zfs" --repair --log-format internal-json -v "${@}" |& nom --json
--- a/nix/configuration/hosts/i_only_boot_zfs/SELF_BUILD
+++ b/nix/configuration/hosts/i_only_boot_zfs/SELF_BUILD
@@ -7,4 +7,4 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 : "${JOBS:="1"}"

 for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done
-nixos-rebuild build --show-trace --sudo --max-jobs "$JOBS" --flake "$DIR/../../#i_only_boot_zfs" --log-format internal-json -v "${@}" |& nom --json
+nixos-rebuild build --show-trace --sudo --max-jobs "$JOBS" --flake "$DIR/../../#i_only_boot_zfs" --repair --log-format internal-json -v "${@}" |& nom --json
--- a/nix/configuration/hosts/i_only_boot_zfs/SELF_SWITCH
+++ b/nix/configuration/hosts/i_only_boot_zfs/SELF_SWITCH
@@ -7,4 +7,4 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 : "${JOBS:="1"}"

 for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done
-nixos-rebuild switch --show-trace --sudo --max-jobs "$JOBS" --flake "$DIR/../../#i_only_boot_zfs" --log-format internal-json -v "${@}" |& nom --json
+nixos-rebuild switch --show-trace --sudo --max-jobs "$JOBS" --flake "$DIR/../../#i_only_boot_zfs" --repair --log-format internal-json -v "${@}" |& nom --json
--- a/nix/configuration/hosts/neelix/DEPLOY_BOOT
+++ b/nix/configuration/hosts/neelix/DEPLOY_BOOT
@@ -12,6 +12,6 @@ TARGET=neelix

 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" --sudo --max-jobs "$JOBS" --log-format internal-json -v "${@}" |& nom --json
+nixos-rebuild boot --flake "$DIR/../../#neelix" --target-host "$TARGET" --build-host "$TARGET" --sudo --max-jobs "$JOBS" --repair --log-format internal-json -v "${@}" |& nom --json

 # 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
@@ -12,6 +12,6 @@ TARGET=neelix

 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" --sudo --max-jobs "$JOBS" --log-format internal-json -v "${@}" |& nom --json
+nixos-rebuild switch --flake "$DIR/../../#neelix" --target-host "$TARGET" --build-host "$TARGET" --sudo --max-jobs "$JOBS" --repair --log-format internal-json -v "${@}" |& nom --json

 # 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/DEPLOY_BOOT
+++ b/nix/configuration/hosts/odo/DEPLOY_BOOT
@@ -10,4 +10,4 @@ TARGET=odo

 for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done

-nixos-rebuild boot --flake "$DIR/../../#odo" --target-host "$TARGET" --build-host "$TARGET" --sudo --max-jobs "$JOBS" --log-format internal-json -v "${@}" |& nom --json
+nixos-rebuild boot --flake "$DIR/../../#odo" --target-host "$TARGET" --build-host "$TARGET" --sudo --max-jobs "$JOBS" --repair --log-format internal-json -v "${@}" |& nom --json
--- a/nix/configuration/hosts/odo/DEPLOY_SWITCH
+++ b/nix/configuration/hosts/odo/DEPLOY_SWITCH
@@ -10,4 +10,4 @@ TARGET=odo

 for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done

-nixos-rebuild switch --flake "$DIR/../../#odo" --target-host "$TARGET" --build-host "$TARGET" --sudo --max-jobs "$JOBS" --log-format internal-json -v "${@}" |& nom --json
+nixos-rebuild switch --flake "$DIR/../../#odo" --target-host "$TARGET" --build-host "$TARGET" --sudo --max-jobs "$JOBS" --repair --log-format internal-json -v "${@}" |& nom --json
--- a/nix/configuration/hosts/odo/ISO
+++ b/nix/configuration/hosts/odo/ISO
@@ -7,4 +7,4 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 : "${JOBS:="1"}"

 for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done
-nix build --extra-experimental-features nix-command --extra-experimental-features flakes "$DIR/../..#odo.iso" --max-jobs "$JOBS" --log-format internal-json -v "${@}" |& nom --json
+nix build --extra-experimental-features nix-command --extra-experimental-features flakes "$DIR/../..#odo.iso" --max-jobs "$JOBS" --repair --log-format internal-json -v "${@}" |& nom --json
--- a/nix/configuration/hosts/odo/SELF_BOOT
+++ b/nix/configuration/hosts/odo/SELF_BOOT
@@ -7,4 +7,4 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 : "${JOBS:="1"}"

 for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done
-nixos-rebuild boot --show-trace --sudo --max-jobs "$JOBS" --flake "$DIR/../../#odo" --log-format internal-json -v "${@}" |& nom --json
+nixos-rebuild boot --show-trace --sudo --max-jobs "$JOBS" --flake "$DIR/../../#odo" --repair --log-format internal-json -v "${@}" |& nom --json
--- a/nix/configuration/hosts/odo/SELF_BUILD
+++ b/nix/configuration/hosts/odo/SELF_BUILD
@@ -8,4 +8,4 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"

 for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done

-nixos-rebuild build --show-trace --sudo --max-jobs "$JOBS" --flake "$DIR/../../#odo" --log-format internal-json -v "${@}" |& nom --json
+nixos-rebuild build --show-trace --sudo --max-jobs "$JOBS" --flake "$DIR/../../#odo" --repair --log-format internal-json -v "${@}" |& nom --json
--- a/nix/configuration/hosts/odo/SELF_SWITCH
+++ b/nix/configuration/hosts/odo/SELF_SWITCH
@@ -7,4 +7,4 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 : "${JOBS:="1"}"

 for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done
-nixos-rebuild switch --show-trace --sudo --max-jobs "$JOBS" --flake "$DIR/../../#odo" --log-format internal-json -v "${@}" |& nom --json
+nixos-rebuild switch --show-trace --sudo --max-jobs "$JOBS" --flake "$DIR/../../#odo" --repair --log-format internal-json -v "${@}" |& nom --json
--- a/nix/configuration/hosts/odowork/DEPLOY_BOOT
+++ b/nix/configuration/hosts/odowork/DEPLOY_BOOT
@@ -8,4 +8,4 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"

 TARGET=odowork

-nixos-rebuild boot --flake "$DIR/../../#odowork" --target-host "$TARGET" --build-host "$TARGET" --sudo --max-jobs "$JOBS" --log-format internal-json -v "${@}" |& nom --json
+nixos-rebuild boot --flake "$DIR/../../#odowork" --target-host "$TARGET" --build-host "$TARGET" --sudo --max-jobs "$JOBS" --repair --log-format internal-json -v "${@}" |& nom --json
--- a/nix/configuration/hosts/odowork/DEPLOY_SWITCH
+++ b/nix/configuration/hosts/odowork/DEPLOY_SWITCH
@@ -8,4 +8,4 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"

 TARGET=odowork

-nixos-rebuild switch --flake "$DIR/../../#odowork" --target-host "$TARGET" --build-host "$TARGET" --sudo --max-jobs "$JOBS" --log-format internal-json -v "${@}" |& nom --json
+nixos-rebuild switch --flake "$DIR/../../#odowork" --target-host "$TARGET" --build-host "$TARGET" --sudo --max-jobs "$JOBS" --repair --log-format internal-json -v "${@}" |& nom --json
--- a/nix/configuration/hosts/odowork/INSTALLER
+++ b/nix/configuration/hosts/odowork/INSTALLER
@@ -6,4 +6,4 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"

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

-nix build --extra-experimental-features nix-command --extra-experimental-features flakes "$DIR/../..#odowork.installer" --max-jobs "$JOBS" --log-format internal-json -v "${@}" |& nom --json
+nix build --extra-experimental-features nix-command --extra-experimental-features flakes "$DIR/../..#odowork.installer" --repair --max-jobs "$JOBS" --log-format internal-json -v "${@}" |& nom --json
--- a/nix/configuration/hosts/odowork/ISO
+++ b/nix/configuration/hosts/odowork/ISO
@@ -6,4 +6,4 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"

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

-nix build --extra-experimental-features nix-command --extra-experimental-features flakes "$DIR/../..#odowork.iso" --max-jobs "$JOBS" --log-format internal-json -v "${@}" |& nom --json
+nix build --extra-experimental-features nix-command --extra-experimental-features flakes "$DIR/../..#odowork.iso" --max-jobs "$JOBS" --repair --log-format internal-json -v "${@}" |& nom --json
--- a/nix/configuration/hosts/odowork/SELF_BOOT
+++ b/nix/configuration/hosts/odowork/SELF_BOOT
@@ -6,4 +6,4 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"

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

-nixos-rebuild boot --show-trace --sudo --max-jobs "$JOBS" --flake "$DIR/../../#odowork" --log-format internal-json -v "${@}" |& nom --json
+nixos-rebuild boot --show-trace --sudo --max-jobs "$JOBS" --flake "$DIR/../../#odowork" --repair --log-format internal-json -v "${@}" |& nom --json
--- a/nix/configuration/hosts/odowork/SELF_BUILD
+++ b/nix/configuration/hosts/odowork/SELF_BUILD
@@ -6,4 +6,4 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"

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

-nixos-rebuild build --show-trace --sudo --max-jobs "$JOBS" --flake "$DIR/../../#odowork" --log-format internal-json -v "${@}" |& nom --json
+nixos-rebuild build --show-trace --sudo --max-jobs "$JOBS" --flake "$DIR/../../#odowork" --repair --log-format internal-json -v "${@}" |& nom --json
--- a/nix/configuration/hosts/odowork/SELF_SWITCH
+++ b/nix/configuration/hosts/odowork/SELF_SWITCH
@@ -6,4 +6,4 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"

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

-nixos-rebuild switch --show-trace --sudo --max-jobs "$JOBS" --flake "$DIR/../../#odowork" --log-format internal-json -v "${@}" |& nom --json
+nixos-rebuild switch --show-trace --sudo --max-jobs "$JOBS" --flake "$DIR/../../#odowork" --repair --log-format internal-json -v "${@}" |& nom --json
--- a/nix/configuration/hosts/odowork/default.nix
+++ b/nix/configuration/hosts/odowork/default.nix
@@ -126,7 +126,6 @@
    me.podman.enable = true;
    me.postgresql_client.enable = true;
    me.python.enable = true;
-    me.rdp_client.enable = true;
    me.rust.enable = true;
    me.sequoia.enable = true;
    me.shikane.enable = true;
--- a/nix/configuration/hosts/quark/DEPLOY_BOOT
+++ b/nix/configuration/hosts/quark/DEPLOY_BOOT
@@ -10,4 +10,4 @@ TARGET=quark

 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" --sudo --max-jobs "$JOBS" --log-format internal-json -v "${@}" |& nom --json
+nixos-rebuild boot --flake "$DIR/../../#quark" --target-host "$TARGET" --build-host "$TARGET" --sudo --max-jobs "$JOBS" --repair --log-format internal-json -v "${@}" |& nom --json
--- a/nix/configuration/hosts/quark/DEPLOY_SWITCH
+++ b/nix/configuration/hosts/quark/DEPLOY_SWITCH
@@ -10,4 +10,4 @@ TARGET=quark

 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" --sudo --max-jobs "$JOBS" --log-format internal-json -v "${@}" |& nom --json
+nixos-rebuild switch --flake "$DIR/../../#quark" --target-host "$TARGET" --build-host "$TARGET" --sudo --max-jobs "$JOBS" --repair --log-format internal-json -v "${@}" |& nom --json
--- a/nix/configuration/hosts/quark/ISO
+++ b/nix/configuration/hosts/quark/ISO
@@ -7,4 +7,4 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 : "${JOBS:="1"}"

 for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done
-nix build --extra-experimental-features nix-command --extra-experimental-features flakes "$DIR/../..#quark.iso" --max-jobs "$JOBS" --log-format internal-json -v "${@}" |& nom --json
+nix build --extra-experimental-features nix-command --extra-experimental-features flakes "$DIR/../..#quark.iso" --max-jobs "$JOBS" --repair --log-format internal-json -v "${@}" |& nom --json
--- a/nix/configuration/hosts/quark/SELF_BOOT
+++ b/nix/configuration/hosts/quark/SELF_BOOT
@@ -7,4 +7,4 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 : "${JOBS:="1"}"

 for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done
-nixos-rebuild boot --show-trace --sudo --max-jobs "$JOBS" --flake "$DIR/../../#quark" --log-format internal-json -v "${@}" |& nom --json
+nixos-rebuild boot --show-trace --sudo --max-jobs "$JOBS" --flake "$DIR/../../#quark" --repair --log-format internal-json -v "${@}" |& nom --json
--- a/nix/configuration/hosts/quark/SELF_BUILD
+++ b/nix/configuration/hosts/quark/SELF_BUILD
@@ -7,4 +7,4 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 : "${JOBS:="1"}"

 for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done
-nixos-rebuild build --show-trace --sudo --max-jobs "$JOBS" --flake "$DIR/../../#quark" --log-format internal-json -v "${@}" |& nom --json
+nixos-rebuild build --show-trace --sudo --max-jobs "$JOBS" --flake "$DIR/../../#quark" --repair --log-format internal-json -v "${@}" |& nom --json
--- a/nix/configuration/hosts/quark/SELF_SWITCH
+++ b/nix/configuration/hosts/quark/SELF_SWITCH
@@ -7,4 +7,4 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 : "${JOBS:="1"}"

 for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done
-nixos-rebuild switch --show-trace --sudo --max-jobs "$JOBS" --flake "$DIR/../../#quark" --log-format internal-json -v "${@}" |& nom --json
+nixos-rebuild switch --show-trace --sudo --max-jobs "$JOBS" --flake "$DIR/../../#quark" --repair --log-format internal-json -v "${@}" |& nom --json
--- a/nix/configuration/hosts/recovery/DEPLOY_BOOT
+++ b/nix/configuration/hosts/recovery/DEPLOY_BOOT
@@ -10,4 +10,4 @@ TARGET=recovery

 for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done

-nixos-rebuild boot --flake "$DIR/../../#recovery" --target-host "$TARGET" --build-host "$TARGET" --sudo --max-jobs "$JOBS" --log-format internal-json -v "${@}" |& nom --json
+nixos-rebuild boot --flake "$DIR/../../#recovery" --target-host "$TARGET" --build-host "$TARGET" --sudo --max-jobs "$JOBS" --repair --log-format internal-json -v "${@}" |& nom --json
--- a/nix/configuration/hosts/recovery/DEPLOY_SWITCH
+++ b/nix/configuration/hosts/recovery/DEPLOY_SWITCH
@@ -10,4 +10,4 @@ TARGET=recovery

 for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done

-nixos-rebuild switch --flake "$DIR/../../#recovery" --target-host "$TARGET" --build-host "$TARGET" --sudo --max-jobs "$JOBS" --log-format internal-json -v "${@}" |& nom --json
+nixos-rebuild switch --flake "$DIR/../../#recovery" --target-host "$TARGET" --build-host "$TARGET" --sudo --max-jobs "$JOBS" --repair --log-format internal-json -v "${@}" |& nom --json
--- a/nix/configuration/hosts/recovery/ISO
+++ b/nix/configuration/hosts/recovery/ISO
@@ -7,4 +7,4 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 : "${JOBS:="1"}"

 for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done
-nix build --extra-experimental-features nix-command --extra-experimental-features flakes "$DIR/../..#recovery.iso" --max-jobs "$JOBS" --log-format internal-json -v "${@}" |& nom --json
+nix build --extra-experimental-features nix-command --extra-experimental-features flakes "$DIR/../..#recovery.iso" --max-jobs "$JOBS" --repair --log-format internal-json -v "${@}" |& nom --json
--- a/nix/configuration/hosts/recovery/SELF_BOOT
+++ b/nix/configuration/hosts/recovery/SELF_BOOT
@@ -7,4 +7,4 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 : "${JOBS:="1"}"

 for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done
-nixos-rebuild boot --show-trace --sudo --max-jobs "$JOBS" --flake "$DIR/../../#recovery" --log-format internal-json -v "${@}" |& nom --json
+nixos-rebuild boot --show-trace --sudo --max-jobs "$JOBS" --flake "$DIR/../../#recovery" --repair --log-format internal-json -v "${@}" |& nom --json
--- a/nix/configuration/hosts/recovery/SELF_BUILD
+++ b/nix/configuration/hosts/recovery/SELF_BUILD
@@ -7,4 +7,4 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 : "${JOBS:="1"}"

 for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done
-nixos-rebuild build --show-trace --sudo --max-jobs "$JOBS" --flake "$DIR/../../#recovery" --log-format internal-json -v "${@}" |& nom --json
+nixos-rebuild build --show-trace --sudo --max-jobs "$JOBS" --flake "$DIR/../../#recovery" --repair --log-format internal-json -v "${@}" |& nom --json
--- a/nix/configuration/hosts/recovery/SELF_SWITCH
+++ b/nix/configuration/hosts/recovery/SELF_SWITCH
@@ -7,4 +7,4 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 : "${JOBS:="1"}"

 for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done
-nixos-rebuild switch --show-trace --sudo --max-jobs "$JOBS" --flake "$DIR/../../#recovery" --log-format internal-json -v "${@}" |& nom --json
+nixos-rebuild switch --show-trace --sudo --max-jobs "$JOBS" --flake "$DIR/../../#recovery" --repair --log-format internal-json -v "${@}" |& nom --json
--- a/nix/configuration/roles/emacs/default.nix
+++ b/nix/configuration/roles/emacs/default.nix
@@ -120,7 +120,7 @@ in
                    (final.aspellWithDicts (
                      dicts: with dicts; [
                        en
-                        # en-computers # Apparently points to a gambling website now.
+                        en-computers
                        # en-science # TODO: Why is en-science non-free?
                      ]
                    ))
--- a/nix/configuration/roles/emacs/files/emacs/early-init.el
+++ b/nix/configuration/roles/emacs/files/emacs/early-init.el
@@ -1,4 +1,3 @@
-;; -*- lexical-binding: t; -*-
 (setq gc-cons-threshold (* 128 1024 1024)) ;; 128MiB Increase garbage collection threshold for performance (default 800000)
 ;; Increase amount of data read from processes, default 4k
 (when (version<= "27.0" emacs-version)
--- a/nix/configuration/roles/emacs/files/emacs/elisp/base-extensions.el
+++ b/nix/configuration/roles/emacs/files/emacs/elisp/base-extensions.el
@@ -1,4 +1,3 @@
-;; -*- lexical-binding: t; -*-
 (use-package diminish)

 ;; Eglot recommends pulling the latest of the standard libraries it
--- a/nix/configuration/roles/emacs/files/emacs/elisp/base-functions.el
+++ b/nix/configuration/roles/emacs/files/emacs/elisp/base-functions.el
@@ -1,4 +1,3 @@
-;; -*- lexical-binding: t; -*-
 ;; ========== Function to reload current file =================

 (defun reload-file ()
@@ -12,9 +11,10 @@
  "Run a command using the current buffer as stdin and replacing its contents if the command succeeds with the stdout from the command. This is useful for code formatters."
  (let (
        (stdout-buffer (generate-new-buffer "tmp-stdout" t))
+        (full-cmd (append '(call-process-region nil nil cmd nil stdout-buffer nil) args))
        )
    (unwind-protect
-        (let ((exit-status (apply #'call-process-region nil nil cmd nil (list stdout-buffer nil) nil args)))
+        (let ((exit-status (eval full-cmd)))
          (if (eq exit-status 0)
              (save-excursion
                (replace-buffer-contents stdout-buffer)
@@ -31,9 +31,10 @@
  "Run a command using the current buffer as stdin and replacing its contents if the command succeeds with the stdout from the command. This is useful for code formatters. This version only replaces the buffer contents if the command output some text."
  (let (
        (stdout-buffer (generate-new-buffer "tmp-stdout" t))
+        (full-cmd (append '(call-process-region nil nil cmd nil stdout-buffer nil) args))
        )
    (unwind-protect
-        (let ((exit-status (apply #'call-process-region nil nil cmd nil (list stdout-buffer nil) nil args)))
+        (let ((exit-status (eval full-cmd)))
          (if (eq exit-status 0)
              (if (> (buffer-size stdout-buffer) 0)
                  (save-excursion
@@ -54,9 +55,10 @@
  (let (
        (default-directory (or dir default-directory))
        (stdout-buffer (generate-new-buffer "tmp-stdout" t))
+        (full-cmd (append '(call-process cmd nil (list stdout-buffer nil) nil) args))
        )
    (unwind-protect
-        (let ((exit-status (condition-case nil (apply #'call-process cmd nil (list stdout-buffer nil) nil args) (file-missing nil))))
+        (let ((exit-status (condition-case nil (eval full-cmd) (file-missing nil))))
          (if (eq exit-status 0)
              (progn
                (with-current-buffer stdout-buffer
--- a/nix/configuration/roles/emacs/files/emacs/elisp/base-global-keys.el
+++ b/nix/configuration/roles/emacs/files/emacs/elisp/base-global-keys.el
@@ -1,4 +1,3 @@
-;; -*- lexical-binding: t; -*-
 ;; Add your keys here, as such

 ;; Disable the suspend frame hotkeys
--- a/nix/configuration/roles/emacs/files/emacs/elisp/base-theme.el
+++ b/nix/configuration/roles/emacs/files/emacs/elisp/base-theme.el
@@ -1,4 +1,3 @@
-;; -*- lexical-binding: t; -*-
 ;; Set theme
 (load-theme 'tango-dark t)
 (set-face-attribute 'default nil :background "black")
--- a/nix/configuration/roles/emacs/files/emacs/elisp/base.el
+++ b/nix/configuration/roles/emacs/files/emacs/elisp/base.el
@@ -1,4 +1,3 @@
-;; -*- lexical-binding: t; -*-
 (package-initialize)
 (use-package use-package
  :custom
--- a/nix/configuration/roles/emacs/files/emacs/elisp/common-lsp.el
+++ b/nix/configuration/roles/emacs/files/emacs/elisp/common-lsp.el
@@ -1,4 +1,3 @@
-;; -*- lexical-binding: t; -*-
 (use-package eglot
  ;; This is an emacs built-in but we're pulling the latest version
  :pin gnu
--- a/nix/configuration/roles/emacs/files/emacs/elisp/lang-bash.el
+++ b/nix/configuration/roles/emacs/files/emacs/elisp/lang-bash.el
@@ -1,4 +1,3 @@
-;; -*- lexical-binding: t; -*-
 (require 'util-tree-sitter)

 (use-package bash-ts-mode
--- a/nix/configuration/roles/emacs/files/emacs/elisp/lang-c.el
+++ b/nix/configuration/roles/emacs/files/emacs/elisp/lang-c.el
@@ -1,4 +1,3 @@
-;; -*- lexical-binding: t; -*-
 (require 'common-lsp)
 (require 'util-tree-sitter)

--- a/nix/configuration/roles/emacs/files/emacs/elisp/lang-cmake.el
+++ b/nix/configuration/roles/emacs/files/emacs/elisp/lang-cmake.el
@@ -1,4 +1,3 @@
-;; -*- lexical-binding: t; -*-
 (require 'common-lsp)

 (use-package cmake-mode
--- a/nix/configuration/roles/emacs/files/emacs/elisp/lang-d2.el
+++ b/nix/configuration/roles/emacs/files/emacs/elisp/lang-d2.el
@@ -1,4 +1,3 @@
-;; -*- lexical-binding: t; -*-
 (defun d2-format-buffer ()
  "Run prettier."
  (interactive)
--- a/nix/configuration/roles/emacs/files/emacs/elisp/lang-dockerfile.el
+++ b/nix/configuration/roles/emacs/files/emacs/elisp/lang-dockerfile.el
@@ -1,4 +1,3 @@
-;; -*- lexical-binding: t; -*-
 (use-package dockerfile-ts-mode
  :pin manual
  :mode (
--- a/nix/configuration/roles/emacs/files/emacs/elisp/lang-go.el
+++ b/nix/configuration/roles/emacs/files/emacs/elisp/lang-go.el
@@ -1,4 +1,3 @@
-;; -*- lexical-binding: t; -*-
 (require 'common-lsp)
 (require 'util-tree-sitter)

--- a/nix/configuration/roles/emacs/files/emacs/elisp/lang-javascript.el
+++ b/nix/configuration/roles/emacs/files/emacs/elisp/lang-javascript.el
@@ -1,4 +1,3 @@
-;; -*- lexical-binding: t; -*-
 (require 'common-lsp)
 (require 'util-tree-sitter)

--- a/nix/configuration/roles/emacs/files/emacs/elisp/lang-lua.el
+++ b/nix/configuration/roles/emacs/files/emacs/elisp/lang-lua.el
@@ -1,4 +1,3 @@
-;; -*- lexical-binding: t; -*-
 (defun lua-format-buffer ()
  "Run stylua."
  (interactive)
--- a/nix/configuration/roles/emacs/files/emacs/elisp/lang-markdown.el
+++ b/nix/configuration/roles/emacs/files/emacs/elisp/lang-markdown.el
@@ -1,4 +1,3 @@
-;; -*- lexical-binding: t; -*-
 (use-package markdown-mode
  :ensure t
  :commands (markdown-mode gfm-mode)
--- a/nix/configuration/roles/emacs/files/emacs/elisp/lang-nft.el
+++ b/nix/configuration/roles/emacs/files/emacs/elisp/lang-nft.el
@@ -1,4 +1,3 @@
-;; -*- lexical-binding: t; -*-
 (use-package nftables-mode
  :commands nftables-mode
  )
--- a/nix/configuration/roles/emacs/files/emacs/elisp/lang-nix.el
+++ b/nix/configuration/roles/emacs/files/emacs/elisp/lang-nix.el
@@ -1,4 +1,3 @@
-;; -*- lexical-binding: t; -*-
 (require 'common-lsp)
 (require 'util-tree-sitter)

--- a/nix/configuration/roles/emacs/files/emacs/elisp/lang-org.el
+++ b/nix/configuration/roles/emacs/files/emacs/elisp/lang-org.el
@@ -1,4 +1,3 @@
-;; -*- lexical-binding: t; -*-
 (require 'color)
 (let ((bg (face-attribute 'default :background)))
  (use-package org
--- a/nix/configuration/roles/emacs/files/emacs/elisp/lang-python.el
+++ b/nix/configuration/roles/emacs/files/emacs/elisp/lang-python.el
@@ -1,4 +1,3 @@
-;; -*- lexical-binding: t; -*-
 (require 'common-lsp)
 (require 'util-tree-sitter)

--- a/nix/configuration/roles/emacs/files/emacs/elisp/lang-rust.el
+++ b/nix/configuration/roles/emacs/files/emacs/elisp/lang-rust.el
@@ -1,4 +1,3 @@
-;; -*- lexical-binding: t; -*-
 (require 'common-lsp)
 (require 'util-tree-sitter)

--- a/nix/configuration/roles/emacs/files/emacs/elisp/lang-terraform.el
+++ b/nix/configuration/roles/emacs/files/emacs/elisp/lang-terraform.el
@@ -1,4 +1,3 @@
-;; -*- lexical-binding: t; -*-
 (require 'common-lsp)
 (require 'util-tree-sitter)

--- a/nix/configuration/roles/emacs/files/emacs/elisp/lang-xml.el
+++ b/nix/configuration/roles/emacs/files/emacs/elisp/lang-xml.el
@@ -1,4 +1,3 @@
-;; -*- lexical-binding: t; -*-
 (defun xml-fmt ()
  "Run xmllint --format."
  (run-command-on-buffer "xmllint" "--format" "-")
--- a/nix/configuration/roles/emacs/files/emacs/elisp/lang-yaml.el
+++ b/nix/configuration/roles/emacs/files/emacs/elisp/lang-yaml.el
@@ -1,4 +1,3 @@
-;; -*- lexical-binding: t; -*-
 (defun yaml-format-buffer ()
  "Run prettier."
  (interactive)
--- a/nix/configuration/roles/emacs/files/emacs/elisp/util-flymake.el
+++ b/nix/configuration/roles/emacs/files/emacs/elisp/util-flymake.el
@@ -1,4 +1,3 @@
-;; -*- lexical-binding: t; -*-
 (use-package flymake
  :pin manual
  :ensure nil
--- a/nix/configuration/roles/emacs/files/emacs/elisp/util-tree-sitter.el
+++ b/nix/configuration/roles/emacs/files/emacs/elisp/util-tree-sitter.el
@@ -1,5 +1,3 @@
-;; -*- lexical-binding: t; -*-
-
 ;; (add-to-list 'major-mode-remap-alist '(c-mode . c-ts-mode))

 (use-package treesit
@@ -15,8 +13,6 @@
  ;;   :custom
  ;;   (treesit-font-lock-level 3)
  (setq treesit-font-lock-level 4)
-  ;; (setq treesit-auto-install-grammar t)
-  ;; (setq treesit-enabled-modes t)
  )

 (provide 'util-tree-sitter)
--- a/nix/configuration/roles/emacs/files/emacs/elisp/util-vertico.el
+++ b/nix/configuration/roles/emacs/files/emacs/elisp/util-vertico.el
@@ -1,4 +1,3 @@
-;; -*- lexical-binding: t; -*-
 (defun my/minibuffer-delete (arg)
  "When looking for files, go up an entire directory with the backspace button if theres no text after the directory."
  (interactive "p")
--- a/nix/configuration/roles/emacs/files/emacs/init.el
+++ b/nix/configuration/roles/emacs/files/emacs/init.el
@@ -1,4 +1,3 @@
-;; -*- lexical-binding: t; -*-
 (add-to-list 'load-path (concat user-emacs-directory "elisp"))

 (require 'base)
--- a/nix/configuration/roles/hydra/default.nix
+++ b/nix/configuration/roles/hydra/default.nix
@@ -1,7 +1,3 @@
-#
-# Initial setup:
-#   doas -u nixworker env NIX_REMOTE='local?root=/.disk/root' RUST_BACKTRACE=1 RUST_LOG=nix_builder=DEBUG nix copy --from 'https://cache.nixos.org' /nix/store/4f7nm8dblrdy74gmsl62b25rjrh4jcz3-stage0-posix-1.9.1-source
-#
 {
  config,
  lib,
--- a/nix/configuration/roles/rdp_client/default.nix
+++ b/nix/configuration/roles/rdp_client/default.nix
@@ -1,25 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-
-{
-  imports = [ ];
-
-  options.me = {
-    rdp_client.enable = lib.mkOption {
-      type = lib.types.bool;
-      default = false;
-      example = true;
-      description = "Whether we want to install rdp_client.";
-    };
-  };
-
-  config = lib.mkIf (config.me.rdp_client.enable && config.me.graphical) {
-    environment.systemPackages = with pkgs; [
-      freerdp
-    ];
-  };
-}
--- a/nix/kubernetes/configuration.nix
+++ b/nix/kubernetes/configuration.nix
@@ -106,24 +106,6 @@
            });
          })
        );
-        disableOptimizations = (
-          # Example: (disableOptimizations "coreutils")
-          package_name:
-          (final: prev: {
-            "${package_name}" = final.unoptimized."${package_name}";
-          })
-        );
-        disableOptimizationsPython3 = (
-          # Example: (disableOptimizationsPython3 "scipy")
-          package_name:
-          (final: prev: {
-            python3Packages = prev.python3Packages.override {
-              overrides = python-final: python-prev: {
-                "${package_name}" = final.unoptimized.python3.pkgs."${package_name}";
-              };
-            };
-          })
-        );
      in
      [
        # (final: prev: {
@@ -147,8 +129,6 @@
            libtpms
            ;
        })
-        (disableOptimizationsPython3 "zopfli")
-        (disableOptimizations "zopfli")
      ];

    # This option defines the first version of NixOS you have installed on this particular machine,
--- a/nix/kubernetes/flake.lock
+++ b/nix/kubernetes/flake.lock
@@ -22,11 +22,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1789770686,
-        "narHash": "sha256-uZkBR7yHdIKUFB5SZdfgh1qkGfI3XmYmI/lTiquxbck=",
+        "lastModified": 1781152676,
+        "narHash": "sha256-RxWs5ND31KzTG7wvMM+PMfUjyNpmIEr999lqNARaM5o=",
        "owner": "nix-community",
        "repo": "disko",
-        "rev": "725ea35e410ad83be4931d1bff7e090eacaf3563",
+        "rev": "ff8702b4de27f72b4c78573dfb89ec74e36abdf1",
        "type": "github"
      },
      "original": {
@@ -164,11 +164,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1791260994,
-        "narHash": "sha256-Miqqk/ammqnTUxaoCyvtwoPeLbI1ksFyLxi/CazZpWY=",
+        "lastModified": 1788752844,
+        "narHash": "sha256-VaWGJ6+cIYN2erfSecbRV+4ljI185Ty2wUrXyvQbgOw=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "151fa4e8ddfdd8dd25d945ad94ed54a13de9f6e4",
+        "rev": "dc5d91f840324650bac8c379428c7037a416959a",
        "type": "github"
      },
      "original": {
--- a/nix/kubernetes/hosts/controller0/default.nix
+++ b/nix/kubernetes/hosts/controller0/default.nix
@@ -20,7 +20,7 @@
  config = {
    networking =
      let
-        interface = "enp0s10";
+        interface = "enp0s2";
      in
      {
        # Generate with `head -c4 /dev/urandom | od -A none -t x4`
--- a/nix/kubernetes/hosts/controller1/default.nix
+++ b/nix/kubernetes/hosts/controller1/default.nix
@@ -20,7 +20,7 @@
  config = {
    networking =
      let
-        interface = "enp0s10";
+        interface = "enp0s2";
      in
      {
        # Generate with `head -c4 /dev/urandom | od -A none -t x4`
--- a/nix/kubernetes/hosts/controller2/default.nix
+++ b/nix/kubernetes/hosts/controller2/default.nix
@@ -20,7 +20,7 @@
  config = {
    networking =
      let
-        interface = "enp0s10";
+        interface = "enp0s2";
      in
      {
        # Generate with `head -c4 /dev/urandom | od -A none -t x4`
--- a/nix/kubernetes/hosts/worker0/default.nix
+++ b/nix/kubernetes/hosts/worker0/default.nix
@@ -20,7 +20,7 @@
  config = {
    networking =
      let
-        interface = "enp0s10";
+        interface = "enp0s2";
      in
      {
        # Generate with `head -c4 /dev/urandom | od -A none -t x4`
--- a/nix/kubernetes/hosts/worker1/default.nix
+++ b/nix/kubernetes/hosts/worker1/default.nix
@@ -20,7 +20,7 @@
  config = {
    networking =
      let
-        interface = "enp0s10";
+        interface = "enp0s2";
      in
      {
        # Generate with `head -c4 /dev/urandom | od -A none -t x4`
--- a/nix/kubernetes/hosts/worker2/default.nix
+++ b/nix/kubernetes/hosts/worker2/default.nix
@@ -20,7 +20,7 @@
  config = {
    networking =
      let
-        interface = "enp0s10";
+        interface = "enp0s2";
      in
      {
        # Generate with `head -c4 /dev/urandom | od -A none -t x4`
--- a/nix/kubernetes/keys/package/mrmanager-repo-secrets/package.nix
+++ b/nix/kubernetes/keys/package/mrmanager-repo-secrets/package.nix
@@ -134,18 +134,6 @@ let
          "nix-pull-through-cache" = {
            "CACHE_GET_TOKEN" = (builtins.readFile "${./secrets/nix-pull-through-cache/auth/CACHE_GET_TOKEN}");
          };
-          "registry-credentials" =
-            (generate_docker_secret {
-              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" = {
-              #   "tekton.dev/docker-0" = "https://harbor.fizz.buzz";
-              # };
-            };
        };
      };
  encrypted_secrets = (
--- a/nix/kubernetes/roles/kubernetes/default.nix
+++ b/nix/kubernetes/roles/kubernetes/default.nix
@@ -21,7 +21,7 @@
    assertions = [
      {
        # Kubernetes should only upgrade 1 minor version at a time, so this assert is here to prevent unwittingly jumping versions.
-        assertion = lib.hasPrefix "1.37." pkgs.kubernetes.version;
+        assertion = lib.hasPrefix "1.36." pkgs.kubernetes.version;
        message = "Unexpected Kubernetes package version: ${pkgs.kubernetes.version}";
      }
    ];