Disable optimizations for quick iteration.

Everything got dimmer in 6.14 so I am reducing the abmlevel.

ansible/roles/base/files/gitconfig_home

@@ -8,6 +8,7 @@
 	lg = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit
 	bh = log --oneline --branches=* --remotes=* --graph --decorate
 	amend = commit --amend --no-edit
+	authorcount = shortlog --summary --numbered --all --no-merges
 [core]
 	excludesfile = ~/.gitignore_global
 [commit]

ansible/roles/base/files/gitconfig_work

@@ -8,6 +8,7 @@
 	lg = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit
 	bh = log --oneline --branches=* --remotes=* --graph --decorate
 	amend = commit --amend --no-edit
+	authorcount = shortlog --summary --numbered --all --no-merges
 [core]
 	excludesfile = ~/.gitignore_global
 [commit]

nix/configuration/configuration.nix

@@ -2,7 +2,6 @@
   config,
   lib,
   pkgs,
-  home-manager,
   ...
 }:
 
@@ -10,12 +9,15 @@
   imports = [
     ./roles/2ship2harkinian
     ./roles/alacritty
+    ./roles/amd_s2idle
     ./roles/ansible
     ./roles/ares
     ./roles/bluetooth
     ./roles/boot
     ./roles/chromecast
     ./roles/chromium
+    ./roles/d2
+    ./roles/direnv
     ./roles/distributed_build
     ./roles/docker
     ./roles/ecc
@@ -32,6 +34,7 @@
     ./roles/graphics
     ./roles/hydra
     ./roles/iso
+    ./roles/iso_mount
     ./roles/kanshi
     ./roles/kodi
     ./roles/kubernetes
@@ -44,11 +47,14 @@
     ./roles/nix_index
     ./roles/nix_worker
     ./roles/nvme
+    ./roles/optimized_build
     ./roles/pcsx2
     ./roles/python
     ./roles/qemu
     ./roles/reset
+    ./roles/rpcs3
     ./roles/rust
+    ./roles/shadps4
     ./roles/shikane
     ./roles/shipwright
     ./roles/sm64ex
@@ -69,6 +75,7 @@
     ./roles/zfs
     ./roles/zrepl
     ./roles/zsh
+    ./util/install_files
     ./util/unfree_polyfill
   ];
 
@@ -84,6 +91,16 @@
   # Use nixos-rebuild-ng
   # system.rebuild.enableNg = true;
 
+  # Keep outputs so we can build offline.
+  nix.extraOptions = ''
+    keep-outputs = true
+    keep-derivations = true
+  '';
+
+  # Technically only needed when building the ISO because nix detects ZFS in the filesystem list normally. I basically always want this so I'm just setting it to always be on.
+  boot.supportedFilesystems.zfs = true;
+  # TODO: Is this different from boot.supportedFilesystems = [ "zfs" ]; ?
+
   services.getty = {
     autologinUser = "talexander"; # I use full disk encryption so the user password is irrelevant.
     autologinOnce = true;
@@ -107,27 +124,14 @@
     ];
   };
   users.groups.talexander.gid = 11235;
-  home-manager.users.talexander =
-    { pkgs, ... }:
-    {
-      # The state version is required and should stay at the version you
-      # originally installed.
-      home.stateVersion = "24.11";
-    };
-
-  home-manager.users.root =
-    { pkgs, ... }:
-    {
-      # The state version is required and should stay at the version you
-      # originally installed.
-      home.stateVersion = "24.11";
-    };
 
   # Automatic garbage collection
   nix.gc = lib.mkIf (!config.me.buildingIso) {
     # Runs nix-collect-garbage --delete-older-than 5d
     automatic = true;
-    randomizedDelaySec = "14m";
+    persistent = true;
+    dates = "monthly";
+    # randomizedDelaySec = "14m";
     options = "--delete-older-than 30d";
   };
   nix.settings.auto-optimise-store = !config.me.buildingIso;
@@ -156,7 +160,7 @@
     pciutils # for lspci
     ripgrep
     strace
-    ltrace
+    # ltrace # Disabled because it uses more than 48GB of /tmp space during test phase.
     trace-cmd # ftrace
     tcpdump
     git-crypt
@@ -170,6 +174,7 @@
     ipcalc
     gptfdisk # for cgdisk
     nix-output-monitor # For better view into nixos-rebuild
+    nix-serve-ng # Serve nix store over http
   ];
 
   services.openssh = {

nix/configuration/flake.lock

@@ -39,11 +39,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1745812220,
+        "lastModified": 1758160037,
-        "narHash": "sha256-hotBG0EJ9VmAHJYF0yhWuTVZpENHvwcJ2SxvIPrXm+g=",
+        "narHash": "sha256-fXelTdjdILspZ1IUU9aICB1+PXwSFiF8j+7ujwo1VpQ=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "d0c543d740fad42fe2c035b43c9d41127e073c78",
+        "rev": "4f554162fff88e77655073d352eec0cea71103a2",
         "type": "github"
       },
       "original": {
@@ -147,26 +147,6 @@
         "type": "github"
       }
     },
-    "home-manager": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1746369725,
-        "narHash": "sha256-m3ai7LLFYsymMK0uVywCceWfUhP0k3CALyFOfcJACqE=",
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "rev": "1a1793f6d940d22c6e49753548c5b6cb7dc5545d",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "type": "github"
-      }
-    },
     "impermanence": {
       "locked": {
         "lastModified": 1737831083,
@@ -210,33 +190,33 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1746232882,
+        "lastModified": 1758242085,
-        "narHash": "sha256-MHmBH2rS8KkRRdoU/feC/dKbdlMkcNkB5mwkuipVHeQ=",
+        "narHash": "sha256-hnrtEiy8qLMskZr0FBp0vbtMJ9xA4HvDdzuFRLxRiFg=",
-        "owner": "NixOS",
+        "ref": "og-amd-debug-tools",
-        "repo": "nixpkgs",
+        "rev": "7b0f433195e299008850d16e85a862177419cef6",
-        "rev": "7a2622e2c0dbad5c4493cb268aba12896e28b008",
+        "revCount": 862645,
-        "type": "github"
+        "type": "git",
+        "url": "https://github.com/tomalexander/nixpkgs.git"
       },
       "original": {
-        "owner": "NixOS",
+        "ref": "og-amd-debug-tools",
-        "ref": "nixos-unstable",
+        "type": "git",
-        "repo": "nixpkgs",
+        "url": "https://github.com/tomalexander/nixpkgs.git"
-        "type": "github"
       }
     },
-    "nixpkgs-b93b4e9b5": {
+    "nixpkgs-dda3dcd3f": {
       "locked": {
-        "lastModified": 1713721570,
+        "lastModified": 1746663147,
-        "narHash": "sha256-R0s+O5UjTePQRb72XPgtkTmEiOOW8n+1q9Gxt/OJnKU=",
+        "narHash": "sha256-Ua0drDHawlzNqJnclTJGf87dBmaO/tn7iZ+TCkTRpRc=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "b93b4e9b527904aadf52dba6ca35efde2067cbd4",
+        "rev": "dda3dcd3fe03e991015e9a74b22d35950f264a54",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "b93b4e9b527904aadf52dba6ca35efde2067cbd4",
+        "rev": "dda3dcd3fe03e991015e9a74b22d35950f264a54",
         "type": "github"
       }
     },
@@ -258,18 +238,18 @@
     },
     "nixpkgs-unoptimized": {
       "locked": {
-        "lastModified": 1746232882,
+        "lastModified": 1758242085,
-        "narHash": "sha256-MHmBH2rS8KkRRdoU/feC/dKbdlMkcNkB5mwkuipVHeQ=",
+        "narHash": "sha256-hnrtEiy8qLMskZr0FBp0vbtMJ9xA4HvDdzuFRLxRiFg=",
-        "owner": "NixOS",
+        "ref": "og-amd-debug-tools",
-        "repo": "nixpkgs",
+        "rev": "7b0f433195e299008850d16e85a862177419cef6",
-        "rev": "7a2622e2c0dbad5c4493cb268aba12896e28b008",
+        "revCount": 862645,
-        "type": "github"
+        "type": "git",
+        "url": "https://github.com/tomalexander/nixpkgs.git"
       },
       "original": {
-        "owner": "NixOS",
+        "ref": "og-amd-debug-tools",
-        "ref": "nixos-unstable",
+        "type": "git",
-        "repo": "nixpkgs",
+        "url": "https://github.com/tomalexander/nixpkgs.git"
-        "type": "github"
       }
     },
     "pre-commit-hooks-nix": {
@@ -303,11 +283,10 @@
       "inputs": {
         "ansible-sshjail": "ansible-sshjail",
         "disko": "disko",
-        "home-manager": "home-manager",
         "impermanence": "impermanence",
         "lanzaboote": "lanzaboote",
         "nixpkgs": "nixpkgs",
-        "nixpkgs-b93b4e9b5": "nixpkgs-b93b4e9b5",
+        "nixpkgs-dda3dcd3f": "nixpkgs-dda3dcd3f",
         "nixpkgs-unoptimized": "nixpkgs-unoptimized",
         "zsh-histdb": "zsh-histdb"
       }

nix/configuration/flake.nix

@@ -29,12 +29,12 @@
 # Install on a new machine:
 #
 #
-# doas nix --experimental-features "nix-command flakes" run github:nix-community/disko/latest -- --mode destroy,format,mount hosts/quark/disk-config.nix
+# doas nix --substituters "http://10.0.2.2:8080?trusted=1 https://cache.nixos.org/" --experimental-features "nix-command flakes" run github:nix-community/disko/latest -- --mode destroy,format,mount hosts/odo/disk-config.nix
 
 # nix flake update zsh-histdb --flake .
 # nix flake update ansible-sshjail --flake .
 # for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done
-# nixos-install --flake ".#quark"
+# nixos-install --substituters "http://10.0.2.2:8080?trusted=1 https://cache.nixos.org/" --flake ".#vm_ionlybootzfs"
 #
 
 {
@@ -42,11 +42,11 @@
 
   inputs = {
     impermanence.url = "github:nix-community/impermanence";
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+    # nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
-    nixpkgs-b93b4e9b5.url = "github:NixOS/nixpkgs/b93b4e9b527904aadf52dba6ca35efde2067cbd4";
+    # nixpkgs.url = "github:tomalexander/nixpkgs/amd-debug-tools";
-    nixpkgs-unoptimized.url = "github:NixOS/nixpkgs/nixos-unstable";
+    nixpkgs.url = "git+https://github.com/tomalexander/nixpkgs.git?ref=og-amd-debug-tools";
-    home-manager.url = "github:nix-community/home-manager";
+    nixpkgs-dda3dcd3f.url = "github:NixOS/nixpkgs/dda3dcd3fe03e991015e9a74b22d35950f264a54";
-    home-manager.inputs.nixpkgs.follows = "nixpkgs";
+    nixpkgs-unoptimized.url = "git+https://github.com/tomalexander/nixpkgs.git?ref=og-amd-debug-tools";
     lanzaboote = {
       url = "github:nix-community/lanzaboote/v0.4.2";
 
@@ -76,9 +76,8 @@
       self,
       nixpkgs,
       nixpkgs-unoptimized,
-      nixpkgs-b93b4e9b5,
+      nixpkgs-dda3dcd3f,
       impermanence,
-      home-manager,
       lanzaboote,
       zsh-histdb,
       ansible-sshjail,
@@ -88,7 +87,7 @@
       base_x86_64_linux = rec {
         system = "x86_64-linux";
         specialArgs = {
-          pkgs-b93b4e9b5 = import nixpkgs-b93b4e9b5 {
+          pkgs-dda3dcd3f = import nixpkgs-dda3dcd3f {
             inherit system;
           };
           pkgs-unoptimized = import nixpkgs-unoptimized {
@@ -99,13 +98,8 @@
         };
         modules = [
           impermanence.nixosModules.impermanence
-          home-manager.nixosModules.home-manager
           lanzaboote.nixosModules.lanzaboote
           inputs.disko.nixosModules.disko
-          {
-            home-manager.useGlobalPkgs = true;
-            home-manager.useUserPackages = true;
-          }
           {
             nixpkgs.overlays = [
               zsh-histdb.overlays.default
@@ -115,21 +109,9 @@
           ./configuration.nix
         ];
       };
-      systems = {
+      systems =
-        odo = {
+        let
-          main = nixpkgs.lib.nixosSystem (
+          additional_iso_modules = [
-            base_x86_64_linux
-            // {
-              modules = base_x86_64_linux.modules ++ [
-                ./hosts/odo
-              ];
-            }
-          );
-          iso = nixpkgs.lib.nixosSystem (
-            base_x86_64_linux
-            // {
-              modules = base_x86_64_linux.modules ++ [
-                ./hosts/odo
             (nixpkgs + "/nixos/modules/installer/cd-dvd/iso-image.nix")
             # TODO: Figure out how to do image based appliances
             # (nixpkgs + "/nixos/modules/profiles/image-based-appliance.nix")
@@ -137,98 +119,148 @@
               isoImage.makeEfiBootable = true;
               isoImage.makeUsbBootable = true;
               me.buildingIso = true;
-                  me.optimizations.enable = false;
+              me.optimizations.enable = nixpkgs.lib.mkForce false;
+            }
+            {
+              # These are big space hogs. The chance that I need them on an ISO is slim.
+              me.steam.enable = nixpkgs.lib.mkForce false;
+              me.pcsx2.enable = nixpkgs.lib.mkForce false;
             }
           ];
+          additional_vm_modules = [
+            (nixpkgs + "/nixos/modules/profiles/qemu-guest.nix")
+            {
+              networking.dhcpcd.enable = true;
+              networking.useDHCP = true;
+              me.optimizations.enable = nixpkgs.lib.mkForce false;
             }
-          );
+            {
+              # I don't need games on a virtual machine.
+              me.steam.enable = nixpkgs.lib.mkForce false;
+              me.pcsx2.enable = nixpkgs.lib.mkForce false;
+              me.sm64ex.enable = nixpkgs.lib.mkForce false;
+              me.shipwright.enable = nixpkgs.lib.mkForce false;
+              me.ship2harkinian.enable = nixpkgs.lib.mkForce false;
+            }
+          ];
+        in
+        {
+          odo = rec {
+            main = base_x86_64_linux // {
+              modules = base_x86_64_linux.modules ++ [
+                ./hosts/odo
+              ];
             };
-        quark = {
+            iso = main // {
-          main = nixpkgs.lib.nixosSystem (
+              modules = main.modules ++ additional_iso_modules;
-            base_x86_64_linux
+            };
-            // {
+            vm = main // {
+              modules = main.modules ++ additional_vm_modules;
+            };
+            vm_iso = main // {
+              modules = main.modules ++ additional_vm_modules ++ additional_iso_modules;
+            };
+          };
+          quark = rec {
+            main = base_x86_64_linux // {
               modules = base_x86_64_linux.modules ++ [
                 ./hosts/quark
               ];
-            }
-          );
-          iso = nixpkgs.lib.nixosSystem (
-            base_x86_64_linux
-            // {
-              modules = base_x86_64_linux.modules ++ [
-                ./hosts/quark
-                (nixpkgs + "/nixos/modules/installer/cd-dvd/iso-image.nix")
-                # TODO: Figure out how to do image based appliances
-                # (nixpkgs + "/nixos/modules/profiles/image-based-appliance.nix")
-                {
-                  isoImage.makeEfiBootable = true;
-                  isoImage.makeUsbBootable = true;
-                  me.buildingIso = true;
-                  me.optimizations.enable = false;
-                }
-              ];
-            }
-          );
             };
-        neelix = {
+            iso = main // {
-          main = nixpkgs.lib.nixosSystem (
+              modules = main.modules ++ additional_iso_modules;
-            base_x86_64_linux
+            };
-            // {
+            vm = main // {
+              modules = main.modules ++ additional_vm_modules;
+            };
+            vm_iso = main // {
+              modules = main.modules ++ additional_vm_modules ++ additional_iso_modules;
+            };
+          };
+          neelix = rec {
+            main = base_x86_64_linux // {
               modules = base_x86_64_linux.modules ++ [
                 ./hosts/neelix
               ];
-            }
+            };
-          );
+            iso = main // {
-          iso = nixpkgs.lib.nixosSystem (
+              modules = main.modules ++ additional_iso_modules;
-            base_x86_64_linux
+            };
-            // {
+            vm = main // {
-              modules = base_x86_64_linux.modules ++ [
+              modules = main.modules ++ additional_vm_modules;
-                ./hosts/neelix
+            };
-                (nixpkgs + "/nixos/modules/installer/cd-dvd/iso-image.nix")
+            vm_iso = main // {
+              modules = main.modules ++ additional_vm_modules ++ additional_iso_modules;
+            };
+          };
+          hydra =
+            let
+              additional_iso_modules = additional_iso_modules ++ [
                 {
-                  isoImage.makeEfiBootable = true;
+                  me.optimizations.enable = true;
-                  isoImage.makeUsbBootable = true;
-                  me.buildingIso = true;
-                  me.optimizations.enable = false;
                 }
               ];
