Add mt7927 driver to quark.

Support hardware accelerated RNG in qemurc.
Revert "Update packages."
2026-04-11 11:24:05 -04:00 · 2026-04-10 09:08:20 -04:00 · 2026-04-09 20:25:12 -04:00 · 2026-04-08 20:51:20 -04:00 · 2026-04-08 20:51:20 -04:00 · 2026-04-08 20:51:20 -04:00
258 changed files with 319 additions and 10695 deletions
--- a/nix/configuration/README.org
+++ b/nix/configuration/README.org
@@ -1,12 +0,0 @@
-* To-do
-** Perhaps use overlay for /etc for speedup
-#+begin_src nix
-  system.etc.overlay.enable = true;
-#+end_src
-** read https://nixos.org/manual/nixos/stable/
-** Performance for mini pc
-#+begin_src nix
-  security.pam.loginLimits = [
-    { domain = "@users"; item = "rtprio"; type = "-"; value = 1; }
-  ];
-#+end_src
--- a/nix/configuration/configuration.nix
+++ b/nix/configuration/configuration.nix
@@ -1,16 +1,9 @@
 {
  config,
  lib,
-  pkgs,
  ...
 }:

-let
-  alias_nix_pin_revision = pkgs.writeShellScriptBin "nix-pin-revision" ''
-    # Usage: nix-pin-revision nixpkgs 'github:NixOS/nixpkgs/00c21e4c93d963c50d4c0c89bfa84ed6e0694df2'
-    exec nix flake lock --override-input "''${@}"
-  '';
-in
 {
  imports = [
    ./roles/2ship2harkinian
@@ -36,7 +29,6 @@ in
    ./roles/emacs
    ./roles/emulate_isa
    ./roles/esim
-    ./roles/exfat
    ./roles/firefox
    ./roles/firewall
    ./roles/flux
@@ -55,7 +47,6 @@ in
    ./roles/iso_mount
    ./roles/jujutsu
    ./roles/kanshi
-    ./roles/kernel
    ./roles/kodi
    ./roles/kubernetes
    ./roles/latex
@@ -64,7 +55,6 @@ in
    ./roles/media
    ./roles/memtest86
    ./roles/minimal_base
-    ./roles/mitmproxy
    ./roles/network
    ./roles/nix_index
    ./roles/nix_repl
@@ -78,7 +68,6 @@ in
    ./roles/postgresql_client
    ./roles/python
    ./roles/qemu
-    ./roles/rdp_client
    ./roles/recovery
    ./roles/reset
    ./roles/rpcs3
@@ -120,14 +109,14 @@ in
    nix.settings.experimental-features = [
      "nix-command"
      "flakes"
-      # "ca-derivations"
+      "ca-derivations"
      # "blake3-hashes"
      # "git-hashing"
    ];
    nix.settings.trusted-users = [ "@wheel" ];
    nix.settings.connect-timeout = 5;
-    nix.settings.min-free = 5 * 1024 * 1024 * 1024; # Kick off garbage collect if space for nix store is less than 5 GiB
-    nix.settings.max-free = 10 * 1024 * 1024 * 1024; # Run that garbage collect until at least 10 GiB are free.
+    nix.settings.min-free = 128000000;
+    nix.settings.max-free = 1000000000;
    nix.settings.fallback = true;
    nix.settings.warn-dirty = false;
    nix.settings.fsync-metadata = true;
@@ -143,8 +132,7 @@ in
    # Automatic garbage collection
    nix.gc = lib.mkIf (!config.me.buildingPortable) {
      # Runs nix-collect-garbage --delete-older-than 5d
-      # automatic = true;
-      automatic = false;
+      automatic = true;
      persistent = true;
      dates = "monthly";
      # randomizedDelaySec = "14m";
@@ -152,10 +140,6 @@ in
    };
    nix.settings.auto-optimise-store = !config.me.buildingPortable;

-    environment.systemPackages = [
-      alias_nix_pin_revision
-    ];
-
    environment.persistence."/persist" = lib.mkIf (config.me.mountPersistence) {
      hideMounts = true;
      directories = [
@@ -239,46 +223,22 @@ in
        );
      in
      [
-        (disableTests "deno") # Tests use too much disk space
+        (disableTests "coreutils")
+        (disableTests "coreutils-full")
+        (disableTests "libuv")
+        (final: prev: {
+          inherit (final.unoptimized) libtpms libjxl;
+        })
        (disableOptimizationsPython3 "scipy")
-        (disableTestsPython "scipy")
-        (disableOptimizations "rapidjson")
-        (disableOptimizations "gsl") # FAIL: cholesky_invert unscaled hilbert (  4,  4)[0,2]: 2.55795384873636067e-13                        0
-        (final: prev: {
-          rpcs3 = prev.rpcs3.override {
-            glew = (final.glew.override { enableEGL = false; });
-          };
-        })
-        (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.
-        (disableOptimizations "onnxruntime") # QuantizeLinearOpTest test failing.
-        (final: prev: {
-          rpcs3 = prev.rpcs3.overrideAttrs (
-            finalAttrs: prevAttrs: {
-              version = "0.0.42-19843";
-
-              src = final.fetchFromGitHub {
-                owner = "RPCS3";
-                repo = "rpcs3";
-                rev = "6567a5a2f8ab47a89db395d6b47a7b59b23d6960";
-                postCheckout = ''
-                  cd $out/3rdparty
-                  git submodule update --init \
-                    fusion/fusion asmjit/asmjit yaml-cpp/yaml-cpp SoundTouch/soundtouch stblib/stb \
-                    feralinteractive/feralinteractive wolfssl/wolfssl
-                '';
-                hash = "sha256-a1c1+Ui7XyHFTGEZAgRuJasCzQqr2PZNTlwaDUWVb18=";
-              };
-
-              patches = [ ];
-            }
-          );
-        })
-        (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
+        # 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,
--- a/nix/configuration/flake.lock
+++ b/nix/configuration/flake.lock
@@ -22,11 +22,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1789770686,
-        "narHash": "sha256-uZkBR7yHdIKUFB5SZdfgh1qkGfI3XmYmI/lTiquxbck=",
+        "lastModified": 1769524058,
+        "narHash": "sha256-zygdD6X1PcVNR2PsyK4ptzrVEiAdbMqLos7utrMDEWE=",
        "owner": "nix-community",
        "repo": "disko",
-        "rev": "725ea35e410ad83be4931d1bff7e090eacaf3563",
+        "rev": "71a3fc97d80881e91710fe721f1158d3b96ae14d",
        "type": "github"
      },
      "original": {
@@ -162,34 +162,13 @@
        "type": "github"
      }
    },
-    "nix_builder": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "rust-overlay": "rust-overlay_2"
-      },
-      "locked": {
-        "lastModified": 1791322690,
-        "narHash": "sha256-nTH7IRoRCNciIhCCmzMRY7zyRbeLEDZfWw/pvKqpsgo=",
-        "ref": "refs/heads/main",
-        "rev": "f3378fc4009478d9c8ab6921b438c92a4f0897ef",
-        "revCount": 47,
-        "type": "git",
-        "url": "https://code.fizz.buzz/talexander/nix_builder.git"
-      },
-      "original": {
-        "type": "git",
-        "url": "https://code.fizz.buzz/talexander/nix_builder.git"
-      }
-    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1791260994,
-        "narHash": "sha256-Miqqk/ammqnTUxaoCyvtwoPeLbI1ksFyLxi/CazZpWY=",
+        "lastModified": 1770197578,
+        "narHash": "sha256-AYqlWrX09+HvGs8zM6ebZ1pwUqjkfpnv8mewYwAo+iM=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "151fa4e8ddfdd8dd25d945ad94ed54a13de9f6e4",
+        "rev": "00c21e4c93d963c50d4c0c89bfa84ed6e0694df2",
        "type": "github"
      },
      "original": {
@@ -247,7 +226,6 @@
        "disko": "disko",
        "impermanence": "impermanence",
        "lanzaboote": "lanzaboote",
-        "nix_builder": "nix_builder",
        "nixpkgs": "nixpkgs"
      }
    },
@@ -271,27 +249,6 @@
        "repo": "rust-overlay",
        "type": "github"
      }