-            }
+            in
-          );
+            rec {
-        };
+              main = base_x86_64_linux // {
-        hydra = {
-          main = nixpkgs.lib.nixosSystem (
-            base_x86_64_linux
-            // {
                 modules = base_x86_64_linux.modules ++ [
                   ./hosts/hydra
                 ];
-            }
-          );
-          iso = nixpkgs.lib.nixosSystem (
-            base_x86_64_linux
-            // {
-              modules = base_x86_64_linux.modules ++ [
-                ./hosts/hydra
-                (nixpkgs + "/nixos/modules/installer/cd-dvd/iso-image.nix")
-                {
-                  isoImage.makeEfiBootable = true;
-                  isoImage.makeUsbBootable = true;
-                  me.buildingIso = true;
-                }
-              ];
-            }
-          );
               };
+              iso = main // {
+                modules = main.modules ++ additional_iso_modules;
+              };
+              vm = main // {
+                modules = main.modules ++ additional_vm_modules;
+              };
+              vm_iso = main // {
+                modules = main.modules ++ additional_vm_modules ++ additional_iso_modules;
+              };
+            };
+          ionlybootzfs = rec {
+            main = base_x86_64_linux // {
+              modules = base_x86_64_linux.modules ++ [
+                ./hosts/ionlybootzfs
+              ];
+            };
+            iso = main // {
+              modules = main.modules ++ additional_iso_modules;
+            };
+            vm = main // {
+              modules = main.modules ++ additional_vm_modules;
+            };
+            vm_iso = main // {
+              modules = main.modules ++ additional_vm_modules ++ additional_iso_modules;
+            };
+          };
+
         };
     in
     {
-      nixosConfigurations.odo = systems.odo.main;
+      nixosConfigurations.odo = nixpkgs.lib.nixosSystem systems.odo.main;
-      iso.odo = systems.odo.iso.config.system.build.isoImage;
+      iso.odo = (nixpkgs.lib.nixosSystem systems.odo.iso).config.system.build.isoImage;
-      nixosConfigurations.quark = systems.quark.main;
+      nixosConfigurations.vm_odo = nixpkgs.lib.nixosSystem systems.odo.vm;
-      iso.quark = systems.quark.iso.config.system.build.isoImage;
+      vm_iso.odo = (nixpkgs.lib.nixosSystem systems.odo.vm_iso).config.system.build.isoImage;
-      nixosConfigurations.neelix = systems.neelix.main;
+
-      iso.neelix = systems.neelix.iso.config.system.build.isoImage;
+      nixosConfigurations.quark = nixpkgs.lib.nixosSystem systems.quark.main;
-      nixosConfigurations.hydra = systems.hydra.main;
+      iso.quark = (nixpkgs.lib.nixosSystem systems.quark.iso).config.system.build.isoImage;
-      iso.hydra = systems.hydra.iso.config.system.build.isoImage;
+      nixosConfigurations.vm_quark = nixpkgs.lib.nixosSystem systems.quark.vm;
+      vm_iso.quark = (nixpkgs.lib.nixosSystem systems.quark.vm_iso).config.system.build.isoImage;
+
+      nixosConfigurations.neelix = nixpkgs.lib.nixosSystem systems.neelix.main;
+      iso.neelix = (nixpkgs.lib.nixosSystem systems.neelix.iso).config.system.build.isoImage;
+      nixosConfigurations.vm_neelix = nixpkgs.lib.nixosSystem systems.neelix.vm;
+      vm_iso.neelix = (nixpkgs.lib.nixosSystem systems.neelix.vm_iso).config.system.build.isoImage;
+
+      nixosConfigurations.hydra = nixpkgs.lib.nixosSystem systems.hydra.main;
+      iso.hydra = (nixpkgs.lib.nixosSystem systems.hydra.iso).config.system.build.isoImage;
+      nixosConfigurations.vm_hydra = nixpkgs.lib.nixosSystem systems.hydra.vm;
+      vm_iso.hydra = (nixpkgs.lib.nixosSystem systems.hydra.vm_iso).config.system.build.isoImage;
+
+      nixosConfigurations.ionlybootzfs = nixpkgs.lib.nixosSystem systems.ionlybootzfs.main;
+      iso.ionlybootzfs = (nixpkgs.lib.nixosSystem systems.ionlybootzfs.iso).config.system.build.isoImage;
+      nixosConfigurations.vm_ionlybootzfs = nixpkgs.lib.nixosSystem systems.ionlybootzfs.vm;
+      vm_iso.ionlybootzfs =
+        (nixpkgs.lib.nixosSystem systems.ionlybootzfs.vm_iso).config.system.build.isoImage;
     };
 }

nix/configuration/hosts/hydra/DEPLOY_BOOT

@@ -14,6 +14,6 @@ nix flake update zsh-histdb --flake "$DIR/../../"
 nix flake update ansible-sshjail --flake "$DIR/../../"
 for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done
 
-nixos-rebuild boot --flake "$DIR/../../#hydra" --target-host "$TARGET" --build-host "$TARGET" --fast --use-remote-sudo --max-jobs "$JOBS" "${@}" |& nom
+nixos-rebuild boot --flake "$DIR/../../#hydra" --target-host "$TARGET" --build-host "$TARGET" --fast --use-remote-sudo --max-jobs "$JOBS" --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#hydra'

nix/configuration/hosts/hydra/DEPLOY_SWITCH

@@ -14,6 +14,6 @@ nix flake update zsh-histdb --flake "$DIR/../../"
 nix flake update ansible-sshjail --flake "$DIR/../../"
 for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done
 
-nixos-rebuild switch --flake "$DIR/../../#hydra" --target-host "$TARGET" --build-host "$TARGET" --fast --use-remote-sudo --max-jobs "$JOBS" "${@}" |& nom
+nixos-rebuild switch --flake "$DIR/../../#hydra" --target-host "$TARGET" --build-host "$TARGET" --fast --use-remote-sudo --max-jobs "$JOBS" --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#hydra'

nix/configuration/hosts/hydra/ISO

@@ -9,4 +9,4 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 nix flake update zsh-histdb --flake "$DIR/../../"
 nix flake update ansible-sshjail --flake "$DIR/../../"
 for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done
-nix build --extra-experimental-features nix-command --extra-experimental-features flakes "$DIR/../..#iso.hydra" --max-jobs "$JOBS" "${@}" |& nom
+nix build --extra-experimental-features nix-command --extra-experimental-features flakes "$DIR/../..#iso.hydra" --max-jobs "$JOBS" --log-format internal-json -v "${@}" |& nom --json

nix/configuration/hosts/hydra/default.nix

@@ -36,9 +36,24 @@
   time.timeZone = "America/New_York";
   i18n.defaultLocale = "en_US.UTF-8";
 
-  me.optimizations.enable = true;
   me.secureBoot.enable = false;
 
+  me.optimizations = {
+    enable = true;
+    arch = "znver4";
+    system_features = [
+      "gccarch-znver4"
+      "gccarch-skylake"
+      # "gccarch-alderlake" missing WAITPKG
+      "gccarch-x86-64-v3"
+      "gccarch-x86-64-v4"
+      "benchmark"
+      "big-parallel"
+      "kvm"
+      "nixos-test"
+    ];
+  };
+
   # Mount tmpfs at /tmp
   boot.tmp.useTmpfs = true;
 

nix/configuration/hosts/hydra/optimized_build.nix

@@ -1,73 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-{
-  imports = [ ];
-
-  config = lib.mkMerge [
-    {
-      nix.settings.system-features = lib.mkForce [
-        "gccarch-znver4"
-        "gccarch-x86-64-v3"
-        "gccarch-x86-64-v4"
-        "benchmark"
-        "big-parallel"
-        # "kvm"
-        # "nixos-test"
-      ];
-
-      nixpkgs.hostPlatform = {
-        gcc.arch = "znver4";
-        gcc.tune = "znver4";
-        system = "x86_64-linux";
-      };
-
-      nixpkgs.overlays = [
-        (
-          final: prev:
-          let
-            optimizeWithFlags =
-              pkg: flags:
-              pkg.overrideAttrs (old: {
-                NIX_CFLAGS_COMPILE = [ (old.NIX_CFLAGS_COMPILE or "") ] ++ flags;
-              });
-            addConfig =
-              additionalConfig: pkg:
-              pkg.override (oldconfig: {
-                structuredExtraConfig = pkg.structuredExtraConfig // additionalConfig;
-              });
-          in
-          {
-            linux_znver4 =
-              addConfig
-                {
-                  # Full preemption
-                  PREEMPT = lib.mkOverride 60 lib.kernel.yes;
-                  PREEMPT_VOLUNTARY = lib.mkOverride 60 lib.kernel.no;
-
-                  # Google's BBRv3 TCP congestion Control
-                  TCP_CONG_BBR = lib.kernel.yes;
-                  DEFAULT_BBR = lib.kernel.yes;
-
-                  # Preemptive Full Tickless Kernel at 300Hz
-                  HZ = lib.kernel.freeform "300";
-                  HZ_300 = lib.kernel.yes;
-                  HZ_1000 = lib.kernel.no;
-                }
-                (
-                  optimizeWithFlags prev.linux_6_14 [
-                    "-march=znver4"
-                    "-mtune=znver4"
-                  ]
-                );
-          }
-        )
-      ];
-
-      boot.kernelPackages = pkgs.linuxPackagesFor pkgs.linux_znver4;
-    }
-  ];
-}

nix/configuration/hosts/ionlybootzfs/DEPLOY_BOOT

@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+#
+set -euo pipefail
+IFS=$'\n\t'
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+
+: "${JOBS:="1"}"
+
+#TARGET=10.216.1.14
+# TARGET=192.168.211.250
+TARGET="ionlybootzfs"
+
+nix flake update zsh-histdb --flake "$DIR/../../"
+nix flake update ansible-sshjail --flake "$DIR/../../"
+for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done
+
+nixos-rebuild boot --flake "$DIR/../../#ionlybootzfs" --target-host "$TARGET" --build-host "$TARGET" --fast --use-remote-sudo --max-jobs "$JOBS" --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#ionlybootzfs'

nix/configuration/hosts/ionlybootzfs/DEPLOY_SWITCH

@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+#
+set -euo pipefail
+IFS=$'\n\t'
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+
+: "${JOBS:="1"}"
+
+#TARGET=10.216.1.14
+# TARGET=192.168.211.250
+TARGET=ionlybootzfs
+
+nix flake update zsh-histdb --flake "$DIR/../../"
+nix flake update ansible-sshjail --flake "$DIR/../../"
+for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done
+
+nixos-rebuild switch --flake "$DIR/../../#ionlybootzfs" --target-host "$TARGET" --build-host "$TARGET" --fast --use-remote-sudo --max-jobs "$JOBS" --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#ionlybootzfs'

nix/configuration/hosts/ionlybootzfs/ISO

@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+#
+set -euo pipefail
+IFS=$'\n\t'
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+
+: "${JOBS:="1"}"
+
+nix flake update zsh-histdb --flake "$DIR/../../"
+nix flake update ansible-sshjail --flake "$DIR/../../"
+for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done
+nix build --extra-experimental-features nix-command --extra-experimental-features flakes "$DIR/../..#iso.ionlybootzfs" --max-jobs "$JOBS" --log-format internal-json -v "${@}" |& nom --json

nix/configuration/hosts/ionlybootzfs/default.nix

@@ -0,0 +1,63 @@
+#
+# Testing:
+# doas "$(nix-build '<nixpkgs>' --no-out-link -A 'qemu')/bin/qemu-system-x86_64" \
+#      -accel kvm \
+#      -cpu host \
+#      -smp cores=8 \
+#      -m 32768 \
+#      -drive "file=$(nix-build '<nixpkgs>' --no-out-link -A 'OVMF.fd')/FV/OVMF.fd,if=pflash,format=raw,readonly=on" \
+#      -drive file=/tmp/localdisk.img,if=none,id=nvm,format=raw \
+#      -device nvme,serial=deadbeef,drive=nvm \
+#      -nic user,hostfwd=tcp::60022-:22 \
+#      -boot order=d \
+#      -cdrom "$(readlink -f /persist/machine_setup/nix/configuration/result/iso/nixos*.iso)" \
+#      -display vnc=127.0.0.1:0
+#
+
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+{
+  imports = [
+    ./wrapped-disk-config.nix
+    ./hardware-configuration.nix
+  ];
+
+  # Generate with `head -c4 /dev/urandom | od -A none -t x4`
+  networking.hostId = "fbd233d8";
+
+  networking.hostName = "ionlybootzfs"; # Define your hostname.
+
+  time.timeZone = "America/New_York";
+  i18n.defaultLocale = "en_US.UTF-8";
+
+  me.secureBoot.enable = true;
+
+  me.optimizations = {
+    enable = false;
+    arch = "znver4";
+    system_features = [
+      "gccarch-znver4"
+      "gccarch-skylake"
+      # "gccarch-alderlake" missing WAITPKG
+      "gccarch-x86-64-v3"
+      "gccarch-x86-64-v4"
+      "benchmark"
+      "big-parallel"
+      "kvm"
+      "nixos-test"
+    ];
+  };
+
+  # Mount tmpfs at /tmp
+  boot.tmp.useTmpfs = true;
+
+  me.emacs_flavor = "plainmacs";
+  me.graphical = false;
+  me.wireguard.activated = [ ];
+  me.wireguard.deactivated = [ ];
+  me.zsh.enable = true;
+}

nix/configuration/hosts/ionlybootzfs/disk-config.nix

@@ -0,0 +1,142 @@
+# Manual Step:
+#   Check if drive supports 4kn: nvme id-ns -H /dev/nvme0n1
+#   Format the drive to 4kn: nvme format --lbaf=1 /dev/nvme0n1
+
+{
+  disko.devices = {
+    disk = {
+      main = {
+        type = "disk";
+        device = "/dev/nvme0n1";
+        content = {
+          type = "gpt";
+          partitions = {
+            ESP = {
+              size = "1G";
+              type = "EF00";
+              content = {
+                type = "filesystem";
+                format = "vfat";
+                mountpoint = "/boot";
+                mountOptions = [
+                  "umask=0077"
+                  "noatime"
+                  "discard"
+                ];
+              };
+            };
+            zfs = {
+              size = "100%";
+              content = {
+                type = "zfs";
+                pool = "zroot";
+              };
+            };
+          };
+        };
+      };
+    };
+    zpool = {
+      zroot = {
+        type = "zpool";
+        # mode = "mirror";
+        # Workaround: cannot import 'zroot': I/O error in disko tests
+        options.cachefile = "none";
+        options = {
+          ashift = "12";
+          compatibility = "openzfs-2.2-freebsd";
+          autotrim = "on";
+        };
+        rootFsOptions = {
+          acltype = "posixacl";
+          atime = "off";
+          relatime = "off";
+          xattr = "sa";
+          mountpoint = "none";
+          compression = "lz4";
+          canmount = "off";
+          utf8only = "on";
+          dnodesize = "auto";
+          normalization = "formD";
+        };
+
+        datasets = {
+          "linux/nix" = {
+            type = "zfs_fs";
+            options.mountpoint = "none";
+            options = {
+              encryption = "aes-256-gcm";
+              keyformat = "passphrase";
+              # keylocation = "file:///tmp/secret.key";
+            };
+          };
+          "linux/nix/root" = {
+            type = "zfs_fs";
+            options.mountpoint = "legacy";
+            mountpoint = "/";
+            postCreateHook = "zfs list -t snapshot -H -o name | grep -E '^zroot/linux/nix/root@blank$' || zfs snapshot zroot/linux/nix/root@blank";
+          };
+          "linux/nix/nix" = {
+            type = "zfs_fs";
+            options.mountpoint = "legacy";
+            mountpoint = "/nix";
+            postCreateHook = "zfs list -t snapshot -H -o name | grep -E '^zroot/linux/nix/nix@blank$' || zfs snapshot zroot/linux/nix/nix@blank";
+            options = {
+              recordsize = "16MiB";
+              compression = "zstd-19";
+            };
+          };
+          "linux/nix/home" = {
+            type = "zfs_fs";
+            options.mountpoint = "legacy";
+            mountpoint = "/home";
+            postCreateHook = "zfs list -t snapshot -H -o name | grep -E '^zroot/linux/nix/home@blank$' || zfs snapshot zroot/linux/nix/home@blank";
+          };
+          "linux/nix/persist" = {
+            type = "zfs_fs";
+            options.mountpoint = "legacy";
+            mountpoint = "/persist";
+            postCreateHook = "zfs list -t snapshot -H -o name | grep -E '^zroot/linux/nix/persist@blank$' || zfs snapshot zroot/linux/nix/persist@blank";
+          };
+          "linux/nix/state" = {
+            type = "zfs_fs";
+            options.mountpoint = "legacy";
+            mountpoint = "/state";
+            postCreateHook = "zfs list -t snapshot -H -o name | grep -E '^zroot/linux/nix/state@blank$' || zfs snapshot zroot/linux/nix/state@blank";
+          };
+        };
+      };
+    };
+  };
+
+  # Make sure all persistent volumes are marked as neededForBoot
+  #
+  # Also mounts /home so it is mounted before the user home directories are created.
+  fileSystems."/persist".neededForBoot = true;
+  fileSystems."/state".neededForBoot = true;
+  fileSystems."/home".neededForBoot = true;
+
+  fileSystems."/".options = [
+    "noatime"
+    "norelatime"
+  ];
+  fileSystems."/nix".options = [
+    "noatime"
+    "norelatime"
+  ];
+  fileSystems."/persist".options = [
+    "noatime"
+    "norelatime"
+  ];
+  fileSystems."/state".options = [
+    "noatime"
+    "norelatime"
+  ];
+  fileSystems."/home".options = [
+    "noatime"
+    "norelatime"
+  ];
+
+  # Only attempt to decrypt the main pool. Otherwise it attempts to decrypt pools that aren't even used.
+  boot.zfs.requestEncryptionCredentials = [ "zroot/linux/nix" ];
+}

nix/configuration/hosts/ionlybootzfs/hardware-configuration.nix

@@ -0,0 +1,38 @@
+# Do not modify this file!  It was generated by ‘nixos-generate-config’
+# and may be overwritten by future invocations.  Please make changes
+# to /etc/nixos/configuration.nix instead.
+{
+  config,
+  lib,
+  pkgs,
+  modulesPath,
+  ...
+}:
+
+{
+  imports = [
+    (modulesPath + "/installer/scan/not-detected.nix")
+  ];
+
+  boot.initrd.availableKernelModules = [
+    "xhci_pci"
+    "nvme"
+    "usbhid"
+    "usb_storage"
+    "sd_mod"
+    "sdhci_pci"
+  ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ ];
+  boot.extraModulePackages = [ ];
+
+  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
+  # (the default) this is the recommended approach. When using systemd-networkd it's
+  # still possible to use this option, but it's recommended to use it in conjunction
+  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
+  networking.dhcpcd.enable = lib.mkForce true;
+  networking.useDHCP = lib.mkForce true;
+  # systemd.network.enable = true;
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+}

nix/configuration/hosts/ionlybootzfs/optimized_build.nix

@@ -56,31 +56,35 @@
         (final: prev: {
           haskellPackages = prev.haskellPackages.extend (
             final': prev': {
-              crypton = pkgs-unoptimized.haskellPackages.crypton;
+              inherit (pkgs-unoptimized.haskellPackages)
-              crypton-connection = pkgs-unoptimized.haskellPackages.crypton-connection;
+                crypton
-              crypton-x509 = pkgs-unoptimized.haskellPackages.crypton-x509;
+                crypton-connection
-              crypton-x509-store = pkgs-unoptimized.haskellPackages.crypton-x509-store;
+                crypton-x509
-              crypton-x509-system = pkgs-unoptimized.haskellPackages.crypton-x509-system;
+                crypton-x509-store
-              crypton-x509-validation = pkgs-unoptimized.haskellPackages.crypton-x509-validation;
+                crypton-x509-system
-              hspec-wai = pkgs-unoptimized.haskellPackages.hspec-wai;
+                crypton-x509-validation
-              http-client-tls = pkgs-unoptimized.haskellPackages.http-client-tls;
+                hspec-wai
-              http2 = pkgs-unoptimized.haskellPackages.http2;
+                http-client-tls
-              pandoc = pkgs-unoptimized.haskellPackages.pandoc;
+                http2
-              pandoc-cli = pkgs-unoptimized.haskellPackages.pandoc-cli;
+                pandoc
-              pandoc-lua-engine = pkgs-unoptimized.haskellPackages.pandoc-lua-engine;
+                pandoc-cli
-              pandoc-server = pkgs-unoptimized.haskellPackages.pandoc-server;
+                pandoc-lua-engine
-              servant-server = pkgs-unoptimized.haskellPackages.servant-server;
+                pandoc-server
-              tls = pkgs-unoptimized.haskellPackages.tls;
+                servant-server
-              wai-app-static = pkgs-unoptimized.haskellPackages.wai-app-static;
+                tls
-              wai-extra = pkgs-unoptimized.haskellPackages.wai-extra;
+                wai-app-static
-              warp = pkgs-unoptimized.haskellPackages.warp;
+                wai-extra
+                warp
+                ;
             }
           );
         })
         (final: prev: {
-          gsl = pkgs-unoptimized.gsl;
+          inherit (pkgs-unoptimized)
-          redis = pkgs-unoptimized.redis;
+            gsl
-          valkey = pkgs-unoptimized.valkey;
+            redis
+            valkey
+            ;
         })
       ];
 

nix/configuration/hosts/ionlybootzfs/wrapped-disk-config.nix

@@ -0,0 +1,8 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+
+lib.mkIf (!config.me.buildingIso) (import ./disk-config.nix)

nix/configuration/hosts/neelix/DEPLOY_BOOT

@@ -14,6 +14,6 @@ nix flake update zsh-histdb --flake "$DIR/../../"
 nix flake update ansible-sshjail --flake "$DIR/../../"
 for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done
 
-nixos-rebuild boot --flake "$DIR/../../#neelix" --target-host "$TARGET" --build-host "$TARGET" --fast --use-remote-sudo --max-jobs "$JOBS" "${@}" |& nom
+nixos-rebuild boot --flake "$DIR/../../#neelix" --target-host "$TARGET" --build-host "$TARGET" --fast --use-remote-sudo --max-jobs "$JOBS" --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'

nix/configuration/hosts/neelix/DEPLOY_SWITCH

@@ -14,6 +14,6 @@ nix flake update zsh-histdb --flake "$DIR/../../"
 nix flake update ansible-sshjail --flake "$DIR/../../"
 for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done
 
-nixos-rebuild switch --flake "$DIR/../../#neelix" --target-host "$TARGET" --build-host "$TARGET" --fast --use-remote-sudo --max-jobs "$JOBS" "${@}" |& nom
+nixos-rebuild switch --flake "$DIR/../../#neelix" --target-host "$TARGET" --build-host "$TARGET" --fast --use-remote-sudo --max-jobs "$JOBS" --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'

nix/configuration/hosts/neelix/default.nix

@@ -3,7 +3,6 @@
   imports = [
     ./hardware-configuration.nix
     ./disk-config.nix
-    ./optimized_build.nix
     ./power_management.nix
   ];
 
@@ -15,9 +14,22 @@
   time.timeZone = "America/New_York";
   i18n.defaultLocale = "en_US.UTF-8";
 
-  me.optimizations.enable = false;
   me.secureBoot.enable = false;
 
+  me.optimizations = {
+    enable = false;
+    arch = "alderlake";
+    system_features = [
+      "gccarch-alderlake"
+      "gccarch-x86-64-v3"
+      "gccarch-x86-64-v4"
+      "benchmark"
+      "big-parallel"
+      "kvm"
+      "nixos-test"
+    ];
+  };
+
   # Early KMS
   boot.initrd.kernelModules = [ "i915" ];
 

nix/configuration/hosts/neelix/hardware-configuration.nix

@@ -14,7 +14,14 @@
     (modulesPath + "/installer/scan/not-detected.nix")
   ];
 
-  boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usbhid" "usb_storage" "sd_mod" "sdhci_pci" ];
+  boot.initrd.availableKernelModules = [
+    "xhci_pci"
+    "nvme"
+    "usbhid"
+    "usb_storage"
+    "sd_mod"
+    "sdhci_pci"
+  ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ ];
   boot.extraModulePackages = [ ];
@@ -23,7 +30,7 @@
   # (the default) this is the recommended approach. When using systemd-networkd it's
   # still possible to use this option, but it's recommended to use it in conjunction
   # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
-  networking.useDHCP = lib.mkDefault true;
+  # networking.useDHCP = lib.mkDefault true;
   # networking.interfaces.eno1.useDHCP = lib.mkDefault true;
   # networking.interfaces.wlp58s0.useDHCP = lib.mkDefault true;
 

nix/configuration/hosts/neelix/optimized_build.nix

@@ -1,80 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-{
-  imports = [ ];
-
-  config = lib.mkMerge [
-    { }
-    (lib.mkIf (!config.me.optimizations.enable) {
-      boot.kernelPackages = pkgs.linuxPackagesFor pkgs.linux_6_13;
-    })
-    (lib.mkIf (config.me.optimizations.enable) {
-      nixpkgs.hostPlatform = {
-        gcc.arch = "alderlake";
-        gcc.tune = "alderlake";
-        system = "x86_64-linux";
-      };
-
-      nixpkgs.overlays = [
-        (
-          self: super:
-          let
-            optimizeWithFlags =
-              pkg: flags:
-              pkg.overrideAttrs (old: {
-                NIX_CFLAGS_COMPILE = [ (old.NIX_CFLAGS_COMPILE or "") ] ++ flags;
-              });
-            addConfig =
-              additionalConfig: pkg:
-              pkg.override (oldconfig: {
-                structuredExtraConfig = pkg.structuredExtraConfig // additionalConfig;
-              });
-          in
-          {
-            linux_me =
-              addConfig
-                {
-                  # Full preemption
-                  PREEMPT = lib.mkOverride 60 lib.kernel.yes;
-                  PREEMPT_VOLUNTARY = lib.mkOverride 60 lib.kernel.no;
-
-                  # Google's BBRv3 TCP congestion Control
-                  TCP_CONG_BBR = lib.kernel.yes;
-                  DEFAULT_BBR = lib.kernel.yes;
-
-                  # Preemptive Full Tickless Kernel at 300Hz
-                  HZ = lib.kernel.freeform "300";
-                  HZ_300 = lib.kernel.yes;
-                  HZ_1000 = lib.kernel.no;
-                }
-                (
-                  optimizeWithFlags super.linux_6_12 [
-                    "-march=alderlake"
-                    "-mtune=alderlake"
-                  ]
-                );
-          }
-        )
-      ];
-
-      boot.kernelPackages = pkgs.linuxPackagesFor pkgs.linux_me;
-    })
-    (lib.mkIf (!config.me.buildingIso) {
-      nix.settings.system-features = lib.mkForce [
-        "gccarch-alderlake"
-        "gccarch-x86-64-v3"
-        "benchmark"
-        "big-parallel"
-        "kvm"
-        "nixos-test"
-      ];
-    })
-    (lib.mkIf (config.me.buildingIso) {
-      boot.supportedFilesystems = [ "zfs" ];
-    })
-  ];
-}

nix/configuration/hosts/odo/DEPLOY_BOOT

@@ -14,6 +14,6 @@ nix flake update zsh-histdb --flake "$DIR/../../"
 nix flake update ansible-sshjail --flake "$DIR/../../"
 for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done
 
-nixos-rebuild boot --flake "$DIR/../../#odo" --target-host "$TARGET" --build-host "$TARGET" --fast --use-remote-sudo --max-jobs "$JOBS" "${@}" |& nom
+nixos-rebuild boot --flake "$DIR/../../#odo" --target-host "$TARGET" --build-host "$TARGET" --fast --use-remote-sudo --max-jobs "$JOBS" --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#odo'

nix/configuration/hosts/odo/DEPLOY_SWITCH

@@ -14,6 +14,6 @@ nix flake update zsh-histdb --flake "$DIR/../../"
 nix flake update ansible-sshjail --flake "$DIR/../../"
 for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done
 
-nixos-rebuild switch --flake "$DIR/../../#odo" --target-host "$TARGET" --build-host "$TARGET" --fast --use-remote-sudo --max-jobs "$JOBS" "${@}" |& nom
+nixos-rebuild switch --flake "$DIR/../../#odo" --target-host "$TARGET" --build-host "$TARGET" --fast --use-remote-sudo --max-jobs "$JOBS" --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#odo'

nix/configuration/hosts/odo/ISO

@@ -9,4 +9,4 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 nix flake update zsh-histdb --flake "$DIR/../../"
 nix flake update ansible-sshjail --flake "$DIR/../../"
 for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done
-nix build --extra-experimental-features nix-command --extra-experimental-features flakes "$DIR/../..#iso.odo" --max-jobs "$JOBS" "${@}" |& nom
+nix build --extra-experimental-features nix-command --extra-experimental-features flakes "$DIR/../..#iso.odo" --max-jobs "$JOBS" --log-format internal-json -v "${@}" |& nom --json

nix/configuration/hosts/odo/SELF_BOOT

@@ -9,4 +9,4 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 nix flake update zsh-histdb --flake "$DIR/../../"
 nix flake update ansible-sshjail --flake "$DIR/../../"
 for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done
-nixos-rebuild boot --show-trace --use-remote-sudo --max-jobs "$JOBS" --flake "$DIR/../../#odo" "${@}" |& nom
+nixos-rebuild boot --show-trace --use-remote-sudo --max-jobs "$JOBS" --flake "$DIR/../../#odo" --log-format internal-json -v "${@}" |& nom --json

nix/configuration/hosts/odo/SELF_BUILD

@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+#
+set -euo pipefail
+IFS=$'\n\t'
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+
+: "${JOBS:="1"}"
+
+nix flake update zsh-histdb --flake "$DIR/../../"
+nix flake update ansible-sshjail --flake "$DIR/../../"
+for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done
+nixos-rebuild build --show-trace --use-remote-sudo --max-jobs "$JOBS" --flake "$DIR/../../#odo" --log-format internal-json -v "${@}" |& nom --json

nix/configuration/hosts/odo/SELF_SWITCH

@@ -9,4 +9,4 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 nix flake update zsh-histdb --flake "$DIR/../../"
 nix flake update ansible-sshjail --flake "$DIR/../../"
 for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done
-nixos-rebuild switch --show-trace --use-remote-sudo --max-jobs "$JOBS" --flake "$DIR/../../#odo" "${@}" |& nom
+nixos-rebuild switch --show-trace --use-remote-sudo --max-jobs "$JOBS" --flake "$DIR/../../#odo" --log-format internal-json -v "${@}" |& nom --json

nix/configuration/hosts/odo/default.nix