-    },
-    "rust-overlay_2": {
-      "inputs": {
-        "nixpkgs": [
-          "nix_builder",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1779506148,
-        "narHash": "sha256-OffE5yuMrSW71zIJNLvtl9MCO6WTAHEjlFPUCvkd/QM=",
-        "owner": "oxalica",
-        "repo": "rust-overlay",
-        "rev": "d9973e2ab49747fada06ebbe26cda27eb0220cf1",
-        "type": "github"
-      },
-      "original": {
-        "owner": "oxalica",
-        "repo": "rust-overlay",
-        "type": "github"
-      }
    }
  },
  "root": "root",
--- a/nix/configuration/flake.nix
+++ b/nix/configuration/flake.nix
@@ -28,10 +28,7 @@
      url = "github:nix-community/disko";
      inputs.nixpkgs.follows = "nixpkgs";
    };
-    nix_builder = {
-      url = "git+https://code.fizz.buzz/talexander/nix_builder.git";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
+    mt7927.url = "github:cmspam/mt7927-nixos";
  };

  outputs =
@@ -41,7 +38,7 @@
      disko,
      impermanence,
      lanzaboote,
-      nix_builder,
+      mt7927,
      ...
    }:
    let
@@ -73,7 +70,7 @@
        hostname: nodeConfig: format:
        nixpkgs.lib.nixosSystem {
          specialArgs = {
-            inherit self nix_builder;
+            inherit self;

            this_nixos_config = self.nixosConfigurations."${hostname}";

@@ -83,6 +80,7 @@
            impermanence.nixosModules.impermanence
            lanzaboote.nixosModules.lanzaboote
            disko.nixosModules.disko
+            mt7927.nixosModules.default
            ./configuration.nix
            (./. + "/hosts/${hostname}")
            (./. + "/formats/${format}.nix")
--- 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/family_disks/distributed_build.nix
+++ b/nix/configuration/hosts/family_disks/distributed_build.nix
@@ -4,19 +4,16 @@
  config = {
    me.distributed_build.enable = true;
    me.distributed_build.machines.quark = {
-      enable_build = false;
-      enable_substituter = false;
+      enable = false;
      additional_config = {
        speedFactor = 2;
      };
    };
    me.distributed_build.machines.hydra = {
-      enable_build = false;
-      enable_substituter = true;
+      enable = 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";
    };
  };
 }
--- 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`
@@ -129,8 +129,6 @@
    # systemd.user.extraConfig = "DefaultLimitNOFILE=8192";
    # systemd.services."user@11400".serviceConfig.LimitNOFILE = "8192";

-    nix.settings.secret-key-files = [ "/persist/manual/nix/nix-cache-key.sec" ];
-
    me.build_in_ram.enable = true;
    me.dont_use_substituters.enable = true;
    me.hydra.enable = true;
--- 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/i_only_boot_zfs/distributed_build.nix
+++ b/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_substituter = false;
+      enable = true;
      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";
-    };
  };
 }
--- 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
@@ -5,7 +5,8 @@ IFS=$'\n\t'
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"

 : "${JOBS:="1"}"
+: "${NOM:="true"}"

 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/odo/default.nix
+++ b/nix/configuration/hosts/odo/default.nix
@@ -94,7 +94,6 @@
    me.emacs_flavor = "full";
    me.emulate_isa.enable = true;
    me.esim.enable = true;
-    me.exfat.enable = true;
    me.firefox.enable = true;
    me.firewall.enable = true;
    me.flux.enable = true;
@@ -111,14 +110,12 @@
    me.jujutsu.config = ../../roles/jujutsu/files/jujutsu_config_home.toml;
    me.jujutsu.enable = true;
    me.kanshi.enable = false;
-    me.kernel.enable = true;
    me.kubernetes.enable = true;
    me.latex.enable = true;
    me.launch_keyboard.enable = true;
    me.lvfs.enable = true;
    me.media.enable = true;
    me.memtest.enable = true;
-    me.mitmproxy.enable = true;
    me.network.enable = true;
    me.nix_index.enable = true;
    me.nix_repl.enable = true;
@@ -166,8 +163,8 @@
    me.zrepl.enable = true;
    me.zsh.enable = true;

-    me.sm64ex.enable = false;
-    me.shipwright.enable = false;
+    me.sm64ex.enable = true;
+    me.shipwright.enable = true;
    me.ship2harkinian.enable = true;
  };
 }
--- a/nix/configuration/hosts/odo/distributed_build.nix
+++ b/nix/configuration/hosts/odo/distributed_build.nix
@@ -4,19 +4,16 @@
  config = {
    me.distributed_build.enable = true;
    me.distributed_build.machines.quark = {
-      enable_build = true;
-      enable_substituter = false;
+      enable = false;
      additional_config = {
        speedFactor = 2;
      };
    };
    me.distributed_build.machines.hydra = {
-      enable_build = false;
-      enable_substituter = true;
+      enable = 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";
    };
  };
 }
--- 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
@@ -111,7 +111,6 @@
    me.iso_mount.enable = true;
    me.jujutsu.config = ../../roles/jujutsu/files/jujutsu_config_home.toml;
    me.jujutsu.enable = true;
-    me.kernel.enable = true;
    me.latex.enable = true;
    me.launch_keyboard.enable = true;
    me.lvfs.enable = true;
@@ -126,7 +125,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/odowork/distributed_build.nix
+++ b/nix/configuration/hosts/odowork/distributed_build.nix
@@ -4,19 +4,16 @@
  config = {
    me.distributed_build.enable = true;
    me.distributed_build.machines.quark = {
-      enable_build = false;
-      enable_substituter = false;
+      enable = false;
      additional_config = {
        speedFactor = 2;
      };
    };
    me.distributed_build.machines.hydra = {
-      enable_build = false;
-      enable_substituter = true;
+      enable = 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";
    };
  };
 }
--- 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/quark/default.nix
+++ b/nix/configuration/hosts/quark/default.nix
@@ -11,6 +11,7 @@
    ./hardware-configuration.nix
    ./power_management.nix
    ./waybar.nix
+    ./wifi.nix
  ];

  config = {
@@ -104,14 +105,12 @@
    me.jujutsu.config = ../../roles/jujutsu/files/jujutsu_config_home.toml;
    me.jujutsu.enable = true;
    me.kanshi.enable = false;
-    me.kernel.enable = true;
    me.kubernetes.enable = true;
    me.latex.enable = true;
    me.launch_keyboard.enable = true;
    me.lvfs.enable = true;
    me.media.enable = true;
    me.memtest.enable = true;
-    me.mitmproxy.enable = true;
    me.network.enable = true;
    me.nix_index.enable = true;
    me.nix_repl.enable = true;
@@ -160,8 +159,8 @@
    me.zrepl.enable = true;
    me.zsh.enable = true;

-    me.sm64ex.enable = false;
-    me.shipwright.enable = false;
+    me.sm64ex.enable = true;
+    me.shipwright.enable = true;
    me.ship2harkinian.enable = true;
  };
 }
--- a/nix/configuration/hosts/quark/distributed_build.nix
+++ b/nix/configuration/hosts/quark/distributed_build.nix
@@ -3,20 +3,11 @@

  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_substituter = true;
+      enable = 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";
    };
  };
 }
--- a/nix/configuration/hosts/quark/wifi.nix
+++ b/nix/configuration/hosts/quark/wifi.nix
@@ -0,0 +1,20 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+
+{
+  imports = [ ];
+
+  config = {
+    hardware.mediatek-mt7927 = {
+      enable = true;
+      enableWifi = true;
+      enableBluetooth = true;
+      # Highly recommended to fix upload speed issues
+      disableAspm = true;
+    };
+  };
+}
--- 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/hosts/recovery/distributed_build.nix
+++ b/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_substituter = false;
+      enable = true;
      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";
-    };
  };
 }
--- a/nix/configuration/roles/base/default.nix
+++ b/nix/configuration/roles/base/default.nix
@@ -14,12 +14,6 @@ let
  cleanup_temporary_files = (
    patchScriptBin "cleanup_temporary_files" (builtins.readFile ./files/cleanup_temporary_files.bash)
  );
-  decode_jwt = (patchScriptBin "decode_jwt" (builtins.readFile ./files/decode_jwt.bash));
-  git_find_merged_branches = (
-    patchScriptBin "git_find_merged_branches" (builtins.readFile ./files/git_find_merged_branches.bash)
-  );
-  git_fix_author = (patchScriptBin "git_fix_author" (builtins.readFile ./files/git_fix_author.bash));
-  rsync_clone = (patchScriptBin "rsync_clone" (builtins.readFile ./files/rsync_clone.bash));
  alias_rga = pkgs.writeShellScriptBin "rga" ''
    exec ${pkgs.ripgrep}/bin/rg -uuu "''${@}"
  '';
@@ -65,16 +59,8 @@ in
      nix-output-monitor # For better view into nixos-rebuild
      # nix-serve-ng # Serve nix store over http
      cleanup_temporary_files
-      decode_jwt
      jq
      inetutils # For whois
-      git_find_merged_branches
-      git_fix_author
-      rsync_clone
    ];
-
-    # Disable installing documentation.
-    documentation.doc.enable = false;
-    documentation.nixos.enable = false;
  };
 }
--- a/nix/configuration/roles/base/files/cleanup_temporary_files.bash
+++ b/nix/configuration/roles/base/files/cleanup_temporary_files.bash
@@ -1,7 +1,4 @@
 #!/usr/bin/env bash
 #
 # Delete temporary files on entire disk
-set -euo pipefail
-IFS=$'\n\t'
-
-exec find / -type f '(' -name '*.orig' -or -name '*~' -or -name '*.core' ')' -delete -print 2>/dev/null
+find / -type f '(' -name '*.orig' -or -name '*~' -or -name '*.core' ')' -delete -print 2>/dev/null
--- a/nix/configuration/roles/base/files/decode_jwt.bash
+++ b/nix/configuration/roles/base/files/decode_jwt.bash
@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-#
-# Decode the contents of a JWT
-set -euo pipefail
-IFS=$'\n\t'
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-exec jq -R 'split(".") | .[0],.[1] | gsub("-"; "+") | gsub("_"; "/") | gsub("%3D"; "=")| @base64d | fromjson'
--- a/nix/configuration/roles/base/files/git_find_merged_branches.bash
+++ b/nix/configuration/roles/base/files/git_find_merged_branches.bash
@@ -1,10 +0,0 @@
-#!/usr/bin/env bash
-#
-# Find local branches that have been merged
-set -euo pipefail
-IFS=$'\n\t'
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-: ${MAIN_BRANCH:="main"}
-
-git checkout -q ${MAIN_BRANCH} && git for-each-ref refs/heads/ "--format=%(refname:short)" | while read branch; do mergeBase=$(git merge-base ${MAIN_BRANCH} $branch) && [[ $(git cherry ${MAIN_BRANCH} $(git commit-tree $(git rev-parse "$branch^{tree}") -p $mergeBase -m _)) == "-"* ]] && echo "$branch"; done
--- a/nix/configuration/roles/base/files/git_fix_author.bash
+++ b/nix/configuration/roles/base/files/git_fix_author.bash
@@ -1,22 +0,0 @@
-#!/usr/bin/env bash
-#
-set -euo pipefail
-IFS=$'\n\t'
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-git filter-branch --env-filter '
-WRONG_EMAIL="old@email.foo"
-NEW_NAME="New Name"
-NEW_EMAIL="new@email.bar"
-
-if [ "$GIT_COMMITTER_EMAIL" = "$WRONG_EMAIL" ]
-then
-    export GIT_COMMITTER_NAME="$NEW_NAME"
-    export GIT_COMMITTER_EMAIL="$NEW_EMAIL"
-fi
-if [ "$GIT_AUTHOR_EMAIL" = "$WRONG_EMAIL" ]
-then
-    export GIT_AUTHOR_NAME="$NEW_NAME"
-    export GIT_AUTHOR_EMAIL="$NEW_EMAIL"
-fi
-' --tag-name-filter cat --commit-filter 'git commit-tree -S "$@";' -- --branches --tags
--- a/nix/configuration/roles/base/files/rsync_clone.bash
+++ b/nix/configuration/roles/base/files/rsync_clone.bash
@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-#
-# Wrapper to set rsync flags for cloning a folder preserving attributes
-set -euo pipefail
-IFS=$'\n\t'
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-exec rsync -aHAXS "$@"
--- a/nix/configuration/roles/distributed_build/default.nix
+++ b/nix/configuration/roles/distributed_build/default.nix
@@ -10,14 +10,7 @@

 let
  make_machine_config = name: {
-    enable_build = 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 {
+    enable = lib.mkOption {
      type = lib.types.bool;
      default = false;
      example = true;
@@ -66,35 +59,25 @@ let
      hostName = lib.mkForce "hydra?remote-store=local?root=/.disk/root";
    };
  };
-  build_machine_list = (
-    map (
+  joined_configs =
+    lib.genAttrs
+      (builtins.filter (hostname: config.me.distributed_build.machines."${hostname}".enable) (
+        builtins.attrNames all_nixos_configs
+      ))
+      (
        hostname:
-      (lib.mkIf config.me.distributed_build.machines."${hostname}".enable_build (
-        lib.mkMerge [
+        (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}".substituter_url != null
-      ) (config.me.distributed_build.machines."${hostname}".substituter_url))
-    ) (builtins.attrNames all_nixos_configs)
-  );
-  has_any_substituters = substituters_list != [ ];
 in
 {
  imports = [ ];
@@ -134,17 +117,35 @@ in
          "odo:0S/XKSFjjIrihQ7lbHEIebXk/c/xuoodhm0Gz26YhjA="
          "odowork:zg3UKBAyLy3xtZkL0hMtbxHjxgn5A2QY8NNAgyRT6Yo="
          "quark:Eb6ygkIiVlcUqb5hOjEVIQcfYLpCz40YVYA3/rxrgBc="
-          "hydra:1s4Cy9YJLgw4jWx5jdSCfJmIm0hfya7WEy/EwJYI5Ys="
-          "garak:8nUS6/aHl+FmF518WZlG4DzDToQ3fSNnpHR+aFQmkqc="
        ];
      }
      {
-        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";
                }
-      (lib.mkIf has_any_substituters {
-        nix.settings.substitute = lib.mkForce true;
-        nix.settings.substituters = lib.mkForce substituters_list;
-      })
+                static_host_configs."${hostname}"
+                config.me.distributed_build.machines."${hostname}".additional_config
+              ]
+            ))
+          ) (builtins.attrNames all_nixos_configs)
+        );
+      }
+      # {
+      #   nix.settings.substitute = lib.mkForce true;
+      #   nix.settings.substituters = lib.mkForce (
+      #     lib.mapAttrsToList (hostname: joined_config: "ssh-ng://${joined_config.hostName}") joined_configs
+      #   );
+      # }
    ]
  );
 }
--- 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/exfat/default.nix
+++ b/nix/configuration/roles/exfat/default.nix
@@ -1,26 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-
-{
-  imports = [ ];
-
-  options.me = {
-    exfat.enable = lib.mkOption {
-      type = lib.types.bool;
-      default = false;
-      example = true;
-      description = "Whether we want to install exfat.";
-    };
-  };
-
-  config = lib.mkIf config.me.exfat.enable {
-    # boot.supportedFilesystems = [ "exfat" ];
-    environment.systemPackages = with pkgs; [
-      exfatprogs
-    ];
-  };
-}
--- a/nix/configuration/roles/firefox/default.nix
+++ b/nix/configuration/roles/firefox/default.nix
@@ -20,7 +20,7 @@
  config = lib.mkIf (config.me.firefox.enable && config.me.graphical) {
    programs.firefox = {
      enable = true;
-      package = (pkgs.wrapFirefox (pkgs.firefox-unwrapped.override { withPipewire = true; }) { });
+      package = (pkgs.wrapFirefox (pkgs.firefox-unwrapped.override { pipewireSupport = true; }) { });
      languagePacks = [ "en-US" ];
      preferences = {
        # "identity.sync.tokenserver.uri": "https://ffsync.fizz.buzz/token/1.0/sync/1.5";
@@ -134,7 +134,7 @@
      users.talexander = {
        directories = [
          {
-            directory = ".config/mozilla";
+            directory = ".mozilla";
            user = "talexander";
            group = "talexander";
            mode = "0700";
--- a/nix/configuration/roles/firewall/default.nix
+++ b/nix/configuration/roles/firewall/default.nix
@@ -24,16 +24,7 @@
    networking.firewall.allowedUDPPorts = [
      5353 # mDNS
    ];
-
-    # networking.firewall.enable = true;
-    # networking.nftables.enable = true;
-
    # Or disable the firewall altogether.
-    networking.firewall.enable = false;
-
-    # Debugging
-    # networking.firewall.logRefusedConnections = true;
-    # networking.firewall.logRefusedPackets = true;
-    # networking.firewall.logReversePathDrops = true;
+    # networking.firewall.enable = false;
  };
 }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Tom Alexander	5c2b0d8c2f	Add mt7927 driver to quark.	2026-04-11 11:24:05 -04:00
Tom Alexander	9550032c08	Support hardware accelerated RNG in qemurc.	2026-04-10 09:08:20 -04:00
Tom Alexander	d46c2a0225	Revert "Update packages." This reverts commit `ee4794859a`.	2026-04-09 20:25:12 -04:00
Tom Alexander	6430b1cc77	Sync to the store before registering paths.	2026-04-08 20:51:20 -04:00
Tom Alexander	157d4e4c94	New VPN address for home server.	2026-04-08 20:51:20 -04:00
Tom Alexander	075a4b8262	Use direct paths for hydra's nix store. I was getting corrupted builds, so as a test I am using the direct path where the drive is mounted rather than going through bind mounts.	2026-04-08 20:51:20 -04:00
Tom Alexander	d62b3d8a62	Add a build of nixbsd to nix_builder.	2026-04-08 08:45:07 -04:00
Tom Alexander	ee4794859a	Update packages.	2026-04-08 08:45:07 -04:00