@@ -7,8 +7,7 @@
 {
   imports = [
     ./hardware-configuration.nix
-    ./disk-config.nix
+    ./wrapped-disk-config.nix
-    ./optimized_build.nix
     ./distributed_build.nix
     ./power_management.nix
     ./screen_brightness.nix
@@ -24,9 +23,24 @@
   time.timeZone = "America/New_York";
   i18n.defaultLocale = "en_US.UTF-8";
 
-  me.optimizations.enable = true;
   me.secureBoot.enable = true;
 
+  me.optimizations = {
+    enable = false;
+    arch = "znver4";
+    system_features = [
+      "gccarch-znver4"
+      "gccarch-skylake"
+      # "gccarch-alderlake" missing WAITPKG
+      "gccarch-x86-64-v3"
+      "gccarch-x86-64-v4"
+      "benchmark"
+      "big-parallel"
+      "kvm"
+      "nixos-test"
+    ];
+  };
+
   # Early KMS
   boot.initrd.kernelModules = [ "amdgpu" ];
 
@@ -45,13 +59,16 @@
   # services.fstrim.enable = lib.mkDefault true;
 
   me.alacritty.enable = true;
+  me.amd_s2idle.enable = true;
   me.ansible.enable = true;
   me.ares.enable = true;
   me.bluetooth.enable = true;
   me.chromecast.enable = true;
   me.chromium.enable = true;
+  me.d2.enable = true;
+  me.direnv.enable = true;
   me.docker.enable = true;
-  me.ecc.enable = true;
+  me.ecc.enable = false;
   me.emacs_flavor = "full";
   me.firefox.enable = true;
   me.flux.enable = true;
@@ -61,6 +78,7 @@
   me.gpg.enable = true;
   me.graphical = true;
   me.graphics_card_type = "amd";
+  me.iso_mount.enable = true;
   me.kanshi.enable = false;
   me.kubernetes.enable = true;
   me.latex.enable = true;
@@ -71,7 +89,9 @@
   me.pcsx2.enable = true;
   me.python.enable = true;
   me.qemu.enable = true;
+  me.rpcs3.enable = true;
   me.rust.enable = true;
+  me.shadps4.enable = true;
   me.shikane.enable = true;
   me.sops.enable = true;
   me.sound.enable = true;

nix/configuration/hosts/odo/disk-config.nix

@@ -1,14 +1,8 @@
 # Manual Step:
 #   Check if drive supports 4kn: nvme id-ns -H /dev/nvme0n1
 #   Format the drive to 4kn: nvme format --lbaf=1 /dev/nvme0n1
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
 
-lib.mkIf (!config.me.buildingIso) {
+{
   disko.devices = {
     disk = {
       main = {

nix/configuration/hosts/odo/hardware-configuration.nix

@@ -27,7 +27,7 @@
   # (the default) this is the recommended approach. When using systemd-networkd it's
   # still possible to use this option, but it's recommended to use it in conjunction
   # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
-  networking.useDHCP = lib.mkDefault true;
+  # networking.useDHCP = lib.mkDefault true;
   # networking.interfaces.eno1.useDHCP = lib.mkDefault true;
   # networking.interfaces.wlp58s0.useDHCP = lib.mkDefault true;
 

nix/configuration/hosts/odo/power_management.nix

@@ -20,7 +20,7 @@
   # amd_pstate=guided :: Same as passive except we can set upper and lower frequency bounds.
   # amdgpu.dcdebugmask=0x10 :: Allegedly disables Panel Replay from https://community.frame.work/t/tracking-freezing-arch-linux-amd/39495/32
   boot.kernelParams = [
-    "amdgpu.abmlevel=3"
+    "amdgpu.abmlevel=2"
     "pcie_aspm=force"
     # "pcie_aspm.policy=powersupersave"
     "nowatchdog"
@@ -47,6 +47,22 @@
     "w- /sys/devices/system/cpu/cpufreq/policy13/energy_performance_preference - - - - power"
     "w- /sys/devices/system/cpu/cpufreq/policy14/energy_performance_preference - - - - power"
     "w- /sys/devices/system/cpu/cpufreq/policy15/energy_performance_preference - - - - power"
+    "w- /sys/devices/system/cpu/cpu0/cpufreq/boost - - - - 0"
+    "w- /sys/devices/system/cpu/cpu1/cpufreq/boost - - - - 0"
+    "w- /sys/devices/system/cpu/cpu2/cpufreq/boost - - - - 0"
+    "w- /sys/devices/system/cpu/cpu3/cpufreq/boost - - - - 0"
+    "w- /sys/devices/system/cpu/cpu4/cpufreq/boost - - - - 0"
+    "w- /sys/devices/system/cpu/cpu5/cpufreq/boost - - - - 0"
+    "w- /sys/devices/system/cpu/cpu6/cpufreq/boost - - - - 0"
+    "w- /sys/devices/system/cpu/cpu7/cpufreq/boost - - - - 0"
+    "w- /sys/devices/system/cpu/cpu8/cpufreq/boost - - - - 0"
+    "w- /sys/devices/system/cpu/cpu9/cpufreq/boost - - - - 0"
+    "w- /sys/devices/system/cpu/cpu10/cpufreq/boost - - - - 0"
+    "w- /sys/devices/system/cpu/cpu11/cpufreq/boost - - - - 0"
+    "w- /sys/devices/system/cpu/cpu12/cpufreq/boost - - - - 0"
+    "w- /sys/devices/system/cpu/cpu13/cpufreq/boost - - - - 0"
+    "w- /sys/devices/system/cpu/cpu14/cpufreq/boost - - - - 0"
+    "w- /sys/devices/system/cpu/cpu15/cpufreq/boost - - - - 0"
   ];
 
   boot.extraModprobeConfig = ''

nix/configuration/hosts/odo/screen_brightness.nix

@@ -9,6 +9,6 @@
   imports = [ ];
 
   systemd.tmpfiles.rules = [
-    "w- /sys/class/backlight/amdgpu_bl1/brightness - - - - 85"
+    "w- /sys/class/backlight/amdgpu_bl1/brightness - - - - 21845"
   ];
 }

nix/configuration/hosts/odo/wrapped-disk-config.nix

@@ -0,0 +1,8 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+
+lib.mkIf (!config.me.buildingIso) (import ./disk-config.nix)

nix/configuration/hosts/quark/DEPLOY_BOOT

@@ -14,6 +14,6 @@ nix flake update zsh-histdb --flake "$DIR/../../"
 nix flake update ansible-sshjail --flake "$DIR/../../"
 for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done
 
-nixos-rebuild boot --flake "$DIR/../../#quark" --target-host "$TARGET" --build-host "$TARGET" --fast --use-remote-sudo --max-jobs "$JOBS" "${@}" |& nom
+nixos-rebuild boot --flake "$DIR/../../#quark" --target-host "$TARGET" --build-host "$TARGET" --fast --use-remote-sudo --max-jobs "$JOBS" --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#quark'

nix/configuration/hosts/quark/DEPLOY_SWITCH

@@ -14,6 +14,6 @@ nix flake update zsh-histdb --flake "$DIR/../../"
 nix flake update ansible-sshjail --flake "$DIR/../../"
 for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done
 
-nixos-rebuild switch --flake "$DIR/../../#quark" --target-host "$TARGET" --build-host "$TARGET" --fast --use-remote-sudo --max-jobs "$JOBS" "${@}" |& nom
+nixos-rebuild switch --flake "$DIR/../../#quark" --target-host "$TARGET" --build-host "$TARGET" --fast --use-remote-sudo --max-jobs "$JOBS" --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#quark'

nix/configuration/hosts/quark/ISO

@@ -9,4 +9,4 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 nix flake update zsh-histdb --flake "$DIR/../../"
 nix flake update ansible-sshjail --flake "$DIR/../../"
 for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done
-nix build --extra-experimental-features nix-command --extra-experimental-features flakes "$DIR/../..#iso.quark" --max-jobs "$JOBS" "${@}" |& nom
+nix build --extra-experimental-features nix-command --extra-experimental-features flakes "$DIR/../..#iso.quark" --max-jobs "$JOBS" --log-format internal-json -v "${@}" |& nom --json

nix/configuration/hosts/quark/SELF_BOOT

@@ -9,4 +9,4 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 nix flake update zsh-histdb --flake "$DIR/../../"
 nix flake update ansible-sshjail --flake "$DIR/../../"
 for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done
-nixos-rebuild boot --show-trace --use-remote-sudo --max-jobs "$JOBS" --flake "$DIR/../../#quark" "${@}" |& nom
+nixos-rebuild boot --show-trace --use-remote-sudo --max-jobs "$JOBS" --flake "$DIR/../../#quark" --log-format internal-json -v "${@}" |& nom --json

nix/configuration/hosts/quark/SELF_BUILD

@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+#
+set -euo pipefail
+IFS=$'\n\t'
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+
+: "${JOBS:="1"}"
+
+nix flake update zsh-histdb --flake "$DIR/../../"
+nix flake update ansible-sshjail --flake "$DIR/../../"
+for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done
+nixos-rebuild build --show-trace --use-remote-sudo --max-jobs "$JOBS" --flake "$DIR/../../#quark" --log-format internal-json -v "${@}" |& nom --json

nix/configuration/hosts/quark/SELF_SWITCH

@@ -9,4 +9,4 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 nix flake update zsh-histdb --flake "$DIR/../../"
 nix flake update ansible-sshjail --flake "$DIR/../../"
 for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done
-nixos-rebuild switch --show-trace --use-remote-sudo --max-jobs "$JOBS" --flake "$DIR/../../#quark" "${@}" |& nom
+nixos-rebuild switch --show-trace --use-remote-sudo --max-jobs "$JOBS" --flake "$DIR/../../#quark" --log-format internal-json -v "${@}" |& nom --json

nix/configuration/hosts/quark/default.nix

@@ -9,11 +9,11 @@
     ./disk-config.nix
     ./distributed_build.nix
     ./hardware-configuration.nix
-    ./optimized_build.nix
     ./power_management.nix
     ./wifi.nix
   ];
 
+  config = {
     # Generate with `head -c4 /dev/urandom | od -A none -t x4`
     networking.hostId = "47ee7d7c";
 
@@ -22,9 +22,25 @@
     time.timeZone = "America/New_York";
     i18n.defaultLocale = "en_US.UTF-8";
 
-  me.optimizations.enable = true;
     me.secureBoot.enable = true;
 
+    me.optimizations = {
+      enable = true;
+      arch = "znver5";
+      system_features = [
+        "gccarch-znver4"
+        "gccarch-znver5"
+        "gccarch-skylake"
+        # "gccarch-alderlake" missing WAITPKG
+        "gccarch-x86-64-v3"
+        "gccarch-x86-64-v4"
+        "benchmark"
+        "big-parallel"
+        "kvm"
+        "nixos-test"
+      ];
+    };
+
     # Early KMS
     boot.initrd.kernelModules = [ "amdgpu" ];
 
@@ -34,12 +50,18 @@
     # Enable TRIM
     # services.fstrim.enable = lib.mkDefault true;
 
+    # RPCS3 has difficulty with znver5
+    me.rpcs3.config.Core."Use LLVM CPU" = "znver4";
+
     me.alacritty.enable = true;
+    me.amd_s2idle.enable = true;
     me.ansible.enable = true;
     me.ares.enable = true;
     me.bluetooth.enable = true;
     me.chromecast.enable = true;
     me.chromium.enable = true;
+    me.d2.enable = true;
+    me.direnv.enable = true;
     me.docker.enable = true;
     me.ecc.enable = true;
     me.emacs_flavor = "full";
@@ -51,6 +73,7 @@
     me.gpg.enable = true;
     me.graphical = true;
     me.graphics_card_type = "amd";
+    me.iso_mount.enable = true;
     me.kanshi.enable = false;
     me.kubernetes.enable = true;
     me.latex.enable = true;
@@ -62,7 +85,9 @@
     me.pcsx2.enable = true;
     me.python.enable = true;
     me.qemu.enable = true;
+    me.rpcs3.enable = true;
     me.rust.enable = true;
+    me.shadps4.enable = true;
     me.shikane.enable = true;
     me.sops.enable = true;
     me.sound.enable = true;
@@ -88,4 +113,5 @@
     me.sm64ex.enable = true;
     me.shipwright.enable = true;
     me.ship2harkinian.enable = true;
+  };
 }

nix/configuration/hosts/quark/hardware-configuration.nix

@@ -27,10 +27,9 @@
   # (the default) this is the recommended approach. When using systemd-networkd it's
   # still possible to use this option, but it's recommended to use it in conjunction
   # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
-  networking.useDHCP = lib.mkDefault true;
+  # networking.useDHCP = lib.mkDefault true;
   # networking.interfaces.eno1.useDHCP = lib.mkDefault true;
   # networking.interfaces.wlp58s0.useDHCP = lib.mkDefault true;
 
-  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
   hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 }

nix/configuration/hosts/quark/optimized_build.nix

@@ -1,122 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  pkgs-unoptimized,
-  ...
-}:
-{
-  imports = [ ];
-
-  config = lib.mkMerge [
-    { }
-    (lib.mkIf (!config.me.optimizations.enable) {
-      boot.kernelPackages = pkgs.linuxPackagesFor pkgs.linux_6_14;
-    })
-    (lib.mkIf (config.me.optimizations.enable) {
-      nixpkgs.hostPlatform = {
-        gcc.arch = "znver5";
-        gcc.tune = "znver5";
-        system = "x86_64-linux";
-      };
-
-      nixpkgs.overlays = [
-        (
-          final: prev:
-          let
-            addConfig =
-              additionalConfig: pkg:
-              pkg.override (oldconfig: {
-                structuredExtraConfig = pkg.structuredExtraConfig // additionalConfig;
-              });
-          in
-          {
-            linux_me = addConfig {
-              # Full preemption
-              PREEMPT = lib.mkOverride 60 lib.kernel.yes;
-              PREEMPT_VOLUNTARY = lib.mkOverride 60 lib.kernel.no;
-
-              # Google's BBRv3 TCP congestion Control
-              TCP_CONG_BBR = lib.kernel.yes;
-              DEFAULT_BBR = lib.kernel.yes;
-
-              # Preemptive Full Tickless Kernel at 300Hz
-              HZ = lib.kernel.freeform "300";
-              HZ_300 = lib.kernel.yes;
-              HZ_1000 = lib.kernel.no;
-            } prev.linux_6_14;
-          }
-        )
-        (final: prev: {
-          haskellPackages = prev.haskellPackages.extend (
-            final': prev': {
-              crypton = pkgs-unoptimized.haskellPackages.crypton;
-              crypton-connection = pkgs-unoptimized.haskellPackages.crypton-connection;
-              crypton-x509 = pkgs-unoptimized.haskellPackages.crypton-x509;
-              crypton-x509-store = pkgs-unoptimized.haskellPackages.crypton-x509-store;
-              crypton-x509-system = pkgs-unoptimized.haskellPackages.crypton-x509-system;
-              crypton-x509-validation = pkgs-unoptimized.haskellPackages.crypton-x509-validation;
-              hspec-wai = pkgs-unoptimized.haskellPackages.hspec-wai;
-              http-client-tls = pkgs-unoptimized.haskellPackages.http-client-tls;
-              http2 = pkgs-unoptimized.haskellPackages.http2;
-              pandoc = pkgs-unoptimized.haskellPackages.pandoc;
-              pandoc-cli = pkgs-unoptimized.haskellPackages.pandoc-cli;
-              pandoc-lua-engine = pkgs-unoptimized.haskellPackages.pandoc-lua-engine;
-              pandoc-server = pkgs-unoptimized.haskellPackages.pandoc-server;
-              servant-server = pkgs-unoptimized.haskellPackages.servant-server;
-              tls = pkgs-unoptimized.haskellPackages.tls;
-              wai-app-static = pkgs-unoptimized.haskellPackages.wai-app-static;
-              wai-extra = pkgs-unoptimized.haskellPackages.wai-extra;
-              warp = pkgs-unoptimized.haskellPackages.warp;
-            }
-          );
-        })
-        (final: prev: {
-          gsl = pkgs-unoptimized.gsl;
-          redis = pkgs-unoptimized.redis;
-          valkey = pkgs-unoptimized.valkey;
-        })
-      ];
-
-      boot.kernelPackages = pkgs.linuxPackagesFor pkgs.linux_me;
-    })
-    (lib.mkIf (!config.me.buildingIso) {
-      nix.settings.system-features = lib.mkForce [
-        "gccarch-znver4"
-        "gccarch-znver5"
-        "gccarch-skylake"
-        # "gccarch-alderlake" missing WAITPKG
-        "gccarch-x86-64-v3"
-        "gccarch-x86-64-v4"
-        "benchmark"
-        "big-parallel"
-        "kvm"
-        "nixos-test"
-      ];
-
-      # Keep ALL dependencies so we can rebuild offline. This DRASTICALLY increase disk usage, but disk space is cheap.
-      # system.includeBuildDependencies = true;
-
-      # This also should enable building offline? TODO: test.
-      nix.extraOptions = ''
-        keep-outputs = true
-        keep-derivations = true
-      '';
-
-      # # building ON
-      # nixpkgs.localSystem = { system = "aarch64-linux"; };
-      # # building FOR
-      # nixpkgs.crossSystem = { system = "aarch64-linux"; };
-
-      # nixpkgs.config = {
-      #   replaceStdenv = ({ pkgs }: pkgs.clangStdenv);
-      # };
-      # or maybe an overlay
-      # stdenv = prev.clangStdenv;
-
-    })
-    (lib.mkIf (config.me.buildingIso) {
-      boot.supportedFilesystems.zfs = true;
-    })
-  ];
-}

nix/configuration/roles/alacritty/default.nix

@@ -24,10 +24,8 @@
           xdg-utils # for xdg-open
         ];
 
-        home-manager.users.talexander =
+        me.install.user.talexander.file = {
-          { pkgs, ... }:
+          ".config/alacritty/alacritty.toml" = {
-          {
-            home.file.".config/alacritty/alacritty.toml" = {
             source = ./files/alacritty.toml;
           };
         };

nix/configuration/roles/amd_s2idle/default.nix

@@ -0,0 +1,29 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+
+{
+  imports = [ ];
+
+  options.me = {
+    amd_s2idle.enable = lib.mkOption {
+      type = lib.types.bool;
+      default = false;
+      example = true;
+      description = "Whether we want to install amd_s2idle.";
+    };
+  };
+
+  config = lib.mkIf config.me.amd_s2idle.enable (
+    lib.mkMerge [
+      {
+        environment.systemPackages = with pkgs; [
+          amd-debug-tools
+        ];
+      }
+    ]
+  );
+}

nix/configuration/roles/chromium/default.nix

@@ -22,7 +22,7 @@
       { }
       (lib.mkIf config.me.graphical {
         environment.systemPackages = with pkgs; [
-          (chromium.override { enableWideVine = true; })
+          chromium
         ];
         allowedUnfree = [
           "chromium"
@@ -57,8 +57,18 @@
           };
         };
 
+        nixpkgs.overlays = [
+          (final: prev: {
+            chromium = prev.chromium.override {
+              enableWideVine = true;
+              commandLineArgs = [
+                "--enable-features=VaapiVideoDecoder,VaapiIgnoreDriverChecks,Vulkan,DefaultANGLEVulkan,VulkanFromANGLE,AcceleratedVideoEncoder"
                 # Enabling vulkan causes video to render as white
-        # nixpkgs.config.chromium.commandLineArgs = "--enable-features=Vulkan";
+                # "--enable-features=Vulkan";
+              ];
+            };
+          })
+        ];
       })
     ]
   );

nix/configuration/roles/d2/default.nix

@@ -0,0 +1,29 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+
+{
+  imports = [ ];
+
+  options.me = {
+    d2.enable = lib.mkOption {
+      type = lib.types.bool;
+      default = false;
+      example = true;
+      description = "Whether we want to install d2.";
+    };
+  };
+
+  config = lib.mkIf config.me.d2.enable (
+    lib.mkMerge [
+      {
+        environment.systemPackages = with pkgs; [
+          d2
+        ];
+      }
+    ]
+  );
+}

nix/configuration/roles/direnv/default.nix

@@ -0,0 +1,55 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+
+let
+  direnv_zsh_hook = pkgs.writeTextFile {
+    name = "direnv_zsh_hook.zsh";
+    text = ''
+      eval "$(direnv hook zsh)"
+    '';
+  };
+in
+{
+  imports = [ ];
+
+  options.me = {
+    direnv.enable = lib.mkOption {
+      type = lib.types.bool;
+      default = false;
+      example = true;
+      description = "Whether we want to install direnv.";
+    };
+  };
+
+  config = lib.mkIf config.me.direnv.enable (
+    lib.mkMerge [
+      {
+        environment.systemPackages = with pkgs; [
+          direnv
+          nix-direnv
+        ];
+
+        me.zsh.includes = [ direnv_zsh_hook ];
+
+        environment.persistence."/persist" = lib.mkIf (!config.me.buildingIso) {
+          hideMounts = true;
+          users.talexander = {
+            directories = [
+              {
+                # List of allowed directories from `direnv allow`.
+                directory = ".local/share/direnv";
+                user = "talexander";
+                group = "talexander";
+                mode = "0755";
+              }
+            ];
+          };
+        };
+      }
+    ]
+  );
+}

nix/configuration/roles/ecc/default.nix

@@ -1,3 +1,4 @@
+# Check memory errors with: ras-mc-ctl --error-count
 {
   config,
   lib,

nix/configuration/roles/emacs/default.nix

@@ -113,7 +113,7 @@ in
                 "doc"
                 "info"
               ];
-              buildInputs = [ final.makeWrapper ];
+              nativeBuildInputs = [ final.makeWrapper ];
               postBuild = ''
                 wrapProgram $out/bin/emacs --prefix PATH : ${
                   lib.makeBinPath [
@@ -131,8 +131,10 @@ in
                     final.cmake-language-server
                     final.cmake # Used by cmake-language-server
                     final.rust-analyzer
-                    final.nodePackages_latest.prettier # Format yaml, json, and JS
+                    final.prettier # Format yaml, json, and JS
                     final.terraform-ls
+                    final.typescript-language-server
+                    final.tex
                   ]
                 }
               '';
@@ -140,10 +142,8 @@ in
           })
         ];
 
-        home-manager.users.talexander =
+        me.install.user.talexander.file = {
-          { pkgs, ... }:
+          ".config/emacs" = {
-          {
-            home.file.".config/emacs" = {
             source = ./files/emacs;
             recursive = true;
           };

nix/configuration/roles/emacs/files/emacs/elisp/base-extensions.el

@@ -14,17 +14,6 @@
 
 ;; Other packages
 
-(use-package emacs
-  :config
-  (setq enable-recursive-minibuffers t)
-
-  ;; Filter the M-x list base on the current mode
-  (setq read-extended-command-predicate #'command-completion-default-include-p)
-
-  ;; Enable triggering completion with the tab key.
-  (setq tab-always-indent 'complete)
-  )
-
 (use-package dashboard
   :config
   (dashboard-setup-startup-hook))

nix/configuration/roles/emacs/files/emacs/elisp/base.el

@@ -24,11 +24,51 @@
 (setq autoload-directory (concat user-emacs-directory (file-name-as-directory "elisp") (file-name-as-directory "autoload")))
 (add-to-list 'load-path (assert-directory autoload-directory))
 
-(setq-default
+(use-package emacs
+  :ensure nil
+  :bind
+  (("C-z" . nil)
+   ("C-x C-z" . nil)
+   ("RET" . newline-and-indent)
+   )
+  :custom
+  ;; Replace highlighted text if you start typing.
+  (delete-selection-mode 1)
+
+  (history-length 300)
+
+  ;; Enable auto-revert for buffers like dired
+  (global-auto-revert-non-file-buffers t)
+
+  ;; If the underlying file changes, reload it automatically. This is useful for moving around in git without confusing language servers.
+  (auto-revert-avoid-polling t)
+  (auto-revert-interval 5)
+  (auto-revert-check-vc-info t)
+  (global-auto-revert-mode t)
+
   ;; Disable backup files and lockfiles
- make-backup-files nil
+  (create-lockfiles nil)
- auto-save-default nil
+  (make-backup-files nil)
- create-lockfiles nil
+  (backup-inhibited t)
+
+  ;; Do not auto-save files
+  (auto-save-default nil)
+
+  (pixel-scroll-precision-mode t)
+  (pixel-scroll-precision-use-momentum nil)
+
+  :config
+  (setq enable-recursive-minibuffers t)
+
+  ;; Filter the M-x list base on the current mode
+  (setq read-extended-command-predicate #'command-completion-default-include-p)
+
+  ;; Enable triggering completion with the tab key.
+  (setq tab-always-indent 'complete)
+
+  )
+
+(setq-default
  ;; Unless otherwise specified, always install packages if they are absent.
  use-package-always-ensure t
  ;; Point custom-file at /dev/null so emacs does not write any settings to my dotfiles.
@@ -80,12 +120,6 @@
 ;; Delete trailing whitespace before save
 (add-hook 'before-save-hook 'delete-trailing-whitespace)
 
-;; If the underlying file changes, reload it automatically. This is useful for moving around in git without confusing language servers.
-(setopt auto-revert-avoid-polling t)
-(setopt auto-revert-interval 5)
-(setopt auto-revert-check-vc-info t)
-(global-auto-revert-mode)
-
 ;;;;; Performance
 ;; Run garbage collect when emacs is idle
 (run-with-idle-timer 5 t (lambda () (garbage-collect)))

nix/configuration/roles/emacs/files/emacs/elisp/lang-d2.el

@@ -0,0 +1,16 @@
+(defun d2-format-buffer ()
+  "Run prettier."
+  (interactive)
+  (run-command-on-buffer "d2" "fmt" "-")
+  )
+
+(use-package d2-mode
+  :commands (d2-mode)
+  :hook (
+         (d2-mode . (lambda ()
+                      ;; (add-hook 'before-save-hook 'd2-format-buffer nil 'local)
+                      ))
+         )
+  )
+
+(provide 'lang-d2)

nix/configuration/roles/emacs/files/emacs/elisp/lang-javascript.el

@@ -1,6 +1,12 @@
 (require 'common-lsp)
 (require 'util-tree-sitter)
 
+(defun js-format-buffer ()
+  "Run prettier."
+  (interactive)
+  (run-command-on-buffer "prettier" "--stdin-filepath" buffer-file-name)
+  )
+
 (use-package json-ts-mode
   :ensure nil
   :pin manual
@@ -113,10 +119,14 @@
          ("\\.js\\'" . js-ts-mode)
          )
   :commands (js-ts-mode)
+  :custom (
+           (js-indent-level 2)
+           )
   :hook (
          (js-ts-mode . (lambda ()
                                  (when-linux
                                    (eglot-ensure)
+                                   (add-hook 'before-save-hook 'js-format-buffer nil 'local)
                                    )
                                  ))
          )

nix/configuration/roles/emacs/files/emacs/elisp/lang-org.el

@@ -87,4 +87,8 @@
 (use-package gnuplot)
 (use-package graphviz-dot-mode)
 
+(use-package htmlize
+  ;; For syntax highlighting when exporting to HTML.
+  )
+
 (provide 'lang-org)

nix/configuration/roles/emacs/files/emacs/elisp/lang-rust.el

@@ -46,7 +46,7 @@
                              (when rust-analyzer-command
                                ;; (add-to-list 'eglot-server-programs `(rust-ts-mode . (,rust-analyzer-command)))
                                (add-to-list 'eglot-server-programs `(rust-ts-mode . (,rust-analyzer-command :initializationOptions (:imports (:granularity (:enforce t :group "item")
-                                                                                                                                                           :merge (:glob nil)
+                                                                                                                                                           :merge (:glob :json-false)
                                                                                                                                                            :prefix "self")
                                                                                                                                              ))))
                                )
@@ -60,8 +60,8 @@
   (unless (treesit-ready-p 'rust) (treesit-install-language-grammar 'rust))
   :config
   ;; Add keybindings for interacting with Cargo
-  (use-package cargo
+  ;; (use-package cargo
-    :hook (rust-ts-mode . cargo-minor-mode))
+  ;;   :hook (rust-ts-mode . cargo-minor-mode))
   )
 
 (use-package toml-ts-mode

nix/configuration/roles/emacs/files/emacs/init.el

@@ -40,4 +40,6 @@
 
 (require 'lang-cmake)
 
+(require 'lang-d2)
+
 (load-directory autoload-directory)

nix/configuration/roles/firefox/default.nix

@@ -73,6 +73,9 @@
               "+AllTargets,-CSSPrefersColorScheme,-JSDateTimeUTC,-CanvasExtractionBeforeUserInputIsBlocked";
             # Disable weather on new tab page
             "browser.newtabpage.activity-stream.showWeather" = false;
+            # Disable AI stuff that wastes battery life
+            "browser.ml.chat.enabled" = false;
+            "browser.ml.enabled" = false;
           };
           # Check about:policies#documentation and https://mozilla.github.io/policy-templates/ for options.
           policies = {
@@ -88,10 +91,10 @@
                 install_url = "https://addons.mozilla.org/firefox/downloads/latest/ublock-origin/latest.xpi";
                 installation_mode = "force_installed";
               };
-              "firefox@teleparty.com" = {
+              # "firefox@teleparty.com" = {
-                install_url = "https://addons.mozilla.org/firefox/downloads/latest/netflix-party-is-now-teleparty/latest.xpi";
+              #   install_url = "https://addons.mozilla.org/firefox/downloads/latest/netflix-party-is-now-teleparty/latest.xpi";
-                installation_mode = "normal_installed";
+              #   installation_mode = "normal_installed";
-              };
+              # };
               "@ublacklist" = {
                 install_url = "https://addons.mozilla.org/firefox/downloads/latest/ublacklist/latest.xpi";
                 installation_mode = "normal_installed";

nix/configuration/roles/git/default.nix

@@ -5,6 +5,18 @@
   ...
 }:
 
+let
+  git_wrapped =
+    package: prog:
+    pkgs.writeShellScriptBin "${prog}" ''
+      export PATH="${
+        lib.makeBinPath [
+          pkgs.meld
+        ]
+      }:$PATH"
+      exec ${package}/bin/${prog} "''${@}"
+    '';
+in
 {
   imports = [ ];
 
@@ -20,66 +32,48 @@
   config = lib.mkMerge [
     {
       environment.systemPackages = with pkgs; [
-        git
+        my_git
       ];
     }
     (lib.mkIf (config.me.git.config != null) {
-      home-manager.users.talexander =
+      me.install.user.talexander.file = {
-        { pkgs, ... }:
+        ".gitconfig" = {
-        {
-          home.file.".gitconfig" = {
           source = config.me.git.config;
         };
       };
     })
-    # (lib.mkIf (config.me.graphical) {
+    (lib.mkIf (config.me.graphical) {
-    #   nixpkgs.overlays = [
+      nixpkgs.overlays = [
-    #     (final: prev: {
+        (final: prev: {
-    #       git = pkgs.buildEnv {
+          my_git = (
-    #         name = prev.git.name;
+            pkgs.buildEnv {
-    #         paths = [
+              name = prev.git.name;
-    #           prev.git
+              version = prev.git.version;
-    #         ];
+              paths =
-    #         extraOutputsToInstall = [
+                (builtins.map (git_wrapped prev.git) [
-    #           "man"
+                  "git"
-    #           "doc"
+                ])
-    #           "info"
+                ++ [
-    #         ];
+                  prev.git
-    #         buildInputs = [ final.makeWrapper ];
+                ];
-    #         postBuild = ''
+              extraOutputsToInstall = [
-    #           wrapProgram $out/bin/git --prefix PATH : ${
+                "man"
-    #             lib.makeBinPath [
+                "doc"
-    #               final.meld
+                "info"
-    #             ]
+              ];
-    #           }
+              nativeBuildInputs = [ final.makeWrapper ];
-    #         '';
+              ignoreCollisions = true;
-    #       };
+            }
-    #     })
+          );
-    #   ];
+        })
-    # })
+      ];
-    # (lib.mkIf (!config.me.graphical) {
+    })
-    #   nixpkgs.overlays = [
+    (lib.mkIf (!config.me.graphical) {
-    #     (final: prev: {
+      nixpkgs.overlays = [
-    #       git = pkgs.buildEnv {
+        (final: prev: {
-    #         name = prev.git.name;
+          my_git = prev.git;
-    #         paths = [
+        })
-    #           prev.git
+      ];
-    #         ];
+    })
-    #         extraOutputsToInstall = [
-    #           "man"
-    #           "doc"
-    #           "info"
-    #         ];
-    #         buildInputs = [ final.makeWrapper ];
-    #         postBuild = ''
-    #           wrapProgram $out/bin/git --prefix PATH : ${
-    #             lib.makeBinPath [
-    #             ]
-    #           }
-    #         '';
-    #       };
-    #     })
-    #   ];
-    # })
   ];
 }

nix/configuration/roles/git/files/gitconfig_home

@@ -8,6 +8,7 @@
 	lg = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit
 	bh = log --oneline --branches=* --remotes=* --graph --decorate
 	amend = commit --amend --no-edit
+        authorcount = shortlog --summary --numbered --all --no-merges
 [core]
 	excludesfile = ~/.gitignore_global
 [commit]
@@ -50,4 +51,5 @@
 [rebase]
 	autoSquash = true
 	autoStash = true
-	updateRefs = true
+        # updateRefs was annoying when you want to split a branch in two by rebasing away from commits from one branch and rebasing away some commits from another branch.
+	updateRefs = false

nix/configuration/roles/global_options/default.nix

@@ -8,15 +8,6 @@
 {
   imports = [ ];
 
-  options.me = {
-    optimizations.enable = lib.mkOption {
-      type = lib.types.bool;
-      default = false;
-      example = true;
-      description = "Whether we want to enable CPU optimizations (will trigger a rebuild from source).";
-    };
-  };
-
   # options.me.graphics_card_type = lib.mkOption {
   #   type = lib.types.nullOr (
   #     lib.types.enum [

nix/configuration/roles/gpg/default.nix

@@ -57,11 +57,8 @@ in
         #   disable-ccid = true;
         # };
 
-        # .gnupg/scdaemon.conf
+        me.install.user.talexander.file = {
-        home-manager.users.talexander =
+          ".gnupg/scdaemon.conf" = {
-          { pkgs, ... }:
-          {
-            home.file.".gnupg/scdaemon.conf" = {
             source = ./files/scdaemon.conf;
           };
         };

nix/configuration/roles/iso_mount/default.nix

@@ -0,0 +1,45 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+
+let
+  iso_mount =
+    (pkgs.writeScriptBin "iso_mount" (builtins.readFile ./files/iso_mount.bash)).overrideAttrs
+      (old: {
+        buildCommand = "${old.buildCommand}\n patchShebangs $out";
+
+      });
+  iso_unmount =
+    (pkgs.writeScriptBin "iso_unmount" (builtins.readFile ./files/iso_unmount.bash)).overrideAttrs
+      (old: {
+        buildCommand = "${old.buildCommand}\n patchShebangs $out";
+
+      });
+
+in
+{
+  imports = [ ];
+
+  options.me = {
+    iso_mount.enable = lib.mkOption {
+      type = lib.types.bool;
+      default = false;
+      example = true;
+      description = "Whether we want to install iso_mount.";
+    };
+  };
+
+  config = lib.mkIf config.me.iso_mount.enable (
+    lib.mkMerge [
+      {
+        environment.systemPackages = [
+          iso_mount
+          iso_unmount
+        ];
+      }
+    ]
+  );
+}

nix/configuration/roles/iso_mount/files/iso_mount.bash

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+#
+# Mount a full-disk image as a loopback device so you can mount individual partitions from inside of it.
+set -euo pipefail
+IFS=$'\n\t'
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+
+exec udisksctl loop-setup -r -f "${@}"

nix/configuration/roles/iso_mount/files/iso_unmount.bash

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+#
+# Mount a full-disk image as a loopback device so you can mount individual partitions from inside of it.
+set -euo pipefail
+IFS=$'\n\t'
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+
+exec udisksctl loop-delete "${@}"

nix/configuration/roles/kanshi/default.nix

@@ -41,15 +41,11 @@ in
           exec_kanshi
         ];
 
-        home-manager.users.talexander =
+        me.install.user.talexander.file = {
-          { pkgs, ... }:
-          {
-            home.file = {
           ".config/kanshi/config" = {
             source = ./files/config_kanshi;
           };
         };
-          };
       })
     ]
   );

nix/configuration/roles/kodi/default.nix

@@ -78,9 +78,6 @@
           };
         };
 
-        home-manager.users.kodi =
-          { pkgs, ... }:
-          {
         # home.file.".kodi/userdata/mediasources.xml".source = ./files/mediasources.xml;
 
         # home.file.".kodi/userdata/addon_data/peripheral.joystick/resources/buttonmaps/xml/linux/DualSense_Wireless_Controller_13b_8a.xml".source =
@@ -88,11 +85,6 @@
 
         # TODO: Maybe .kodi/userdata/sources.xml
         # TODO: ./userdata/guisettings.xml:303:    <setting id="filecache.memorysize">128</setting>
-
-            # The state version is required and should stay at the version you
-            # originally installed.
-            home.stateVersion = "24.11";
-          };
       })
     ]
   );

nix/configuration/roles/kubernetes/default.nix

@@ -33,7 +33,7 @@ let
     .overrideAttrs
       (old: {
         buildCommand = "${old.buildCommand}\n patchShebangs $out";
-        buildInputs = [ pkgs.makeWrapper ];
+        nativeBuildInputs = [ pkgs.makeWrapper ];
         postBuild = ''
           wrapProgram $out/bin/decrypt_k8s_secret --prefix PATH : ${
             lib.makeBinPath [

nix/configuration/roles/latex/default.nix

@@ -5,22 +5,6 @@
   ...
 }:
 
-let
-  tex = (
-    pkgs.texlive.combine {
-      inherit (pkgs.texlive)
-        scheme-basic
-        dvisvgm
-        dvipng # for preview and export as html in org-mode
-        wrapfig
-        amsmath
-        ulem
-        hyperref
-        capt-of
-        ;
-    }
-  );
-in
 {
   imports = [ ];
 
@@ -40,6 +24,35 @@ in
           tex
         ];
       }
+      {
+        nixpkgs.overlays = [
+          (final: prev: {
+            tex = (
+              pkgs.texlive.combine {
+                inherit (pkgs.texlive)
+                  scheme-basic
+                  dvisvgm
+                  dvipng # for preview and export as html in org-mode
+                  wrapfig
+                  amsmath
+                  ulem
+                  hyperref
+                  capt-of
+                  svg # emacs org-mode pdf export
+                  catchfile # emacs org-mode pdf export
+                  xcolor # emacs org-mode pdf export
+                  transparent # emacs org-mode pdf export
+                  pgf # emacs org-mode pdf export
+                  minted # emacs org-mode pdf export code block highlighting
+                  upquote # emacs org-mode pdf export
+                  lineno # emacs org-mode pdf export
+                  ;
+              }
+            );
+          })
+        ];
+
+      }
     ]
   );
 }

nix/configuration/roles/lvfs/default.nix

@@ -20,8 +20,8 @@
   config = lib.mkIf config.me.lvfs.enable (
     lib.mkMerge [
       {
-        # TODO: Is this installing firmware or just downloading it? Is this needed?
+        # TODO: Is this installing firmware or just downloading it?
-        # services.fwupd.enable = true;
+        services.fwupd.enable = true;
         environment.persistence."/persist" = lib.mkIf (!config.me.buildingIso) {
           hideMounts = true;
           directories = [

nix/configuration/roles/media/default.nix

@@ -28,7 +28,7 @@ in
       type = lib.types.bool;
       default = false;
       example = true;
-      description = "Whether we want to install media.";
+      description = "Whether we want to install media utilities.";
     };
   };
 
@@ -39,6 +39,8 @@ in
           ffmpeg
           libva-utils # for vainfo
           vdpauinfo
+          mkvtoolnix-cli # for mkvmerge
+          yt-dlp
         ];
       }
       (lib.mkIf config.me.graphical {
@@ -50,10 +52,8 @@ in
           imv
         ];
 
-        home-manager.users.talexander =
+        me.install.user.talexander.file = {
-          { pkgs, ... }:
+          ".config/mpv/mpv.conf" = {
-          {
-            home.file.".config/mpv/mpv.conf" = {
             source = ./files/mpv.conf;
           };
         };

nix/configuration/roles/media/files/cast_file_vaapi

@@ -6,6 +6,7 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 : ${VIDEO_BITRATE:="1M"} # Only for encoding modes targeting bitrate
 : ${AUDIO_BITRATE:="192k"}
+: ${SPEED:="1"}
 
 ############## Setup #########################
 
@@ -62,6 +63,8 @@ function copy {
         "rtsp://$USERNAME:$PASSWORD@172.16.16.251:8554/fetch"
 }
 
+# benchmark vulkan decode:
+# ffmpeg -init_hw_device "vulkan=vk:0" -hwaccel vulkan -hwaccel_output_format vulkan -i INPUT -f null - -benchmark
 function convert {
     local args=()
     local acceleration_type="$1" # "software" or "hardware"
@@ -99,11 +102,23 @@ function convert {
     if [ "$acceleration_type" == "software" ]; then
         true
     elif [ "$acceleration_type" == "hardware" ]; then
+        if [ "$codec" == "h264" ]; then
+            args+=(-init_hw_device vulkan)
+        elif [ "$codec" == "av1" ]; then
             args+=(-vaapi_device /dev/dri/renderD128)
         fi
+    fi
 
     args+=(-i "$file_to_cast")
 
+    if [ "$SPEED" != "1" ]; then
+        local audio_speed video_speed
+        video_speed=$(bc -l <<< "1/${SPEED}")
+        audio_speed=$(bc -l <<< "${SPEED}/1")
+        args+=(-filter:v "setpts=${video_speed}*PTS")
+        args+=(-filter:a "atempo=${audio_speed}")
+    fi
+
     if [ "$codec" == "h264" ]; then
         if [ "$acceleration_type" == "software" ]; then
             args+=(-c:v h264)
@@ -111,7 +126,7 @@ function convert {
             args+=(-b:v "$VIDEO_BITRATE")
         elif [ "$acceleration_type" == "hardware" ]; then
             args+=(-vf 'format=nv12|vaapi,hwupload')
-            args+=(-c:v h264_vaapi)
+            args+=(-c:v h264_vulkan)
             args+=(-profile:v high)
             args+=(-b:v "$VIDEO_BITRATE")
         fi
@@ -119,12 +134,14 @@ function convert {
         if [ "$acceleration_type" == "software" ]; then
             args+=(-c:v libsvtav1)
             args+=(-preset 4) # [0-13] default 10, lower = higher quality / slower encode
-            args+=(-crf 20) # [0-63] default 35, lower = higher quality / larger file
+            # args+=(-crf 20) # [0-63] default 35, lower = higher quality / larger file
             # Parameters: https://gitlab.com/AOMediaCodec/SVT-AV1/-/blob/master/Docs/Parameters.md
             # fast-decode [0-2] default 0 (off), higher = faster decode
             # tune [0-2] default 1, Specifies whether to use PSNR or VQ as the tuning metric [0 = VQ, 1 = PSNR, 2 = SSIM]
             # film-grain-denoise, setting to 0 uses the original frames instead of denoising the film grain
-            args+=(-svtav1-params "fast-decode=1:film-grain-denoise=0")
+            # rc 1 = vbr 2 = cbr
+            # tbr = average bitrate
+            args+=(-svtav1-params "fast-decode=1:film-grain-denoise=0:tbr=${VIDEO_BITRATE}:rc=1:passes=2")
         elif [ "$acceleration_type" == "hardware" ]; then
             # -c:v av1_amf -quality quality
             args+=(-vf 'format=nv12|vaapi,hwupload')
@@ -206,32 +223,4 @@ function encode_webcam {
         "rtsp://$USERNAME:$PASSWORD@172.16.16.251:8554/fetch"
 }
 
-function speed_up_preprocess_vp8 {
-    local file_to_cast file_to_save
-    file_to_cast="$1"
-    file_to_save="$2"
-
-    set -x
-
-    # -bf 0 :: Disable b-frames because webrtc doesn't support h264 streams with b-frames.
-    # -strict -2 :: Enable support for experimental codecs like opus.
-    # -b:v 2M :: Target 2 megabit/s
-    # -crf 10 :: Target a quality level and adjust bitrate accordingly. This should be preferred, but ideally both should be used.
-    # Could also use -filter_complex "[0:v]setpts=0.5*PTS[v];[0:a]atempo=2.0[a]" -map "[v]" -map "[a]"
-    </dev/null exec ffmpeg \
-               -i "$file_to_cast" \
-               -filter:v "setpts=0.66666666*PTS" \
-               -filter:a "atempo=1.5" \
-               -c:v vp8 \
-               -b:v 2M \
-               -crf 10 \
-               -bf 0 \
-               -c:a opus \
-               -b:a 320k \
-               -ar 48000 \
-               -strict -2 \
-               "$file_to_save"
-}
-
-
 main "${@}"

nix/configuration/roles/memtest86/default.nix

@@ -8,10 +8,14 @@
 {
   imports = [ ];
   config = lib.mkMerge [
-    { }
+    {
-    (lib.mkIf (config.me.buildingIso) {
+      environment.systemPackages = with pkgs; [
-      # boot.loader.systemd-boot.memtest86.enable = true;
+        memtest86plus
-      boot.loader.grub.memtest86.enable = true;
+      ];
-    })
+    }
+    # (lib.mkIf (config.me.buildingIso) {
+    #   boot.loader.systemd-boot.memtest86.enable = true;
+    #   boot.loader.grub.memtest86.enable = true;
+    # })
   ];
 }

nix/configuration/roles/network/default.nix

@@ -2,6 +2,7 @@
   config,
   lib,
   pkgs,
+  pkgs-dda3dcd3f,
   ...
 }:
 
@@ -18,8 +19,8 @@
 {
   imports = [ ];
 
-  networking.dhcpcd.enable = false;
+  networking.dhcpcd.enable = lib.mkDefault false;
-  networking.useDHCP = false;
+  networking.useDHCP = lib.mkDefault false;
   networking.nameservers = [
     "194.242.2.2#doh.mullvad.net"
     "2a07:e340::2#doh.mullvad.net"
@@ -64,6 +65,7 @@
     ldns # for drill
     arp-scan # To find devices on the network
     wavemon
+    dhcpcd # For Android USB tethering.
   ];
 
   boot.extraModprobeConfig = ''
@@ -91,4 +93,13 @@
     # This is enabled by default in nixos.
     # "net.ipv6.conf.default.use_tempaddr" = 2;
   };
+
+  # nixpkgs.overlays = [
+  #   (final: prev: {
+  #     inherit (pkgs-dda3dcd3f)
+  #       linux-firmware
+  #       ;
+  #   })
+  # ];
+
 }

nix/configuration/roles/optimized_build/default.nix

@@ -0,0 +1,175 @@
+{
+  config,
+  lib,
+  pkgs,
+  pkgs-unoptimized,
+  ...
+}:
+
+{
+  imports = [ ];
+
+  options.me = {
+    optimizations.enable = lib.mkOption {
+      type = lib.types.bool;
+      default = false;
+      example = true;
+      description = "Whether we want to enable CPU optimizations (will trigger a rebuild from source).";
+    };
+
+    optimizations.arch = lib.mkOption {
+      type = lib.types.str;
+      default = null;
+      example = "znver4";
+      description = "The CPU arch for which programs should be optimized.";
+    };
+
+    optimizations.system_features = lib.mkOption {
+      type = lib.types.listOf lib.types.str;
+      default = [ ];
+      example = [
+        "gccarch-znver4"
+        "gccarch-znver5"
+        "gccarch-skylake"
+        # "gccarch-alderlake" missing WAITPKG
+        "gccarch-x86-64-v3"
+        "gccarch-x86-64-v4"
+        "benchmark"
+        "big-parallel"
+        "kvm"
+        "nixos-test"
+      ];
+      description = "The list of CPU features that should be enabled on this machine.";
+    };
+  };
+
+  config = lib.mkMerge [
+    (lib.mkIf (!config.me.optimizations.enable) (
+      lib.mkMerge [
+        {
+          boot.kernelPackages = pkgs.linuxPackagesFor pkgs.linux_6_16;
+        }
+      ]
+    ))
+    (lib.mkIf config.me.optimizations.enable (
+      lib.mkMerge [
+        {
+          boot.kernelPackages = pkgs.linuxPackagesFor pkgs.linux_me;
+
+          nixpkgs.hostPlatform = {
+            gcc.arch = config.me.optimizations.arch;
+            gcc.tune = config.me.optimizations.arch;
+            system = "x86_64-linux";
+          };
+
+          # Uncomment on of these to enable cross compiling:
+          # nixpkgs.buildPlatform = builtins.currentSystem;
+          # nixpkgs.buildPlatform = {
+          #   gcc.arch = "znver4";
+          #   gcc.tune = "znver4";
+          #   system = "x86_64-linux";
+          # };
+
+          nixpkgs.overlays = [
+            (
+              final: prev:
+              let
+                addConfig =
+                  additionalConfig: pkg:
+                  pkg.override (oldconfig: {
+                    structuredExtraConfig = pkg.structuredExtraConfig // additionalConfig;
+                  });
+              in
+              {
+                linux_me = addConfig {
+                  # Full preemption
+                  PREEMPT = lib.mkOverride 60 lib.kernel.yes;
+                  PREEMPT_VOLUNTARY = lib.mkOverride 60 lib.kernel.no;
+
+                  # Google's BBRv3 TCP congestion Control
+                  TCP_CONG_BBR = lib.kernel.yes;
+                  DEFAULT_BBR = lib.kernel.yes;
+
+                  # Preemptive Full Tickless Kernel at 300Hz
+                  HZ = lib.kernel.freeform "300";
+                  HZ_300 = lib.kernel.yes;
+                  HZ_1000 = lib.kernel.no;
+                } prev.linux_6_16;
+              }
+            )
+            (final: prev: {
+              haskellPackages = prev.haskellPackages.extend (
+                final': prev': {
+                  inherit (pkgs-unoptimized.haskellPackages)
+                    crypto-token
+                    crypton
+                    crypton-connection
+                    crypton-x509
+                    crypton-x509-store
+                    crypton-x509-system
+                    crypton-x509-validation
+                    hspec-wai
+                    http-client-tls
+                    http2
+                    pandoc
+                    pandoc-cli
+                    pandoc-lua-engine
+                    pandoc-server
+                    servant-server
+                    tls
+                    tls-session-manager
+                    wai-app-static
+                    wai-extra
+                    warp
+                    warp-tls
+                    ;
+                }
+              );
+            })
+            # (final: prev: {
+            #   python = prev.python.override {
+            #     packageOverrides = python-final: python-prev: {
+            #       inherit (pkgs-unoptimized.pythonPackages) coverage;
+            #     };
+            #   };
+            # })
+            # (final: prev: {
+            #   pythonPackagesOverlays = prev.pythonPackagesOverlays.extend (
+            #     final': prev': {
+            #       inherit (pkgs-unoptimized.pythonPackagesOverlays)
+            #         coverage
+            #         ;
+            #     }
+            #   );
+            # })
+            # (final: prev: {
+            #   pythonPackagesExtensions = prev.pythonPackagesExtensions ++ [
+            #     (python-final: python-prev: {
+            #       inherit (pkgs-unoptimized.pythonPackages) coverage;
+            #     })
+            #   ];
+            # })
+            (final: prev: {
+              inherit (pkgs-unoptimized)
+                gsl
+                redis
+                valkey
+                nix-serve-ng
+                rapidjson
+                assimp
+                ;
+            })
+          ];
+        }
+      ]
+    ))
+    (lib.mkIf (config.me.optimizations.system_features != [ ]) (
+      lib.mkMerge [
+        {
+          nix.settings.system-features = lib.mkForce config.me.optimizations.system_features;
+        }
+      ]
+    ))
+
+  ];
+}

nix/configuration/roles/pcsx2/default.nix

@@ -82,10 +82,8 @@
           };
         };
 
-        home-manager.users.talexander =
+        me.install.user.talexander.file = {
-          { pkgs, ... }:
+          ".config/PCSX2/inis/PCSX2.ini" = {
-          {
-            home.file.".config/PCSX2/inis/PCSX2.ini" = {
             source = ./files/PCSX2.ini;
           };
         };

nix/configuration/roles/python/default.nix

@@ -32,6 +32,21 @@
           isort
           black
         ];
+
+        environment.persistence."/state" = lib.mkIf (!config.me.buildingIso) {
+          hideMounts = true;
+          users.talexander = {
+            directories = [
+              {
+                # Poetry virtual environments.
+                directory = ".cache/pypoetry";
+                user = "talexander";
+                group = "talexander";
+                mode = "0755";
+              }
+            ];
+          };
+        };
       }
     ]
   );

nix/configuration/roles/rpcs3/default.nix

@@ -0,0 +1,186 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+
+let
+  rpcs3_config_yaml = settingsFormat.generate "config.yml" config.me.rpcs3.config;
+  settingsFormat = pkgs.formats.yaml { };
+in
+{
+  imports = [ ];
+
+  options.me = {
+    rpcs3.enable = lib.mkOption {
+      type = lib.types.bool;
+      default = false;
+      example = true;
+      description = "Whether we want to install rpcs3.";
+    };
+
+    rpcs3.config = lib.mkOption rec {
+      apply = lib.recursiveUpdate default;
+      inherit (settingsFormat) type;
+      default = {
+        Core = {
+          "Use LLVM CPU" = lib.mkIf (config.me.optimizations.enable) config.me.optimizations.arch;
+        };
+        VFS = {
+          "Enable /host_root/" = false;
+        };
+        Video = {
+          "Write Color Buffers" = true;
+          VSync = true;
+          "Performance Overlay" = {
+            Enabled = false;
+          };
+        };
+        Miscellaneous = {
+          "Pause emulation on RPCS3 focus loss" = true;
+          "Start games in fullscreen mode" = true;
+          "Pause Emulation During Home Menu" = false; # true makes the home menu slow
+        };
+      };
+      example = null;
+      description = "RPCS3's config.yml in nix form.";
+    };
+  };
+
+  config = lib.mkIf config.me.rpcs3.enable (
+    lib.mkMerge [
+      (lib.mkIf config.me.graphical {
+        environment.systemPackages = with pkgs; [
+          rpcs3
+        ];
+
+        security.pam.loginLimits = [
+          {
+            domain = "@wheel";
+            item = "memlock";
+            type = "hard";
+            value = "unlimited";
+          }
+          {
+            domain = "@wheel";
+            item = "memlock";
+            type = "soft";
+            value = "unlimited";
+          }
+        ];
+
+        me.install.user.talexander.file = {
+          ".config/rpcs3/config.yml" = lib.mkIf (config.me.rpcs3.config != null) {
+            source = rpcs3_config_yaml;
+          };
+          ".config/rpcs3/GuiConfigs/CurrentSettings.ini" = {
+            source = ./files/CurrentSettings.ini;
+          };
+          ".config/rpcs3/custom_configs/config_BLUS30443.yml" = {
+            # Demon's Souls per-game config.
+            source = ./files/config_BLUS30443.yml;
+          };
+          ".config/rpcs3/patches/patch.yml" = {
+            # All of the available patches.
+            source = ./files/patch.yml;
+          };
+          ".config/rpcs3/patch_config.yml" = {
+            # Patches that I have enabled.
+            source = ./files/patch_config.yml;
+          };
+        };
+
+        environment.persistence."/persist" = lib.mkIf (!config.me.buildingIso) {
+          hideMounts = true;
+          users.talexander = {
+            directories = [
+              {
+                # Location of ROMs.
+                directory = ".config/rpcs3/games";
+                user = "talexander";
+                group = "talexander";
+                mode = "0755";
+              }
+              {
+                directory = ".config/rpcs3/dev_hdd0";
+                user = "talexander";
+                group = "talexander";
+                mode = "0755";
+              }
+              {
+                directory = ".config/rpcs3/dev_hdd1";
+                user = "talexander";
+                group = "talexander";
+                mode = "0755";
+              }
+              {
+                directory = ".config/rpcs3/savestates";
+                user = "talexander";
+                group = "talexander";
+                mode = "0755";
+              }
+              {
+                directory = ".config/rpcs3/dev_usb000";
+                user = "talexander";
+                group = "talexander";
+                mode = "0755";
+              }
+              {
+                # Seems to be where the firmware is installed.
+                directory = ".config/rpcs3/dev_flash";
+                user = "talexander";
+                group = "talexander";
+                mode = "0755";
+              }
+              {
+                # Controller config.
+                directory = ".config/rpcs3/input_configs";
+                user = "talexander";
+                group = "talexander";
+                mode = "0755";
+              }
+              {
+                # Game icons.
+                directory = ".config/rpcs3/Icons";
+                user = "talexander";
+                group = "talexander";
+                mode = "0755";
+              }
+            ];
+            files = [
+              {
+                # play times and recently played
+                file = ".config/rpcs3/GuiConfigs/persistent_settings.dat";
+                parentDirectory = {
+                  mode = "0755";
+                };
+              }
+              {
+                # Netplay (RPCN) config and credentials
+                file = ".config/rpcs3/rpcn.yml";
+                parentDirectory = {
+                  mode = "0755";
+                };
+              }
+            ];
+          };
+        };
+
+        environment.persistence."/state" = lib.mkIf (!config.me.buildingIso) {
+          hideMounts = true;
+          users.talexander = {
+            directories = [
+              {
+                directory = ".cache/rpcs3";
+                user = "talexander";
+                group = "talexander";
+                mode = "0755";
+              }
+            ];
+          };
+        };
+      })
+    ]
+  );
+}

nix/configuration/roles/rpcs3/files/CurrentSettings.ini

@@ -0,0 +1,5 @@
+[Meta]
+currentStylesheet=Darker Style by TheMitoSan
+
+[main_window]
+infoBoxEnabledWelcome=false

nix/configuration/roles/rpcs3/files/config_BLUS30443.yml

@@ -0,0 +1,14 @@
+Core:
+  SPU Block Size: Safe
+Video:
+  Write Color Buffers: true
+  Minimum Scalable Dimension: 640
+Net:
+  Internet enabled: Connected
+  IP address: 0.0.0.0
+  Bind address: 0.0.0.0
+  DNS address: 8.8.8.8
+  IP swap list: "ds-eu-c.scej-online.jp=206.189.232.242&&ds-eu-g.scej-online.jp=206.189.232.242&&c.demons-souls.com=206.189.232.242&&g.demons-souls.com=206.189.232.242&&cmnap.scej-online.jp=206.189.232.242&&demons-souls.scej-online.jp=206.189.232.242"
+  UPNP Enabled: false
+  PSN status: RPCN
+  PSN Country: us

nix/configuration/roles/rpcs3/files/patch_config.yml

@@ -0,0 +1,6 @@
+PPU-83681f6110d33442329073b72b8dc88a2f677172:
+  Unlock FPS:
+    Demon's Souls:
+      BLUS30443:
+        01.00:
+          Enabled: true

nix/configuration/roles/rust/default.nix

@@ -48,10 +48,7 @@ in
           # ? cargo-public-api
         ];
 
-        home-manager.users.talexander =
+        me.install.user.talexander.file = {
-          { pkgs, ... }:
-          {
-            home.file = {
           ".cargo/config.toml" = {
             source = ./files/cargo_config.toml;
           };
@@ -59,7 +56,6 @@ in
             source = ./files/rustup_settings.toml;
           };
         };
-          };
 
         environment.persistence."/state" = lib.mkIf (!config.me.buildingIso) {
           hideMounts = true;
@@ -131,7 +127,7 @@ in
                 ++ [
                   prev.rustup
                 ];
-              buildInputs = [ pkgs.makeWrapper ];
+              nativeBuildInputs = [ pkgs.makeWrapper ];
             };
           })
         ];

nix/configuration/roles/rust/files/cargo_config.toml

@@ -1,12 +1,12 @@
-[target.x86_64-unknown-linux-gnu]
+# [target.x86_64-unknown-linux-gnu]
-rustflags = ["-C", "target-cpu=native", "-Zthreads=0"]
+# rustflags = ["-C", "target-cpu=native", "-Zthreads=0"]
 
-[unstable]
+# [unstable]
-codegen-backend = true
+# codegen-backend = true
 
-[profile.dev]
+# [profile.dev]
-codegen-backend = "cranelift"
+# codegen-backend = "cranelift"
 
 [profile.dev.package."*"]
-codegen-backend = "llvm"
+# codegen-backend = "llvm"
 opt-level = 3

nix/configuration/roles/shadps4/default.nix

@@ -0,0 +1,110 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+
+{
+  imports = [ ];
+
+  options.me = {
+    shadps4.enable = lib.mkOption {
+      type = lib.types.bool;
+      default = false;
+      example = true;
+      description = "Whether we want to install shadps4.";
+    };
+  };
+
+  config = lib.mkIf config.me.shadps4.enable (
+    lib.mkMerge [
+      (lib.mkIf config.me.graphical {
+        environment.systemPackages = with pkgs; [
+          shadps4
+        ];
+
+        me.install.user.talexander.file = {
+          ".local/share/shadPS4/config.toml" = {
+            source = ./files/config.toml;
+          };
+        };
+
+        environment.persistence."/persist" = lib.mkIf (!config.me.buildingIso) {
+          hideMounts = true;
+          users.talexander = {
+            directories = [
+              {
+                # Location of ROMs.
+                directory = ".local/share/shadPS4/games";
+                user = "talexander";
+                group = "talexander";
+                mode = "0755";
+              }
+              {
+                # Firmware.
+                directory = ".local/share/shadPS4/sys_modules";
+                user = "talexander";
+                group = "talexander";
+                mode = "0755";
+              }
+              {
+                # Game saves.
+                directory = ".local/share/shadPS4/savedata";
+                user = "talexander";
+                group = "talexander";
+                mode = "0755";
+              }
+              {
+                # DLC.
+                directory = ".local/share/shadPS4/addcont";
+                user = "talexander";
+                group = "talexander";
+                mode = "0755";
+              }
+            ];
+            files = [
+              {
+                # play times and recently played
+                file = ".local/share/shadPS4/play_time.txt";
+                parentDirectory = {
+                  mode = "0755";
+                };
+              }
+            ];
+          };
+        };
+
+        environment.persistence."/state" = lib.mkIf (!config.me.buildingIso) {
+          hideMounts = true;
+          users.talexander = {
+            directories = [
+              {
+                # Cache.
+                directory = ".local/share/shadPS4/data";
+                user = "talexander";
+                group = "talexander";
+                mode = "0755";
+              }
+            ];
+          };
+        };
+
+        nixpkgs.overlays = [
+          (final: prev: {
+            shadps4 = prev.shadps4.overrideAttrs (old: {
+              version = "0.9.0";
+              src = final.fetchFromGitHub {
+                owner = "AzaharPlus";
+                repo = "shadPS4Plus";
+                tag = "SHADPS4PLUS_0_9_0_A";
+                hash = "sha256-ZwP+bOE4roWt51Ii53blDZzdq/SxK4Q69I4rLCNARLA=";
+                fetchSubmodules = true;
+              };
+            });
+          })
+        ];
+      })
+    ]
+  );
+}

nix/configuration/roles/shadps4/files/config.toml

@@ -0,0 +1,15 @@
+[General]
+# Without this, we get:
+# /run/current-system/sw/bin/xdg-mime: line 1002: /nix/store/wd9bigydk9x8bsvnslrvb5klbgmh98v5-hm_mimeapps.list.new: Read-only file system
+enableDiscordRPC = false
+
+
+[GUI]
+addonInstallDir = "/home/talexander/.local/share/shadPS4/addcont"
+installDirs = ["/home/talexander/.local/share/shadPS4/games"]
+installDirsEnabled = [true]
+# Without the geometry settings shadps4 crashes instantly with a floating point error.
+geometry_h = 981
+geometry_w = 748
+geometry_x = 0
+geometry_y = 0

nix/configuration/roles/shikane/default.nix

@@ -36,15 +36,11 @@ in
           exec_shikane
         ];
 
-        home-manager.users.talexander =
+        me.install.user.talexander.file = {
-          { pkgs, ... }:
-          {
-            home.file = {
           ".config/shikane/config.toml" = {
             source = ./files/config.toml;
           };
         };
-          };
       })
     ]
   );

nix/configuration/roles/shikane/files/config.toml

@@ -1,3 +1,15 @@
+[[profile]]
+name = "laptop"
+
+[[profile.output]]
+enable = true
+search = ["m=0x0BCA", "s=", "v=BOE"]
+mode = "2256x1504@59.999Hz"
+position = "0,0"
+scale = 1.5
+transform = "normal"
+adaptive_sync = false
+
 [[profile]]
   name = "homedesk"
   exec = ["notify-send shikane \"Profile $SHIKANE_PROFILE_NAME has been applied\""]

nix/configuration/roles/ssh/default.nix

@@ -27,19 +27,14 @@
     };
   };
 
-  home-manager.users.talexander =
+  me.install.user.root.file = {
-    { pkgs, ... }:
+    ".ssh/config" = {
-    {
-      home.file.".ssh/config" = {
-        source = ./files/ssh_config;
-      };
-    };
-
-  home-manager.users.root =
-    { pkgs, ... }:
-    {
-      home.file.".ssh/config" = {
       source = ./files/ssh_config_root;
     };
   };
+  me.install.user.talexander.file = {
+    ".ssh/config" = {
+      source = ./files/ssh_config;
+    };
+  };
 }

nix/configuration/roles/ssh/files/ssh_config

@@ -34,5 +34,9 @@ Host hydra
   ProxyJump talexander@mrmanager
   HostName 10.215.1.219
 
+Host ionlybootzfs
+  HostName 127.0.0.1
+  Port 60022
+
 Host *
   Compression yes

nix/configuration/roles/sway/default.nix

@@ -376,26 +376,18 @@ in
       };
     };
 
-    home-manager.users.talexander =
+    me.install.user.talexander.file = {
-      { pkgs, ... }:
-      {
-        home.file = {
-          # Configure default programs (for example, default browser)
       ".config/mimeapps.list" = {
+        # Configure default programs (for example, default browser)
         source = ./files/mimeapps.list;
       };
-        };
-        home.file = {
       ".config/gtk-3.0/settings.ini" = {
         source = ./files/settings.ini;
       };
-        };
-        home.file = {
       ".icons/default" = {
         source = "${pkgs.adwaita-icon-theme}/share/icons/Adwaita";
       };
     };
-      };
 
     # For mounting drives in pcmanfm
     services.gvfs.enable = true;

nix/configuration/roles/vscode/default.nix

@@ -22,6 +22,7 @@
       (lib.mkIf config.me.graphical {
         allowedUnfree = [
           "vscode"
+          "vscode-x86_64-unknown-linux-gnu-with-extensions"
           "vscode-with-extensions"
           "vscode-extension-ms-vscode-remote-remote-ssh"
         ];
@@ -33,6 +34,7 @@
               ms-python.python
               ms-azuretools.vscode-docker
               ms-vscode-remote.remote-ssh
+              esbenp.prettier-vscode
             ]
             # ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [
             #   {
@@ -46,13 +48,11 @@
           })
         ];
 
-        home-manager.users.talexander =
+        me.install.user.talexander.file = {
-          { pkgs, ... }:
+          ".config/Code/User/settings.json" = {
-          {
-            home.file.".config/Code/User/settings.json" = {
             source = ./files/settings.json;
           };
-            home.file.".config/Code/User/keybindings.json" = {
+          ".config/Code/User/keybindings.json" = {
             source = ./files/keybindings.json;
           };
         };

nix/configuration/roles/vscode/files/keybindings.json

@@ -20,6 +20,12 @@
         "command": "-workbench.action.navigateBack",
         "when": "canNavigateBack"
     },
+  {
+    // This isn't quite right. In emacs it would go back to the last location you performed an action which could include navigation. This goes back to the place where you last changed the text. Either way, close enough.
+        "key": "ctrl+x ctrl+x",
+        "command": "workbench.action.navigateToLastEditLocation",
+        "when": "canNavigateToLastEditLocation"
+    },
     {
         "key": "shift+alt+/",
         "command": "editor.action.goToReferences",

nix/configuration/roles/vscode/files/settings.json

@@ -18,6 +18,7 @@
   "workbench.editor.showTabs": "none",
   "workbench.activityBar.location": "hidden",
   "window.menuBarVisibility": "toggle",
+  "window.commandCenter": false,
   "explorer.autoReveal": false,
   "[python]": {
     "editor.defaultFormatter": "ms-python.black-formatter",
@@ -31,11 +32,25 @@
     "editor.defaultFormatter": "hashicorp.terraform",
     "editor.formatOnSave": true
   },
+  "[typescript]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode",
+    "editor.formatOnSave": true
+  },
+  "[typescriptreact]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode",
+    "editor.formatOnSave": true
+  },
+  "javascript.autoClosingTags": false,
+  "typescript.autoClosingTags": false,
   "black-formatter.importStrategy": "fromEnvironment",
   "workbench.statusBar.visible": false,
   "git.openRepositoryInParentFolders": "never",
   "files.autoSave": "afterDelay",
   "editor.rulers": [
     100
-  ]
+  ],
+  "workbench.secondarySideBar.defaultVisibility": "hidden",
+  "editor.autoClosingBrackets": "never",
+  "editor.autoSurround": "never",
+  "workbench.editor.navigationScope": "editorGroup"
 }

nix/configuration/roles/wasm/default.nix

@@ -24,7 +24,15 @@
         environment.systemPackages = with pkgs; [
           wabt
           wasm-bindgen-cli
-          pkgs-unoptimized.binaryen # for wasm-opt
+          binaryen # for wasm-opt
+        ];
+
+        nixpkgs.overlays = [
+          (final: prev: {
+            inherit (pkgs-unoptimized)
+              binaryen
+              ;
+          })
         ];
       }
     ]

nix/configuration/roles/waybar/default.nix

@@ -113,10 +113,7 @@ in
 
         services.upower.enable = true; # for battery
 
-        home-manager.users.talexander =
+        me.install.user.talexander.file = {
-          { pkgs, ... }:
-          {
-            home.file = {
           ".config/waybar/config" = {
             source = ./files/waybar_config.json;
           };
@@ -124,7 +121,6 @@ in
             source = ./files/style.css;
           };
         };
-          };
       })
     ]
   );

nix/configuration/roles/zsh/default.nix

@@ -49,6 +49,8 @@ let
 
       source ${pkgs.zsh-histdb}/share/zsh/plugins/zsh-histdb/histdb-interactive.zsh
       bindkey '^r' _histdb-isearch
+
+      ${lib.concatMapStringsSep "\n" (item: "source ${item}") config.me.zsh.includes}
     '';
   };
 in
@@ -62,6 +64,16 @@ in
       example = true;
       description = "Whether we want to install zsh.";
     };
+    zsh.includes = lib.mkOption {
+      type = lib.types.listOf lib.types.package;
+      default = [ ];
+      example = lib.literalExpression ''
+        [ (pkgs.writeTextFile {
+            name = "launch-kanshi.conf";
+            text = "exec kanshi";
+          }) ]'';
+      description = "List of zshrc files to import.";
+    };
   };
 
   config = lib.mkIf config.me.zsh.enable (
@@ -78,10 +90,8 @@ in
           enable = true;
         };
 
-        home-manager.users.talexander =
+        me.install.user.talexander.file = {
-          { pkgs, ... }:
+          ".zshrc" = {
-          {
-            home.file.".zshrc" = {
             source = "${zshrc}";
           };
         };

nix/configuration/util/install_files/default.nix

@@ -0,0 +1,333 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+
+let
+  cfg = config.me.install;
+  inherit (lib)
+    filter
+    attrNames
+    ;
+
+  get_shell_values =
+    target:
+    let
+      homedir = config.users.users."${target.username}".home;
+      group = config.users.users."${target.username}".group;
+    in
+    {
+      source = lib.strings.escapeShellArg "${target.source}";
+      destination = lib.strings.escapeShellArg "${homedir}/${target.target}";
+      mode = lib.strings.escapeShellArg "${target.mode}";
+      dir_mode = lib.strings.escapeShellArg "${target.dir_mode}";
+      username = lib.strings.escapeShellArg "${target.username}";
+      group = lib.strings.escapeShellArg "${group}";
+    };
+  install_user_file =
+    let
+      constructors = {
+        "overwrite" = install_user_file_overwrite;
+        "symlink" = install_user_file_symlink;
+      };
+    in
+    stage: target: (constructors."${target.method}"."${stage}" target);
+  install_user_file_overwrite = {
+    "check" = (target: "");
+    "install" = (
+      target:
+      let
+        inherit (get_shell_values target)
+          source
+          destination
+          mode
+          dir_mode
+          username
+          group
+          ;
+        flags = lib.strings.concatStringsSep " " [
+          (if mode != "" then "-m ${mode}" else "")
+          (if username != "" then "-o ${username}" else "")
+          (if group != "" then "-g ${group}" else "")
+        ];
+        dir_flags = lib.strings.concatStringsSep " " [
+          (if dir_mode != "" then "-m ${dir_mode}" else "")
+          (if username != "" then "-o ${username}" else "")
+          (if group != "" then "-g ${group}" else "")
+        ];
+      in
+      if target.recursive then
+        [
+          ''
+            find ${source} -type f -print0 | while read -r -d "" file; do
+                relative_path=$(realpath -s --relative-to ${source} "$file")
+                full_dest=${destination}/"$relative_path"
+                create_containing_directories "$full_dest" ${dir_flags}
+                $DRY_RUN_CMD install $VERBOSE_ARG --compare ${flags} "$file" "$full_dest"
+            done
+          ''
+        ]
+      else
+        [
+          ''
+            create_containing_directories ${destination} ${dir_flags}
+            $DRY_RUN_CMD install $VERBOSE_ARG --compare ${flags} ${source} ${destination}
+          ''
+        ]
+    );
+    "uninstall" = (
+      target:
+      let
+        inherit (get_shell_values target)
+          source
+          destination
+          ;
+      in
+      if target.recursive then
+        [
+          ''
+            find ${source} -type f -print0 | while read -r -d "" file; do
+                relative_path=$(realpath -s --relative-to ${source} "$file")
+                full_dest=${destination}/"$relative_path"
+                $DRY_RUN_CMD echo rm -f "$full_dest"
+            done
+          ''
+        ]
+      else
+        [
+          ''
+            $DRY_RUN_CMD echo rm -f ${destination}
+          ''
+        ]
+    );
+  };
+  install_user_file_symlink = {
+    "check" = (target: "");
+    "install" = (
+      target:
+      let
+        inherit (get_shell_values target)
+          source
+          destination
+          mode
+          dir_mode
+          username
+          group
+          ;
+        owner = lib.strings.concatStringsSep ":" (
+          filter (val: val != "") [
+            username
+            group
+          ]
+        );
+        dir_flags = lib.strings.concatStringsSep " " [
+          (if dir_mode != "" then "-m ${dir_mode}" else "")
+          (if username != "" then "-o ${username}" else "")
+          (if group != "" then "-g ${group}" else "")
+        ];
+      in
+      if target.recursive then
+        [
+          ''
+            find ${source} -type f -print0 | while read -r -d "" file; do
+                relative_path=$(realpath -s --relative-to ${source} "$file")
+                full_dest=${destination}/"$relative_path"
+                create_containing_directories "$full_dest" ${dir_flags}
+                $DRY_RUN_CMD ln $VERBOSE_ARG -s "$file" "$full_dest"
+                $DRY_RUN_CMD chown $VERBOSE_ARG -h ${owner} "$full_dest"
+            done
+          ''
+        ]
+      else
+        [
+          ''
+            create_containing_directories ${destination} ${dir_flags}
+            $DRY_RUN_CMD ln $VERBOSE_ARG -s ${source} ${destination}
+            $DRY_RUN_CMD chown $VERBOSE_ARG -h ${owner} ${destination}
+          ''
+        ]
+    );
+    "uninstall" = (
+      target:
+      let
+        inherit (get_shell_values target)
+          source
+          destination
+          ;
+      in
+      if target.recursive then
+        [
+          ''
+            find ${source} -type f -print0 | while read -r -d "" file; do
+                relative_path=$(realpath -s --relative-to ${source} "$file")
+                full_dest=${destination}/"$relative_path"
+                $DRY_RUN_CMD echo rm -f "$full_dest"
+            done
+          ''
+        ]
+      else
+        [
+          ''
+            $DRY_RUN_CMD echo rm -f ${destination}
+          ''
+        ]
+    );
+  };
+in
+{
+  imports = [ ];
+
+  options.me.install = {
+    user = lib.mkOption {
+      type = lib.types.attrsOf (
+        lib.types.submodule (
+          { name, config, ... }:
+          let
+            username = name;
+          in
+          {
+            options = {
+              enable = lib.mkOption {
+                type = lib.types.bool;
+                default = true;
+                defaultText = "enable";
+                example = lib.literalExpression false;
+                description = "Whether we want to install files in this user's home directory.";
+              };
+
+              file = lib.mkOption {
+                type = lib.types.attrsOf (
+                  lib.types.submodule (
+                    { name, config, ... }:
+                    let
+                      path = name;
+                    in
+                    {
+                      options = {
+                        enable = lib.mkOption {
+                          type = lib.types.bool;
+                          default = true;
+                          defaultText = "enable";
+                          example = lib.literalExpression false;
+                          description = "Whether we want to install this file in this user's home directory.";
+                        };
+                        username = lib.mkOption {
+                          type = lib.types.str;
+                          defaultText = "username";
+                          example = "root";
+                          description = "The username for the user whose home directory will contain the file.";
+                        };
+                        target = lib.mkOption {
+                          type = lib.types.str;
+                          defaultText = "target";
+                          example = ".local/share/foo/bar.txt";
+                          description = "The path where the file should be written.";
+                        };
+                        method = lib.mkOption {
+                          type = lib.types.enum [
+                            "symlink"
+                            "overwrite"
+                            # "bind_mount" TODO: for directories?
+                          ];
+                          default = "symlink";
+                          defaultText = "me.install.file.‹path›.method";
+                          example = "overwrite";
+                          description = "The way in which the file should be installed.";
+                        };
+                        mode = lib.mkOption {
+                          type = lib.types.str;
+                          default = "0444";
+                          defaultText = "me.install.file.‹path›.mode";
+                          example = "0750";
+                          description = "The read, write, execute permission flags.";
+                        };
+                        dir_mode = lib.mkOption {
+                          type = lib.types.str;
+                          default = "0755";
+                          defaultText = "dir_mode";
+                          example = "0755";
+                          description = "The read, write, execute permission flags for any parent directories that need to be created.";
+                        };
+                        source = lib.mkOption {
+                          type = lib.types.path;
+                          defaultText = "me.install.file.‹path›.source";
+                          example = ./files/foo.txt;
+                          description = "The source file to install into the destination.";
+                        };
+                        recursive = lib.mkOption {
+                          type = lib.types.bool;
+                          default = false;
+                          defaultText = "recursive";
+                          example = lib.literalExpression false;
+                          description = "Whether we want to recurse through the directory doing individual installs for each file.";
+                        };
+                      };
+
+                      config = {
+                        username = lib.mkDefault username;
+                        target = lib.mkDefault path;
+                      };
+                    }
+                  )
+                );
+              };
+            };
+          }
+        )
+      );
+    };
+  };
+
+  config =
+    let
+      all_users = builtins.map (username: cfg.user."${username}") (attrNames cfg.user);
+      enabled_users = filter (user: user.enable) all_users;
+      all_file_targets = lib.flatten (
+        builtins.map (user: (builtins.map (path: user.file."${path}") (attrNames user.file))) enabled_users
+      );
+      enabled_file_targets = filter (target: target.enable) all_file_targets;
+      check_commands = lib.flatten (builtins.map (install_user_file "check") enabled_file_targets);
+      install_commands = lib.flatten (builtins.map (install_user_file "install") enabled_file_targets);
+      uninstall_commands = lib.flatten (
+        builtins.map (install_user_file "uninstall") enabled_file_targets
+      );
+    in
+    {
+      systemd.services.me-install-file = {
+        enable = true;
+        description = "me-install-file";
+        wantedBy = [ "multi-user.target" ];
+        wants = [ "multi-user.target" ];
+        before = [ "multi-user.target" ];
+        # path = with pkgs; [
+        #   zfs
+        # ];
+        unitConfig.DefaultDependencies = "no";
+        serviceConfig = {
+          Type = "oneshot";
+          RemainAfterExit = "yes";
+        };
+        script =
+          ''
+            set -o pipefail
+            IFS=$'\n\t'
+            source ${./files/lib.bash}
+          ''
+          + (lib.strings.concatStringsSep "\n" (
+            [
+            ]
+            ++ check_commands
+            ++ install_commands
+          ));
+        preStop =
+          ''
+            set -o pipefail
+            IFS=$'\n\t'
+            source ${./files/lib.bash}
+          ''
+          + (lib.strings.concatStringsSep "\n" uninstall_commands);
+      };
+    };
+}

nix/configuration/util/install_files/files/lib.bash

@@ -0,0 +1,38 @@
+#!/usr/bin/env bash
+#
+
+############## Setup #########################
+
+function die {
+    local status_code="$1"
+    shift
+    (>&2 echo "${@}")
+    exit "$status_code"
+}
+
+function log {
+    (>&2 echo "${@}")
+}
+
+############## Program #########################
+
+function create_containing_directories {
+    local full_dest="$1"
+    shift 1
+    local dirs_to_create=()
+    local containing_directory="$full_dest"
+    while true; do
+        containing_directory=$(dirname "$containing_directory")
+        if [ -e "$containing_directory" ] || [ "$containing_directory" = "/" ]; then
+            break
+        fi
+        dirs_to_create+=($containing_directory)
+    done
+
+    for (( idx=${#dirs_to_create[@]}-1 ; idx>=0 ; idx-- )) ; do
+        local containing_directory="${dirs_to_create[idx]}"
+        log "Creating $containing_directory"
+        $DRY_RUN_CMD install $VERBOSE_ARG -d "${@}" "$containing_directory"
+    done
+
+}