Add support for setting the group owning the file.

ansible/roles/base/files/gitconfig_home

@@ -8,7 +8,6 @@
 	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,7 +8,6 @@
 	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,6 +2,7 @@
   config,
   lib,
   pkgs,
+  home-manager,
   ...
 }:
 
@@ -9,15 +10,12 @@
   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
@@ -49,19 +47,16 @@
     ./roles/nvme
     ./roles/optimized_build
     ./roles/pcsx2
-    ./roles/podman
     ./roles/python
     ./roles/qemu
     ./roles/reset
     ./roles/rpcs3
     ./roles/rust
-    ./roles/shadps4
     ./roles/shikane
     ./roles/shipwright
     ./roles/sm64ex
     ./roles/sops
     ./roles/sound
-    ./roles/spaghettikart
     ./roles/ssh
     ./roles/steam
     ./roles/steam_run_free
@@ -81,6 +76,10 @@
     ./util/unfree_polyfill
   ];
 
+  me.install.user.talexander.file."/home/talexander/flake.nix" = {
+    source = ./flake.nix;
+  };
+
   nix.settings.experimental-features = [
     "nix-command"
     "flakes"
@@ -126,14 +125,27 @@
     ];
   };
   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;
-    persistent = true;
+    randomizedDelaySec = "14m";
-    dates = "monthly";
-    # randomizedDelaySec = "14m";
     options = "--delete-older-than 30d";
   };
   nix.settings.auto-optimise-store = !config.me.buildingIso;
@@ -162,7 +174,7 @@
     pciutils # for lspci
     ripgrep
     strace
-    # ltrace # Disabled because it uses more than 48GB of /tmp space during test phase.
+    ltrace
     trace-cmd # ftrace
     tcpdump
     git-crypt

nix/configuration/flake.lock

@@ -39,11 +39,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1756733629,
+        "lastModified": 1746729224,
-        "narHash": "sha256-dwWGlDhcO5SMIvMSTB4mjQ5Pvo2vtxvpIknhVnSz2I8=",
+        "narHash": "sha256-9R4sOLAK1w3Bq54H3XOJogdc7a6C2bLLmatOQ+5pf5w=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "a5c4f2ab72e3d1ab43e3e65aa421c6f2bd2e12a1",
+        "rev": "85555d27ded84604ad6657ecca255a03fd878607",
         "type": "github"
       },
       "original": {
@@ -147,6 +147,26 @@
         "type": "github"
       }
     },
+    "home-manager": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1746981801,
+        "narHash": "sha256-+Bfr0KqZV6gZdA7e2kupeoawozaLIHLuiPtC54uxbFc=",
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "rev": "ff915842e4a2e63c4c8c5c08c6870b9d5b3c3ee9",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "type": "github"
+      }
+    },
     "impermanence": {
       "locked": {
         "lastModified": 1737831083,
@@ -189,22 +209,6 @@
       }
     },
     "nixpkgs": {
-      "locked": {
-        "lastModified": 1756787288,
-        "narHash": "sha256-rw/PHa1cqiePdBxhF66V7R+WAP8WekQ0mCDG4CFqT8Y=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "d0fc30899600b9b3466ddb260fd83deb486c32f1",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs-dda3dcd3f": {
       "locked": {
         "lastModified": 1746663147,
         "narHash": "sha256-Ua0drDHawlzNqJnclTJGf87dBmaO/tn7iZ+TCkTRpRc=",
@@ -215,8 +219,24 @@
       },
       "original": {
         "owner": "NixOS",
+        "ref": "nixos-unstable",
         "repo": "nixpkgs",
-        "rev": "dda3dcd3fe03e991015e9a74b22d35950f264a54",
+        "type": "github"
+      }
+    },
+    "nixpkgs-b93b4e9b5": {
+      "locked": {
+        "lastModified": 1713721570,
+        "narHash": "sha256-R0s+O5UjTePQRb72XPgtkTmEiOOW8n+1q9Gxt/OJnKU=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "b93b4e9b527904aadf52dba6ca35efde2067cbd4",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "b93b4e9b527904aadf52dba6ca35efde2067cbd4",
         "type": "github"
       }
     },
@@ -238,11 +258,11 @@
     },
     "nixpkgs-unoptimized": {
       "locked": {
-        "lastModified": 1756787288,
+        "lastModified": 1746663147,
-        "narHash": "sha256-rw/PHa1cqiePdBxhF66V7R+WAP8WekQ0mCDG4CFqT8Y=",
+        "narHash": "sha256-Ua0drDHawlzNqJnclTJGf87dBmaO/tn7iZ+TCkTRpRc=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "d0fc30899600b9b3466ddb260fd83deb486c32f1",
+        "rev": "dda3dcd3fe03e991015e9a74b22d35950f264a54",
         "type": "github"
       },
       "original": {
@@ -283,10 +303,11 @@
       "inputs": {
         "ansible-sshjail": "ansible-sshjail",
         "disko": "disko",
+        "home-manager": "home-manager",
         "impermanence": "impermanence",
         "lanzaboote": "lanzaboote",
         "nixpkgs": "nixpkgs",
-        "nixpkgs-dda3dcd3f": "nixpkgs-dda3dcd3f",
+        "nixpkgs-b93b4e9b5": "nixpkgs-b93b4e9b5",
         "nixpkgs-unoptimized": "nixpkgs-unoptimized",
         "zsh-histdb": "zsh-histdb"
       }

nix/configuration/flake.nix

@@ -43,8 +43,10 @@
   inputs = {
     impermanence.url = "github:nix-community/impermanence";
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
-    nixpkgs-dda3dcd3f.url = "github:NixOS/nixpkgs/dda3dcd3fe03e991015e9a74b22d35950f264a54";
+    nixpkgs-b93b4e9b5.url = "github:NixOS/nixpkgs/b93b4e9b527904aadf52dba6ca35efde2067cbd4";
     nixpkgs-unoptimized.url = "github:NixOS/nixpkgs/nixos-unstable";
+    home-manager.url = "github:nix-community/home-manager";
+    home-manager.inputs.nixpkgs.follows = "nixpkgs";
     lanzaboote = {
       url = "github:nix-community/lanzaboote/v0.4.2";
 
@@ -74,8 +76,9 @@
       self,
       nixpkgs,
       nixpkgs-unoptimized,
-      nixpkgs-dda3dcd3f,
+      nixpkgs-b93b4e9b5,
       impermanence,
+      home-manager,
       lanzaboote,
       zsh-histdb,
       ansible-sshjail,
@@ -85,7 +88,7 @@
       base_x86_64_linux = rec {
         system = "x86_64-linux";
         specialArgs = {
-          pkgs-dda3dcd3f = import nixpkgs-dda3dcd3f {
+          pkgs-b93b4e9b5 = import nixpkgs-b93b4e9b5 {
             inherit system;
           };
           pkgs-unoptimized = import nixpkgs-unoptimized {
@@ -96,8 +99,13 @@
         };
         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

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" --log-format internal-json -v "${@}" |& nom --json
+nixos-rebuild boot --flake "$DIR/../../#hydra" --target-host "$TARGET" --build-host "$TARGET" --fast --use-remote-sudo --max-jobs "$JOBS" "${@}" |& nom
 
 # rsync -av --progress --delete --exclude=.git "$DIR/../../../configuration" "talexander@${TARGET}:/persist/manual/" && ssh talexander@${TARGET} 'cd /persist/manual/configuration && nix flake update zsh-histdb && nix flake update ansible-sshjail && doas nice -n 19 nixos-rebuild boot --flake /persist/manual/configuration#hydra'

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" --log-format internal-json -v "${@}" |& nom --json
+nixos-rebuild switch --flake "$DIR/../../#hydra" --target-host "$TARGET" --build-host "$TARGET" --fast --use-remote-sudo --max-jobs "$JOBS" "${@}" |& nom
 
 # rsync -av --progress --delete --exclude=.git "$DIR/../../../configuration" "talexander@${TARGET}:/persist/manual/" && ssh talexander@${TARGET} 'cd /persist/manual/configuration && nix flake update zsh-histdb && nix flake update ansible-sshjail && doas nice -n 19 nixos-rebuild switch --flake /persist/manual/configuration#hydra'

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" --log-format internal-json -v "${@}" |& nom --json
+nix build --extra-experimental-features nix-command --extra-experimental-features flakes "$DIR/../..#iso.hydra" --max-jobs "$JOBS" "${@}" |& nom

nix/configuration/hosts/ionlybootzfs/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/../../#ionlybootzfs" --target-host "$TARGET" --build-host "$TARGET" --fast --use-remote-sudo --max-jobs "$JOBS" --log-format internal-json -v "${@}" |& nom --json
+nixos-rebuild boot --flake "$DIR/../../#ionlybootzfs" --target-host "$TARGET" --build-host "$TARGET" --fast --use-remote-sudo --max-jobs "$JOBS" "${@}" |& nom
 
 # rsync -av --progress --delete --exclude=.git "$DIR/../../../configuration" "talexander@${TARGET}:/persist/manual/" && ssh talexander@${TARGET} 'cd /persist/manual/configuration && nix flake update zsh-histdb && nix flake update ansible-sshjail && doas nice -n 19 nixos-rebuild boot --flake /persist/manual/configuration#ionlybootzfs'

nix/configuration/hosts/ionlybootzfs/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/../../#ionlybootzfs" --target-host "$TARGET" --build-host "$TARGET" --fast --use-remote-sudo --max-jobs "$JOBS" --log-format internal-json -v "${@}" |& nom --json
+nixos-rebuild switch --flake "$DIR/../../#ionlybootzfs" --target-host "$TARGET" --build-host "$TARGET" --fast --use-remote-sudo --max-jobs "$JOBS" "${@}" |& nom
 
 # rsync -av --progress --delete --exclude=.git "$DIR/../../../configuration" "talexander@${TARGET}:/persist/manual/" && ssh talexander@${TARGET} 'cd /persist/manual/configuration && nix flake update zsh-histdb && nix flake update ansible-sshjail && doas nice -n 19 nixos-rebuild switch --flake /persist/manual/configuration#ionlybootzfs'

nix/configuration/hosts/ionlybootzfs/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.ionlybootzfs" --max-jobs "$JOBS" --log-format internal-json -v "${@}" |& nom --json
+nix build --extra-experimental-features nix-command --extra-experimental-features flakes "$DIR/../..#iso.ionlybootzfs" --max-jobs "$JOBS" "${@}" |& nom

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" --log-format internal-json -v "${@}" |& nom --json
+nixos-rebuild boot --flake "$DIR/../../#neelix" --target-host "$TARGET" --build-host "$TARGET" --fast --use-remote-sudo --max-jobs "$JOBS" "${@}" |& nom
 
 # rsync -av --progress --delete --exclude=.git "$DIR/../../../configuration" "talexander@${TARGET}:/persist/manual/" && ssh talexander@${TARGET} 'cd /persist/manual/configuration && nix flake update zsh-histdb && nix flake update ansible-sshjail && doas nice -n 19 nixos-rebuild boot --flake /persist/manual/configuration#neelix'

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" --log-format internal-json -v "${@}" |& nom --json
+nixos-rebuild switch --flake "$DIR/../../#neelix" --target-host "$TARGET" --build-host "$TARGET" --fast --use-remote-sudo --max-jobs "$JOBS" "${@}" |& nom
 
 # rsync -av --progress --delete --exclude=.git "$DIR/../../../configuration" "talexander@${TARGET}:/persist/manual/" && ssh talexander@${TARGET} 'cd /persist/manual/configuration && nix flake update zsh-histdb && nix flake update ansible-sshjail && doas nice -n 19 nixos-rebuild switch --flake /persist/manual/configuration#neelix'

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" --log-format internal-json -v "${@}" |& nom --json
+nixos-rebuild boot --flake "$DIR/../../#odo" --target-host "$TARGET" --build-host "$TARGET" --fast --use-remote-sudo --max-jobs "$JOBS" "${@}" |& nom
 
 # rsync -av --progress --delete --exclude=.git "$DIR/../../../configuration" "talexander@${TARGET}:/persist/manual/" && ssh talexander@${TARGET} 'cd /persist/manual/configuration && nix flake update zsh-histdb && nix flake update ansible-sshjail && doas nice -n 19 nixos-rebuild boot --flake /persist/manual/configuration#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" --log-format internal-json -v "${@}" |& nom --json
+nixos-rebuild switch --flake "$DIR/../../#odo" --target-host "$TARGET" --build-host "$TARGET" --fast --use-remote-sudo --max-jobs "$JOBS" "${@}" |& nom
 
 # rsync -av --progress --delete --exclude=.git "$DIR/../../../configuration" "talexander@${TARGET}:/persist/manual/" && ssh talexander@${TARGET} 'cd /persist/manual/configuration && nix flake update zsh-histdb && nix flake update ansible-sshjail && doas nice -n 19 nixos-rebuild switch --flake /persist/manual/configuration#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" --log-format internal-json -v "${@}" |& nom --json
+nix build --extra-experimental-features nix-command --extra-experimental-features flakes "$DIR/../..#iso.odo" --max-jobs "$JOBS" "${@}" |& nom

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" --log-format internal-json -v "${@}" |& nom --json
+nixos-rebuild boot --show-trace --use-remote-sudo --max-jobs "$JOBS" --flake "$DIR/../../#odo" "${@}" |& nom

nix/configuration/hosts/odo/SELF_BUILD

@@ -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 build --show-trace --use-remote-sudo --max-jobs "$JOBS" --flake "$DIR/../../#odo" --log-format internal-json -v "${@}" |& nom --json
+nixos-rebuild build --show-trace --use-remote-sudo --max-jobs "$JOBS" --flake "$DIR/../../#odo" "${@}" |& nom

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" --log-format internal-json -v "${@}" |& nom --json
+nixos-rebuild switch --show-trace --use-remote-sudo --max-jobs "$JOBS" --flake "$DIR/../../#odo" "${@}" |& nom

nix/configuration/hosts/odo/default.nix

@@ -59,16 +59,13 @@
   # 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.docker.enable = true;
-  me.direnv.enable = true;
+  me.ecc.enable = true;
-  me.docker.enable = false;
-  me.ecc.enable = false;
   me.emacs_flavor = "full";
   me.firefox.enable = true;
   me.flux.enable = true;
@@ -87,16 +84,13 @@
   me.media.enable = true;
   me.nix_index.enable = true;
   me.pcsx2.enable = true;
-  me.podman.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;
-  me.spaghettikart.enable = true;
   me.steam.enable = true;
   me.steam_run_free.enable = true;
   me.sway.enable = 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=2"
+    "amdgpu.abmlevel=3"
     "pcie_aspm=force"
     # "pcie_aspm.policy=powersupersave"
     "nowatchdog"
@@ -47,22 +47,6 @@
     "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 - - - - 21845"
+    "w- /sys/class/backlight/amdgpu_bl1/brightness - - - - 85"
   ];
 }

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" --log-format internal-json -v "${@}" |& nom --json
+nixos-rebuild boot --flake "$DIR/../../#quark" --target-host "$TARGET" --build-host "$TARGET" --fast --use-remote-sudo --max-jobs "$JOBS" "${@}" |& nom
 
 # rsync -av --progress --delete --exclude=.git "$DIR/../../../configuration" "talexander@${TARGET}:/persist/manual/" && ssh talexander@${TARGET} 'cd /persist/manual/configuration && nix flake update zsh-histdb && nix flake update ansible-sshjail && doas nice -n 19 nixos-rebuild boot --flake /persist/manual/configuration#quark'

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" --log-format internal-json -v "${@}" |& nom --json
+nixos-rebuild switch --flake "$DIR/../../#quark" --target-host "$TARGET" --build-host "$TARGET" --fast --use-remote-sudo --max-jobs "$JOBS" "${@}" |& nom
 
 # rsync -av --progress --delete --exclude=.git "$DIR/../../../configuration" "talexander@${TARGET}:/persist/manual/" && ssh talexander@${TARGET} 'cd /persist/manual/configuration && nix flake update zsh-histdb && nix flake update ansible-sshjail && doas nice -n 19 nixos-rebuild switch --flake /persist/manual/configuration#quark'

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" --log-format internal-json -v "${@}" |& nom --json
+nix build --extra-experimental-features nix-command --extra-experimental-features flakes "$DIR/../..#iso.quark" --max-jobs "$JOBS" "${@}" |& nom

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" --log-format internal-json -v "${@}" |& nom --json
+nixos-rebuild boot --show-trace --use-remote-sudo --max-jobs "$JOBS" --flake "$DIR/../../#quark" "${@}" |& nom

nix/configuration/hosts/quark/SELF_BUILD

@@ -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 build --show-trace --use-remote-sudo --max-jobs "$JOBS" --flake "$DIR/../../#quark" --log-format internal-json -v "${@}" |& nom --json
+nixos-rebuild build --show-trace --use-remote-sudo --max-jobs "$JOBS" --flake "$DIR/../../#quark" "${@}" |& nom

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" --log-format internal-json -v "${@}" |& nom --json
+nixos-rebuild switch --show-trace --use-remote-sudo --max-jobs "$JOBS" --flake "$DIR/../../#quark" "${@}" |& nom

nix/configuration/hosts/quark/default.nix

@@ -54,15 +54,12 @@
     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.docker.enable = true;
-    me.direnv.enable = true;
-    me.docker.enable = false;
     me.ecc.enable = true;
     me.emacs_flavor = "full";
     me.firefox.enable = true;
@@ -83,16 +80,13 @@
     me.nix_index.enable = true;
     me.nix_worker.enable = true;
     me.pcsx2.enable = true;
-    me.podman.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;
-    me.spaghettikart.enable = true;
     me.steam.enable = true;
     me.steam_run_free.enable = true;
     me.sway.enable = true;

nix/configuration/roles/alacritty/default.nix

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

nix/configuration/roles/amd_s2idle/cysystemd.nix

@@ -1,48 +0,0 @@
-{
-  lib,
-  pkgs,
-  buildPythonPackage,
-  fetchFromGitHub,
-  pythonOlder,
-  cython,
-  pkg-config,
-  setuptools,
-}:
-
-let
-  version = "1.6.3";
-in
-buildPythonPackage {
-  pname = "cysystemd";
-  inherit version;
-  pyproject = true;
-
-  src = fetchFromGitHub {
-    owner = "mosquito";
-    repo = "cysystemd";
-    tag = version;
-    hash = "sha256-xumrQgoKfFeKdRQUIYXXiXEcNd76i4wo/EIDm8BN7oU=";
-  };
-
-  disabled = pythonOlder "3.6";
-
-  build-system = [
-    setuptools
-    cython
-  ];
-
-  nativeBuildInputs = [
-    pkg-config
-  ];
-
-  buildInputs = [ pkgs.systemd ];
-
-  pythonImportsCheck = [ "cysystemd" ];
-
-  meta = {
-    description = "systemd wrapper on Cython";
-    homepage = "https://github.com/mosquito/cysystemd";
-    license = lib.licenses.asl20;
-    platforms = lib.platforms.linux;
-  };
-}

nix/configuration/roles/amd_s2idle/default.nix

@@ -1,47 +0,0 @@
-{
-  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
-        ];
-        nixpkgs.overlays = [
-          (
-            final: prev:
-            let
-              innerPackage = (final.callPackage ./package.nix { });
-            in
-            {
-              amd-debug-tools = innerPackage;
-            }
-          )
-          (final: prev: {
-            pythonPackagesExtensions = prev.pythonPackagesExtensions ++ [
-              (python-final: python-prev: {
-                cysystemd = (python-final.callPackage ./cysystemd.nix { });
-              })
-            ];
-          })
-        ];
-      }
-    ]
-  );
-}

nix/configuration/roles/amd_s2idle/package.nix

@@ -1,58 +0,0 @@
-{
-  lib,
-  fetchgit,
-  python3Packages,
-  acpica-tools,
-  ethtool,
-  libdisplay-info,
-}:
-
-let
-  version = "0.2.7";
-in
-python3Packages.buildPythonApplication {
-  pname = "amd-debug-tools";
-  inherit version;
-  pyproject = true;
-
-  build-system = with python3Packages; [
-    setuptools
-    setuptools-git-versioning
-    setuptools-git
-    pyudev
-  ];
-  dependencies = with python3Packages; [
-    cysystemd
-    jinja2
-    matplotlib
-    pandas
-    pyudev
-    seaborn
-    tabulate
-    acpica-tools
-    ethtool
-    libdisplay-info
-  ];
-  src = fetchgit {
-    url = "https://git.kernel.org/pub/scm/linux/kernel/git/superm1/amd-debug-tools.git";
-    tag = version;
-    hash = "sha256-6X9cUKN0BkkKcYGU+YJYCGT+l5iUZDN+D8Fqq/ns98Q=";
-    leaveDotGit = true;
-  };
-
-  disabled = python3Packages.pythonOlder "3.7";
-
-  postPatch = ''
-    substituteInPlace pyproject.toml \
-      --replace-fail ', "setuptools-git-versioning>=2.0,<3"' ""
-  '';
-
-  pythonImportsCheck = [ "amd_debug" ];
-
-  meta = {
-    description = "Debug tools for AMD zen systems";
-    homepage = "https://git.kernel.org/pub/scm/linux/kernel/git/superm1/amd-debug-tools.git/";
-    license = lib.licenses.mit;
-    platforms = lib.platforms.linux;
-  };
-}

nix/configuration/roles/chromium/default.nix

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

nix/configuration/roles/d2/default.nix

@@ -1,29 +0,0 @@
-{
-  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

@@ -1,55 +0,0 @@
-{
-  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/docker/default.nix

@@ -19,14 +19,6 @@
 
   config = lib.mkIf config.me.docker.enable (
     lib.mkMerge [
-      {
-        assertions = [
-          {
-            assertion = !config.me.podman.enable;
-            message = "docker conflicts with podman";
-          }
-        ];
-      }
       {
         virtualisation.docker.enable = true;
         # Use docker activation

nix/configuration/roles/emacs/default.nix

@@ -131,10 +131,8 @@ in
                     final.cmake-language-server
                     final.cmake # Used by cmake-language-server
                     final.rust-analyzer
-                    final.prettier # Format yaml, json, and JS
+                    final.nodePackages_latest.prettier # Format yaml, json, and JS
                     final.terraform-ls
-                    final.typescript-language-server
-                    final.tex
                   ]
                 }
               '';
@@ -142,12 +140,14 @@ in
           })
         ];
 
-        me.install.user.talexander.file = {
+        home-manager.users.talexander =
-          ".config/emacs" = {
+          { pkgs, ... }:
-            source = ./files/emacs;
+          {
-            recursive = true;
+            home.file.".config/emacs" = {
+              source = ./files/emacs;
+              recursive = true;
+            };
           };
-        };
       })
       (lib.mkIf (config.me.emacs_flavor == "plainmacs") {
         nixpkgs.overlays = [

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

@@ -1,16 +0,0 @@
-(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,12 +1,6 @@
 (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
@@ -119,14 +113,10 @@
          ("\\.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,8 +87,4 @@
 (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 :json-false)
+                                                                                                                                                           :merge (:glob nil)
                                                                                                                                                            :prefix "self")
                                                                                                                                              ))))
                                )

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

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

nix/configuration/roles/firefox/default.nix

@@ -70,12 +70,9 @@
             # Allow sending dark mode preference to websites.
             # Allow sending timezone to websites.
             "privacy.fingerprintingProtection.overrides" =
-              "+AllTargets,-CSSPrefersColorScheme,-JSDateTimeUTC,-CanvasExtractionBeforeUserInputIsBlocked,-CanvasImageExtractionPrompt";
+              "+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 = {

nix/configuration/roles/git/default.nix

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

nix/configuration/roles/gpg/default.nix

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

nix/configuration/roles/kanshi/default.nix

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

nix/configuration/roles/kodi/default.nix

@@ -78,13 +78,21 @@
           };
         };
 
-        # home.file.".kodi/userdata/mediasources.xml".source = ./files/mediasources.xml;
+        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 =
+            # home.file.".kodi/userdata/addon_data/peripheral.joystick/resources/buttonmaps/xml/linux/DualSense_Wireless_Controller_13b_8a.xml".source =
-        #   ./files/DualSense_Wireless_Controller_13b_8a.xml;
+            #   ./files/DualSense_Wireless_Controller_13b_8a.xml;
 
-        # TODO: Maybe .kodi/userdata/sources.xml
+            # TODO: Maybe .kodi/userdata/sources.xml
-        # TODO: ./userdata/guisettings.xml:303:    <setting id="filecache.memorysize">128</setting>
+            # 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/latex/default.nix

@@ -5,6 +5,22 @@
   ...
 }:
 
+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 = [ ];
 
@@ -24,35 +40,6 @@
           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/media/default.nix

@@ -52,11 +52,13 @@ in
           imv
         ];
 
-        me.install.user.talexander.file = {
+        home-manager.users.talexander =
-          ".config/mpv/mpv.conf" = {
+          { pkgs, ... }:
-            source = ./files/mpv.conf;
+          {
+            home.file.".config/mpv/mpv.conf" = {
+              source = ./files/mpv.conf;
+            };
           };
-        };
       })
       (lib.mkIf (config.me.graphics_card_type == "amd" || config.me.graphics_card_type == "intel") {
         environment.systemPackages = with pkgs; [

nix/configuration/roles/memtest86/default.nix

@@ -8,14 +8,10 @@
 {
   imports = [ ];
   config = lib.mkMerge [
-    {
+    { }
-      environment.systemPackages = with pkgs; [
+    (lib.mkIf (config.me.buildingIso) {
-        memtest86plus
+      # boot.loader.systemd-boot.memtest86.enable = true;
-      ];
+      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,7 +2,6 @@
   config,
   lib,
   pkgs,
-  pkgs-dda3dcd3f,
   ...
 }:
 
@@ -65,7 +64,6 @@
     ldns # for drill
     arp-scan # To find devices on the network
     wavemon
-    dhcpcd # For Android USB tethering.
   ];
 
   boot.extraModprobeConfig = ''
@@ -93,13 +91,4 @@
     # 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

@@ -47,7 +47,7 @@
     (lib.mkIf (!config.me.optimizations.enable) (
       lib.mkMerge [
         {
-          boot.kernelPackages = pkgs.linuxPackagesFor pkgs.linux_6_16;
+          boot.kernelPackages = pkgs.linuxPackagesFor pkgs.linux_6_14;
         }
       ]
     ))
@@ -94,7 +94,7 @@
                   HZ = lib.kernel.freeform "300";
                   HZ_300 = lib.kernel.yes;
                   HZ_1000 = lib.kernel.no;
-                } prev.linux_6_16;
+                } prev.linux_6_14;
               }
             )
             (final: prev: {
@@ -126,37 +126,12 @@
                 }
               );
             })
-            # (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
                 ;
             })
           ];

nix/configuration/roles/pcsx2/default.nix

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

nix/configuration/roles/podman/default.nix

@@ -1,80 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-
-{
-  imports = [ ];
-
-  options.me = {
-    podman.enable = lib.mkOption {
-      type = lib.types.bool;
-      default = false;
-      example = true;
-      description = "Whether we want to install podman.";
-    };
-  };
-
-  config = lib.mkIf config.me.podman.enable (
-    lib.mkMerge [
-      {
-        assertions = [
-          {
-            assertion = !config.me.docker.enable;
-            message = "podman conflicts with docker";
-          }
-        ];
-      }
-      {
-        environment.systemPackages = with pkgs; [
-          dive
-          podman-tui
-          podman-compose
-        ];
-
-        # Write config files in /etc/containers
-        virtualisation.containers.enable = true;
-        # By default this includes "quay.io" which leads to prompting for which registry to download from.
-        virtualisation.containers.registries.search = [ "docker.io" ];
-        virtualisation = {
-          podman = {
-            enable = true;
-            # Install docker shim
-            dockerCompat = true;
-            # Support name resolution in podman-compose.
-            defaultNetwork.settings.dns_enabled = true;
-          };
-        };
-
-        environment.variables = {
-          # For compatibility with tools expecting a docker socket (like dive).
-          DOCKER_HOST = "unix://$XDG_RUNTIME_DIR/podman/podman.sock";
-        };
-
-        environment.persistence."/state" = lib.mkIf (!config.me.buildingIso) {
-          hideMounts = true;
-          directories = [
-            {
-              directory = "/var/lib/containers";
-              user = "root";
-              group = "root";
-              mode = "0755";
-            }
-          ];
-          users.talexander = {
-            directories = [
-              {
-                directory = ".local/share/containers";
-                user = "talexander";
-                group = "talexander";
-                mode = "0700";
-              }
-            ];
-          };
-        };
-      }
-    ]
-  );
-}

nix/configuration/roles/python/default.nix

@@ -32,21 +32,6 @@
           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

@@ -70,26 +70,16 @@ in
           }
         ];
 
-        me.install.user.talexander.file = {
+        home-manager.users.talexander =
-          ".config/rpcs3/config.yml" = lib.mkIf (config.me.rpcs3.config != null) {
+          { pkgs, ... }:
-            source = rpcs3_config_yaml;
+          {
+            home.file.".config/rpcs3/config.yml" = lib.mkIf (config.me.rpcs3.config != null) {
+              source = rpcs3_config_yaml;
+            };
+            home.file.".config/rpcs3/GuiConfigs/CurrentSettings.ini" = {
+              source = ./files/CurrentSettings.ini;
+            };
           };
-          ".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;
@@ -156,13 +146,6 @@ in
                   mode = "0755";
                 };
               }
-              {
-                # Netplay (RPCN) config and credentials
-                file = ".config/rpcs3/rpcn.yml";
-                parentDirectory = {
-                  mode = "0755";
-                };
-              }
             ];
           };
         };
@@ -172,6 +155,7 @@ in
           users.talexander = {
             directories = [
               {
+                # Game saves
                 directory = ".cache/rpcs3";
                 user = "talexander";
                 group = "talexander";

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

@@ -1,14 +0,0 @@
-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

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

nix/configuration/roles/rust/default.nix

@@ -48,14 +48,18 @@ in
           # ? cargo-public-api
         ];
 
-        me.install.user.talexander.file = {
+        home-manager.users.talexander =
-          ".cargo/config.toml" = {
+          { pkgs, ... }:
-            source = ./files/cargo_config.toml;
+          {
+            home.file = {
+              ".cargo/config.toml" = {
+                source = ./files/cargo_config.toml;
+              };
+              ".rustup/settings.toml" = {
+                source = ./files/rustup_settings.toml;
+              };
+            };
           };
-          ".rustup/settings.toml" = {
-            source = ./files/rustup_settings.toml;
-          };
-        };
 
         environment.persistence."/state" = lib.mkIf (!config.me.buildingIso) {
           hideMounts = true;

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

@@ -1,110 +0,0 @@
-{
-  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

@@ -1,15 +0,0 @@
-[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,11 +36,15 @@ in
           exec_shikane
         ];
 
-        me.install.user.talexander.file = {
+        home-manager.users.talexander =
-          ".config/shikane/config.toml" = {
+          { pkgs, ... }:
-            source = ./files/config.toml;
+          {
+            home.file = {
+              ".config/shikane/config.toml" = {
+                source = ./files/config.toml;
+              };
+            };
           };
-        };
       })
     ]
   );

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

@@ -1,15 +1,3 @@
-[[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/spaghettikart/default.nix

@@ -1,49 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-
-{
-  imports = [ ];
-
-  options.me = {
-    spaghettikart.enable = lib.mkOption {
-      type = lib.types.bool;
-      default = false;
-      example = true;
-      description = "Whether we want to install spaghettikart.";
-    };
-  };
-
-  config = lib.mkIf config.me.spaghettikart.enable (
-    lib.mkMerge [
-      {
-        allowedUnfree = [ "spaghettikart" ];
-      }
-      (lib.mkIf config.me.graphical {
-        environment.systemPackages = with pkgs; [
-          spaghettikart
-        ];
-
-        me.install.user.talexander.file = {
-          ".local/share/spaghettikart/spaghettify.cfg.json" = {
-            source = ./files/spaghettify.cfg.json;
-            method = "overwrite";
-          };
-        };
-
-        environment.persistence."/persist" = lib.mkIf (!config.me.buildingIso) {
-          hideMounts = true;
-          users.talexander = {
-            files = [
-              ".local/share/spaghettikart/default.sav"
-              ".local/share/spaghettikart/mk64.o2r"
-            ];
-          };
-        };
-      })
-    ]
-  );
-}

nix/configuration/roles/spaghettikart/files/spaghettify.cfg.json

@@ -1,14 +0,0 @@
-{
-  "CVars": {
-    "gDisableLod": 1,
-    "gMSAAValue": 2,
-    "gShowSpaghettiVersion": 0,
-    "gSkipIntro": 1,
-    "gVsyncEnabled": 1
-  },
-  "Window": {
-    "Fullscreen": {
-      "Enabled": true
-    }
-  }
-}

nix/configuration/roles/ssh/default.nix

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

nix/configuration/roles/sway/default.nix

@@ -376,18 +376,26 @@ in
       };
     };
 
-    me.install.user.talexander.file = {
+    home-manager.users.talexander =
-      ".config/mimeapps.list" = {
+      { pkgs, ... }:
-        # Configure default programs (for example, default browser)
+      {
-        source = ./files/mimeapps.list;
+        home.file = {
+          # Configure default programs (for example, default browser)
+          ".config/mimeapps.list" = {
+            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";
+          };
+        };
       };
-      ".config/gtk-3.0/settings.ini" = {
-        source = ./files/settings.ini;
-      };
-      ".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

@@ -48,14 +48,16 @@
           })
         ];
 
-        me.install.user.talexander.file = {
+        home-manager.users.talexander =
-          ".config/Code/User/settings.json" = {
+          { pkgs, ... }:
-            source = ./files/settings.json;
+          {
+            home.file.".config/Code/User/settings.json" = {
+              source = ./files/settings.json;
+            };
+            home.file.".config/Code/User/keybindings.json" = {
+              source = ./files/keybindings.json;
+            };
           };
-          ".config/Code/User/keybindings.json" = {
-            source = ./files/keybindings.json;
-          };
-        };
       })
     ]
   );

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

@@ -20,12 +20,6 @@
         "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,7 +18,6 @@
   "workbench.editor.showTabs": "none",
   "workbench.activityBar.location": "hidden",
   "window.menuBarVisibility": "toggle",
-  "window.commandCenter": false,
   "explorer.autoReveal": false,
   "[python]": {
     "editor.defaultFormatter": "ms-python.black-formatter",
@@ -36,21 +35,11 @@
     "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/waybar/default.nix

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

nix/configuration/roles/zsh/default.nix

@@ -49,8 +49,6 @@ 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
@@ -64,16 +62,6 @@ 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 (
@@ -90,11 +78,13 @@ in
           enable = true;
         };
 
-        me.install.user.talexander.file = {
+        home-manager.users.talexander =
-          ".zshrc" = {
+          { pkgs, ... }:
-            source = "${zshrc}";
+          {
+            home.file.".zshrc" = {
+              source = "${zshrc}";
+            };
           };
-        };
 
         environment.persistence."/persist" = lib.mkIf (!config.me.buildingIso) {
           hideMounts = true;

nix/configuration/util/install_files/default.nix

@@ -2,179 +2,87 @@
   config,
   lib,
   pkgs,
+  home-manager,
   ...
 }:
 
 let
-  cfg = config.me.install;
   inherit (lib)
-    filter
     attrNames
+    filter
+    flatten
     ;
+  makeFileOption =
+    prefix:
+    lib.mkOption {
+      type = lib.types.attrsOf (
+        lib.types.submodule (
+          { name, config, ... }:
+          {
+            options = {
+              enable = lib.mkOption {
+                type = lib.types.bool;
+                default = true;
+                defaultText = "${prefix}.‹path›.enable";
+                example = false;
+                description = "Whether we want to install this file.";
+              };
+              method = lib.mkOption {
+                type = lib.types.enum [
+                  "symlink"
+                  "overwrite"
+                  "initialize"
+                  # "bind_mount" TODO: for directories?
+                ];
+                default = "symlink";
+                defaultText = "${prefix}.‹path›.method";
+                example = "overwrite";
+                description = "The way in which the file should be installed.";
+              };
+              mode = lib.mkOption {
+                type = lib.types.str;
+                default = "0444";
+                defaultText = "${prefix}.‹path›.mode";
+                example = "0750";
+                description = "The read, write, execute permission flags.";
+              };
+              source = lib.mkOption {
+                type = lib.types.path;
+                defaultText = "${prefix}.‹path›.source";
+                example = ./files/foo.txt;
+                description = "The source file to install into the destination.";
+              };
+              target = lib.mkOption {
+                type = lib.types.str;
+                defaultText = "${prefix}.‹path›.target";
+                example = ".local/share/foo/bar.txt";
+                description = "The path where the file should be written.";
+              };
+              group = lib.mkOption {
+                type = lib.types.nullOr lib.types.str;
+                default = null;
+                defaultText = "${prefix}.‹path›.group";
+                example = ".local/share/foo/bar.txt";
+                description = "The group that should own the file.";
+              };
+            };
 
-  get_shell_values =
+            config = {
-    target:
+              target = lib.mkDefault name;
-    let
+            };
-      homedir = config.users.users."${target.username}".home;
+          }
-      group = config.users.users."${target.username}".group;
+        )
-    in
+      );
-    {
+      defaultText = "${prefix}.‹path›";
-      source = lib.strings.escapeShellArg "${target.source}";
+      default = { };
-      destination = lib.strings.escapeShellArg "${homedir}/${target.target}";
+      example = lib.literalExpression ''
-      mode = lib.strings.escapeShellArg "${target.mode}";
+        {
-      dir_mode = lib.strings.escapeShellArg "${target.dir_mode}";
+          ".config/foo/bar.txt" = {
-      username = lib.strings.escapeShellArg "${target.username}";
+            source = ./files/bar.txt
-      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 = [ ];
@@ -184,150 +92,88 @@ in
       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";
+                defaultText = "me.install.user.‹username›.enable";
-                example = lib.literalExpression false;
+                example = false;
                 description = "Whether we want to install files in this user's home directory.";
               };
-
+              target_username = lib.mkOption {
-              file = lib.mkOption {
+                type = lib.types.str;
-                type = lib.types.attrsOf (
+                defaultText = "me.install.file.‹username›.target_username";
-                  lib.types.submodule (
+                example = "root";
-                    { name, config, ... }:
+                description = "The username for the user whose home directory will contain the file.";
-                    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;
-                      };
-                    }
-                  )
-                );
               };
+              file = makeFileOption "me.install.user.‹username›.file";
+            };
+
+            config = {
+              target_username = lib.mkDefault name;
             };
           }
         )
       );
+
+      defaultText = "me.install.user.‹username›";
+      default = { };
+      # TODO: example
     };
+    # TODO: Global option owned by root?
+    # file = makeFileOption "me.install.file";
   };
 
   config =
     let
-      all_users = builtins.map (username: cfg.user."${username}") (attrNames cfg.user);
+      cfg = config.me.install;
-      enabled_users = filter (user: user.enable) all_users;
+      active_install_users = filter (username: cfg.user."${username}".enable) (attrNames cfg.user);
-      all_file_targets = lib.flatten (
+      install_commands = flatten (
-        builtins.map (user: (builtins.map (path: user.file."${path}") (attrNames user.file))) enabled_users
+        builtins.map (
-      );
+          username:
-      enabled_file_targets = filter (target: target.enable) all_file_targets;
+          let
-      check_commands = lib.flatten (builtins.map (install_user_file "check") enabled_file_targets);
+            active_install_file_targets = filter (target: cfg.user."${username}".file."${target}".enable) (
-      install_commands = lib.flatten (builtins.map (install_user_file "install") enabled_file_targets);
+              attrNames cfg.user."${username}".file
-      uninstall_commands = lib.flatten (
+            );
-        builtins.map (install_user_file "uninstall") enabled_file_targets
+          in
+          builtins.map (
+            target:
+            let
+              target_config = cfg.user."${username}".file."${target}";
+              source = lib.strings.escapeShellArg "${target_config.source}";
+              destination = lib.strings.escapeShellArg "${target_config.target}";
+              mode = lib.strings.escapeShellArg "${target_config.mode}";
+              escaped_username = lib.strings.escapeShellArg "${username}";
+              escaped_group =
+                if target_config.group == null then
+                  "$(id -g ${escaped_username})"
+                else
+                  (lib.strings.escapeShellArg "${target_config.group}");
+            in
+            ''
+              $DRY_RUN_CMD install $VERBOSE_ARG -D --compare -o ${escaped_username} -g ${escaped_group} -m ${mode} ${source} ${destination}
+            ''
+          ) active_install_file_targets
+        ) active_install_users
       );
+
     in
-    {
+    lib.mkMerge [
-      systemd.services.me-install-file = {
+      (lib.mkIf (install_commands != [ ]) ({
-        enable = true;
+        systemd.services.me-install-file = {
-        description = "me-install-file";
+          enable = true;
-        wantedBy = [ "multi-user.target" ];
+          description = "me-install-file";
-        wants = [ "multi-user.target" ];
+          wantedBy = [ "multi-user.target" ];
-        before = [ "multi-user.target" ];
+          wants = [ "multi-user.target" ];
-        # path = with pkgs; [
+          after = [ "multi-user.target" ];
-        #   zfs
+          unitConfig.DefaultDependencies = "no";
-        # ];
+          serviceConfig = {
-        unitConfig.DefaultDependencies = "no";
+            Type = "oneshot";
-        serviceConfig = {
+            RemainAfterExit = "yes";
-          Type = "oneshot";
+          };
-          RemainAfterExit = "yes";
+          script = (lib.strings.concatStringsSep "\n" install_commands);
         };
-        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

@@ -1,38 +0,0 @@
-#!/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
-
-}

nix/steam_deck/configuration/flake.lock

@@ -1,15 +1,12 @@
 {
   "nodes": {
     "flake-utils": {
-      "inputs": {
-        "systems": "systems"
-      },
       "locked": {
-        "lastModified": 1731533236,
+        "lastModified": 1659877975,
-        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
         "type": "github"
       },
       "original": {
@@ -25,11 +22,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1757698511,
+        "lastModified": 1739314552,
-        "narHash": "sha256-UqHHGydF/q3jfYXCpvYLA0TWtvByOp1NwOKCUjhYmPs=",
+        "narHash": "sha256-ggVf2BclyIW3jexc/uvgsgJH4e2cuG6Nyg54NeXgbFI=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "a3fcc92180c7462082cd849498369591dfb20855",
+        "rev": "83bd3a26ac0526ae04fa74df46738bb44b89dcdd",
         "type": "github"
       },
       "original": {
@@ -61,11 +58,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1752054764,
+        "lastModified": 1713543440,
-        "narHash": "sha256-Ob/HuUhANoDs+nvYqyTKrkcPXf4ZgXoqMTQoCK0RFgQ=",
+        "narHash": "sha256-lnzZQYG0+EXl/6NkGpyIz+FEOc/DSEG57AP1VsdeNrM=",
         "owner": "nix-community",
         "repo": "nixGL",
-        "rev": "a8e1ce7d49a149ed70df676785b07f63288f53c5",
+        "rev": "310f8e49a149e4c9ea52f1adf70cdc768ec53f8a",
         "type": "github"
       },
       "original": {
@@ -76,11 +73,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1757746433,
+        "lastModified": 1739138025,
-        "narHash": "sha256-fEvTiU4s9lWgW7mYEU/1QUPirgkn+odUBTaindgiziY=",
+        "narHash": "sha256-M4ilIfGxzbBZuURokv24aqJTbdjPA9K+DtKUzrJaES4=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "6d7ec06d6868ac6d94c371458fc2391ded9ff13d",
+        "rev": "b2243f41e860ac85c0b446eadc6930359b294e79",
         "type": "github"
       },
       "original": {
@@ -97,21 +94,6 @@
         "nixgl": "nixgl",
         "nixpkgs": "nixpkgs"
       }
-    },
-    "systems": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
     }
   },
   "root": "root",

nix/steam_deck/configuration/flake.nix

@@ -4,10 +4,8 @@
 
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
-    nixgl = {
+    nixgl.url = "github:nix-community/nixGL";
-      url = "github:nix-community/nixGL";
+    nixgl.inputs.nixpkgs.follows = "nixpkgs";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
     home-manager = {
       url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -25,7 +23,6 @@
       ...
     }:
     let
-      forAllSystems = nixpkgs.lib.genAttrs nixpkgs.lib.systems.flakeExposed;
       system = "x86_64-linux";
       pkgs = import nixpkgs {
         inherit system;
@@ -34,7 +31,7 @@
     in
     # pkgs = nixpkgs.legacyPackages.${system};
     {
-      defaultPackage.${system} = home-manager.packages.${system}.default;
+      defaultPackage.${system} = home-manager.defaultPackage.${system};
       homeConfigurations."deck" = home-manager.lib.homeManagerConfiguration {
         inherit pkgs;
 

nix/steam_deck/configuration/home.nix

@@ -18,7 +18,6 @@
     ./roles/ryujinx
     ./roles/shipwright
     ./roles/sm64ex
-    ./roles/spaghettikart
     ./roles/steam_rom_manager
     ./roles/yuzu
     ./util/copy_files

nix/steam_deck/configuration/hosts/deck/default.nix

@@ -20,7 +20,6 @@
     me.ship2harkinian.enable = true;
     me.shipwright.enable = true;
     me.sm64ex.enable = true;
-    me.spaghettikart.enable = true;
     me.steam_rom_manager.enable = true; # Steam rom manager UI does not render. I think it wants to be in an AppImage.
     me.yuzu.enable = true;
   };

nix/steam_deck/configuration/roles/duckstation/default.nix

@@ -51,7 +51,6 @@ in
           (
             final: prev:
             let
-              modified_package = (pkgs.callPackage ./package/package.nix { });
               optimizeWithFlags =
                 pkg: flags:
                 pkg.overrideAttrs (old: {
@@ -59,16 +58,16 @@ in
                 });
               original_package =
                 if config.me.optimizations.enable then
-                  (optimizeWithFlags modified_package [
+                  (optimizeWithFlags prev.duckstation [
                     "-march=znver2"
                     "-mtune=znver2"
                   ])
                 else
-                  modified_package;
+                  prev.duckstation;
             in
             {
               duckstation = pkgs.buildEnv {
-                name = original_package.name;
+                name = prev.duckstation.name;
                 paths = [
                   (config.lib.nixGL.wrap original_package)
                 ];

nix/steam_deck/configuration/roles/duckstation/package/001-fix-test-inclusion.diff

@@ -1,11 +0,0 @@
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 879d46bc..95570f6b 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -20,5 +20,5 @@ if(BUILD_REGTEST)
- endif()
- 
- if(BUILD_TESTS)
--  add_subdirectory(common-tests EXCLUDE_FROM_ALL)
-+  add_subdirectory(common-tests)
- endif()

nix/steam_deck/configuration/roles/duckstation/package/002-hardcode-vars.diff

@@ -1,19 +0,0 @@
-diff --git a/src/scmversion/gen_scmversion.sh b/src/scmversion/gen_scmversion.sh
-index 9122cd8..50ed8f9 100755
---- a/src/scmversion/gen_scmversion.sh
-+++ b/src/scmversion/gen_scmversion.sh
-@@ -10,10 +10,10 @@ else
- fi
- 
- 
--HASH=$(git rev-parse HEAD)
--BRANCH=$(git rev-parse --abbrev-ref HEAD | tr -d '\r\n')
--TAG=$(git describe --dirty | tr -d '\r\n')
--DATE=$(git log -1 --date=iso8601-strict --format=%cd)
-+HASH="@gitHash@"
-+BRANCH="@gitBranch@"
-+TAG="@gitTag@"
-+DATE="@gitDate@"
- 
- cd $CURDIR
- 

nix/steam_deck/configuration/roles/duckstation/package/003-fix-NEON-intrinsics.patch

@@ -1,70 +0,0 @@
-From 19e094e5c7aaaf375a13424044521701e85c8313 Mon Sep 17 00:00:00 2001
-From: OPNA2608 <opna2608@protonmail.com>
-Date: Thu, 9 Jan 2025 17:46:25 +0100
-Subject: [PATCH] Fix usage of NEON intrinsics
-
----
- src/common/gsvector_neon.h | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/src/common/gsvector_neon.h b/src/common/gsvector_neon.h
-index e4991af5e..61b8dc09b 100644
---- a/src/common/gsvector_neon.h
-+++ b/src/common/gsvector_neon.h
-@@ -867,7 +867,7 @@ public:
- 
-   ALWAYS_INLINE int mask() const
-   {
--    const uint32x2_t masks = vshr_n_u32(vreinterpret_u32_s32(v2s), 31);
-+    const uint32x2_t masks = vshr_n_u32(vreinterpret_u32_f32(v2s), 31);
-     return (vget_lane_u32(masks, 0) | (vget_lane_u32(masks, 1) << 1));
-   }
- 
-@@ -2882,7 +2882,7 @@ public:
-   ALWAYS_INLINE GSVector4 gt64(const GSVector4& v) const
-   {
- #ifdef CPU_ARCH_ARM64
--    return GSVector4(vreinterpretq_f32_f64(vcgtq_f64(vreinterpretq_f64_f32(v4s), vreinterpretq_f64_f32(v.v4s))));
-+    return GSVector4(vreinterpretq_f32_u64(vcgtq_f64(vreinterpretq_f64_f32(v4s), vreinterpretq_f64_f32(v.v4s))));
- #else
-     GSVector4 ret;
-     ret.U64[0] = (F64[0] > v.F64[0]) ? 0xFFFFFFFFFFFFFFFFULL : 0;
-@@ -2894,7 +2894,7 @@ public:
-   ALWAYS_INLINE GSVector4 eq64(const GSVector4& v) const
-   {
- #ifdef CPU_ARCH_ARM64
--    return GSVector4(vreinterpretq_f32_f64(vceqq_f64(vreinterpretq_f64_f32(v4s), vreinterpretq_f64_f32(v.v4s))));
-+    return GSVector4(vreinterpretq_f32_u64(vceqq_f64(vreinterpretq_f64_f32(v4s), vreinterpretq_f64_f32(v.v4s))));
- #else
-     GSVector4 ret;
-     ret.U64[0] = (F64[0] == v.F64[0]) ? 0xFFFFFFFFFFFFFFFFULL : 0;
-@@ -2906,7 +2906,7 @@ public:
-   ALWAYS_INLINE GSVector4 lt64(const GSVector4& v) const
-   {
- #ifdef CPU_ARCH_ARM64
--    return GSVector4(vreinterpretq_f32_f64(vcgtq_f64(vreinterpretq_f64_f32(v4s), vreinterpretq_f64_f32(v.v4s))));
-+    return GSVector4(vreinterpretq_f32_u64(vcgtq_f64(vreinterpretq_f64_f32(v4s), vreinterpretq_f64_f32(v.v4s))));
- #else
-     GSVector4 ret;
-     ret.U64[0] = (F64[0] < v.F64[0]) ? 0xFFFFFFFFFFFFFFFFULL : 0;
-@@ -2918,7 +2918,7 @@ public:
-   ALWAYS_INLINE GSVector4 ge64(const GSVector4& v) const
-   {
- #ifdef CPU_ARCH_ARM64
--    return GSVector4(vreinterpretq_f32_f64(vcgeq_f64(vreinterpretq_f64_f32(v4s), vreinterpretq_f64_f32(v.v4s))));
-+    return GSVector4(vreinterpretq_f32_u64(vcgeq_f64(vreinterpretq_f64_f32(v4s), vreinterpretq_f64_f32(v.v4s))));
- #else
-     GSVector4 ret;
-     ret.U64[0] = (F64[0] >= v.F64[0]) ? 0xFFFFFFFFFFFFFFFFULL : 0;
-@@ -2930,7 +2930,7 @@ public:
-   ALWAYS_INLINE GSVector4 le64(const GSVector4& v) const
-   {
- #ifdef CPU_ARCH_ARM64
--    return GSVector4(vreinterpretq_f32_f64(vcleq_f64(vreinterpretq_f64_f32(v4s), vreinterpretq_f64_f32(v.v4s))));
-+    return GSVector4(vreinterpretq_f32_u64(vcleq_f64(vreinterpretq_f64_f32(v4s), vreinterpretq_f64_f32(v.v4s))));
- #else
-     GSVector4 ret;
-     ret.U64[0] = (F64[0] <= v.F64[0]) ? 0xFFFFFFFFFFFFFFFFULL : 0;
--- 
-2.47.0
-

nix/steam_deck/configuration/roles/duckstation/package/LICENSE

@@ -1,26 +0,0 @@
-# The files in this folder are imported from nixpkg https://github.com/NixOS/nixpkgs .
-#
-# They have slight modifications to fix the package build on my home-manager systems.
-#
-# The original license is reproduced below:
-
-Copyright (c) 2003-2025 Eelco Dolstra and the Nixpkgs/NixOS contributors
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

nix/steam_deck/configuration/roles/duckstation/package/package.nix

@@ -1,147 +0,0 @@
-{
-  lib,
-  stdenv,
-  llvmPackages,
-  SDL2,
-  callPackage,
-  cmake,
-  cpuinfo,
-  cubeb,
-  curl,
-  extra-cmake-modules,
-  libXrandr,
-  libbacktrace,
-  libwebp,
-  makeWrapper,
-  ninja,
-  pkg-config,
-  qt6,
-  vulkan-loader,
-  wayland,
-  wayland-scanner,
-}:
-
-let
-  sources = callPackage ./sources.nix { };
-  inherit (qt6)
-    qtbase
-    qtsvg
-    qttools
-    qtwayland
-    wrapQtAppsHook
-    ;
-in
-llvmPackages.stdenv.mkDerivation (finalAttrs: {
-  inherit (sources.duckstation) pname version src;
-
-  patches = [
-    # Tests are not built by default
-    ./001-fix-test-inclusion.diff
-    # Patching yet another script that fills data based on git commands . . .
-    ./002-hardcode-vars.diff
-    # Fix NEON intrinsics usage
-    ./003-fix-NEON-intrinsics.patch
-    ./remove-cubeb-vendor.patch
-  ];
-
-  nativeBuildInputs = [
-    cmake
-    extra-cmake-modules
-    ninja
-    pkg-config
-    qttools
-    wayland-scanner
-    wrapQtAppsHook
-  ];
-
-  buildInputs = [
-    SDL2
-    cpuinfo
-    cubeb
-    curl
-    libXrandr
-    libbacktrace
-    libwebp
-    qtbase
-    qtsvg
-    qtwayland
-    sources.discord-rpc-patched
-    sources.lunasvg
-    sources.shaderc-patched
-    sources.soundtouch-patched
-    sources.spirv-cross-patched
-    wayland
-  ];
-
-  cmakeFlags = [
-    (lib.cmakeBool "BUILD_TESTS" true)
-  ];
-
-  strictDeps = true;
-
-  doInstallCheck = true;
-
-  postPatch = ''
-    gitHash=$(cat .nixpkgs-auxfiles/git_hash) \
-    gitBranch=$(cat .nixpkgs-auxfiles/git_branch) \
-    gitTag=$(cat .nixpkgs-auxfiles/git_tag) \
-    gitDate=$(cat .nixpkgs-auxfiles/git_date) \
-      substituteAllInPlace src/scmversion/gen_scmversion.sh
-  '';
-
-  # error: cannot convert 'int16x8_t' to '__Int32x4_t'
-  env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isAarch64 "-flax-vector-conversions";
-
-  installCheckPhase = ''
-    runHook preInstallCheck
-
-    $out/share/duckstation/common-tests
-
-    runHook postInstallCheck
-  '';
-
-  installPhase = ''
-    runHook preInstall
-
-    mkdir -p $out/bin $out/share
-
-    cp -r bin $out/share/duckstation
-    ln -s $out/share/duckstation/duckstation-qt $out/bin/
-
-    install -Dm644 $src/scripts/org.duckstation.DuckStation.desktop $out/share/applications/org.duckstation.DuckStation.desktop
-    install -Dm644 $src/scripts/org.duckstation.DuckStation.png $out/share/pixmaps/org.duckstation.DuckStation.png
-
-    runHook postInstall
-  '';
-
-  qtWrapperArgs =
-    let
-      libPath = lib.makeLibraryPath ([
-        sources.shaderc-patched
-        sources.spirv-cross-patched
-        vulkan-loader
-      ]);
-    in
-    [
-      "--prefix LD_LIBRARY_PATH : ${libPath}"
-    ];
-
-  # https://github.com/stenzek/duckstation/blob/master/scripts/appimage/apprun-hooks/default-to-x11.sh
-  # Can't avoid the double wrapping, the binary wrapper from qtWrapperArgs doesn't support --run
-  postFixup = ''
-    source "${makeWrapper}/nix-support/setup-hook"
-    wrapProgram $out/bin/duckstation-qt \
-      --run 'if [[ -z $I_WANT_A_BROKEN_WAYLAND_UI ]]; then export QT_QPA_PLATFORM=xcb; fi'
-  '';
-
-  meta = {
-    homepage = "https://github.com/stenzek/duckstation";
-    description = "Fast PlayStation 1 emulator for x86-64/AArch32/AArch64";
-    license = lib.licenses.gpl3Only;
-    mainProgram = "duckstation-qt";
-    maintainers = with lib.maintainers; [
-      guibou
-    ];
-    platforms = lib.platforms.linux;
-  };
-})

nix/steam_deck/configuration/roles/duckstation/package/remove-cubeb-vendor.patch

@@ -1,33 +0,0 @@
-diff --git a/dep/CMakeLists.txt b/dep/CMakeLists.txt
-index af35687..8347825 100644
---- a/dep/CMakeLists.txt
-+++ b/dep/CMakeLists.txt
-@@ -22,9 +22,8 @@ add_subdirectory(rcheevos EXCLUDE_FROM_ALL)
- disable_compiler_warnings_for_target(rcheevos)
- add_subdirectory(rapidyaml EXCLUDE_FROM_ALL)
- disable_compiler_warnings_for_target(rapidyaml)
--add_subdirectory(cubeb EXCLUDE_FROM_ALL)
--disable_compiler_warnings_for_target(cubeb)
--disable_compiler_warnings_for_target(speex)
-+find_package(cubeb REQUIRED GLOBAL)
-+add_library(cubeb ALIAS cubeb::cubeb)
- add_subdirectory(kissfft EXCLUDE_FROM_ALL)
- disable_compiler_warnings_for_target(kissfft)
- 
-diff --git a/src/util/cubeb_audio_stream.cpp b/src/util/cubeb_audio_stream.cpp
-index 85579c4..339190a 100644
---- a/src/util/cubeb_audio_stream.cpp
-+++ b/src/util/cubeb_audio_stream.cpp
-@@ -261,9 +261,9 @@ std::vector<std::pair<std::string, std::string>> AudioStream::GetCubebDriverName
-   std::vector<std::pair<std::string, std::string>> names;
-   names.emplace_back(std::string(), TRANSLATE_STR("AudioStream", "Default"));
- 
--  const char** cubeb_names = cubeb_get_backend_names();
--  for (u32 i = 0; cubeb_names[i] != nullptr; i++)
--    names.emplace_back(cubeb_names[i], cubeb_names[i]);
-+  cubeb_backend_names backends = cubeb_get_backend_names();
-+  for (u32 i = 0; i < backends.count; i++)
-+    names.emplace_back(backends.names[i], backends.names[i]);
-   return names;
- }
-

nix/steam_deck/configuration/roles/duckstation/package/shaderc-patched.nix

@@ -1,20 +0,0 @@
-{
-  fetchpatch,
-  duckstation,
-  shaderc,
-}:
-
-shaderc.overrideAttrs (old: {
-  pname = "shaderc-patched-for-duckstation";
-  patches = (old.patches or [ ]) ++ [
-    (fetchpatch {
-      url = "file://${duckstation.src}/scripts/shaderc-changes.patch";
-      hash = "sha256-Ps/D+CdSbjVWg3ZGOEcgbpQbCNkI5Nuizm4E5qiM9Wo=";
-      excludes = [
-        "CHANGES"
-        "CMakeLists.txt"
-        "libshaderc/CMakeLists.txt"
-      ];
-    })
-  ];
-})

nix/steam_deck/configuration/roles/duckstation/package/sources.nix

@@ -1,166 +0,0 @@
-{
-  lib,
-  duckstation,
-  fetchFromGitHub,
-  fetchpatch,
-  shaderc,
-  spirv-cross,
-  discord-rpc,
-  stdenv,
-  cmake,
-  ninja,
-}:
-
-{
-  duckstation =
-    let
-      self = {
-        pname = "duckstation";
-        version = "0.1-7465";
-        src = fetchFromGitHub {
-          owner = "stenzek";
-          repo = "duckstation";
-          rev = "aa955b8ae28314ae061613f0ddf13183a98aca03";
-          #
-          # Some files are filled by using Git commands; it requires deepClone.
-          # More info at `checkout_ref` function in nix-prefetch-git.
-          # However, `.git` is a bit nondeterministic (and Git itself makes no
-          # guarantees whatsoever).
-          # Then, in order to enhance reproducibility, what we will do here is:
-          #
-          # - Execute the desired Git commands;
-          # - Save the obtained info into files;
-          # - Remove `.git` afterwards.
-          #
-          deepClone = true;
-          postFetch = ''
-            cd $out
-            mkdir -p .nixpkgs-auxfiles/
-            git rev-parse HEAD > .nixpkgs-auxfiles/git_hash
-            git rev-parse --abbrev-ref HEAD | tr -d '\r\n' > .nixpkgs-auxfiles/git_branch
-            git describe --dirty | tr -d '\r\n' > .nixpkgs-auxfiles/git_tag
-            git log -1 --date=iso8601-strict --format=%cd > .nixpkgs-auxfiles/git_date
-            find $out -name .git -print0 | xargs -0 rm -fr
-          '';
-          hash = "sha256-ixrlr7Rm6GZAn/kh2sSeCCiK/qdmQ5+5jbbhAKjTx/E=";
-        };
-      };
-    in
-    self;
-
-  shaderc-patched = shaderc.overrideAttrs (
-    old:
-    let
-      version = "2024.3-unstable-2024-08-24";
-      src = fetchFromGitHub {
-        owner = "stenzek";
-        repo = "shaderc";
-        rev = "f60bb80e255144e71776e2ad570d89b78ea2ab4f";
-        hash = "sha256-puZxkrEVhhUT4UcCtEDmtOMX4ugkB6ooMhKRBlb++lE=";
-      };
-    in
-    {
-      pname = "shaderc-patched-for-duckstation";
-      inherit version src;
-      patches = (old.patches or [ ]);
-      cmakeFlags = (old.cmakeFlags or [ ]) ++ [
-        (lib.cmakeBool "SHADERC_SKIP_EXAMPLES" true)
-        (lib.cmakeBool "SHADERC_SKIP_TESTS" true)
-      ];
-      outputs = [
-        "out"
-        "lib"
-        "dev"
-      ];
-      postFixup = '''';
-    }
-  );
-  spirv-cross-patched = spirv-cross.overrideAttrs (
-    old:
-    let
-      version = "1.3.290.0";
-      src = fetchFromGitHub {
-        owner = "KhronosGroup";
-        repo = "SPIRV-Cross";
-        rev = "vulkan-sdk-${version}";
-        hash = "sha256-h5My9PbPq1l03xpXQQFolNy7G1RhExtTH6qPg7vVF/8=";
-      };
-    in
-    {
-      pname = "spirv-cross-patched-for-duckstation";
-      inherit version src;
-      patches = (old.patches or [ ]);
-      cmakeFlags = (old.cmakeFlags or [ ]) ++ [
-        (lib.cmakeBool "SPIRV_CROSS_CLI" false)
-        (lib.cmakeBool "SPIRV_CROSS_ENABLE_CPP" false)
-        (lib.cmakeBool "SPIRV_CROSS_ENABLE_C_API" true)
-        (lib.cmakeBool "SPIRV_CROSS_ENABLE_GLSL" true)
-        (lib.cmakeBool "SPIRV_CROSS_ENABLE_HLSL" false)
-        (lib.cmakeBool "SPIRV_CROSS_ENABLE_MSL" false)
-        (lib.cmakeBool "SPIRV_CROSS_ENABLE_REFLECT" false)
-        (lib.cmakeBool "SPIRV_CROSS_ENABLE_TESTS" false)
-        (lib.cmakeBool "SPIRV_CROSS_ENABLE_UTIL" true)
-        (lib.cmakeBool "SPIRV_CROSS_SHARED" true)
-        (lib.cmakeBool "SPIRV_CROSS_STATIC" false)
-      ];
-    }
-  );
-  discord-rpc-patched = discord-rpc.overrideAttrs (old: {
-    pname = "discord-rpc-patched-for-duckstation";
-    version = "3.4.0-unstable-2024-08-02";
-    src = fetchFromGitHub {
-      owner = "stenzek";
-      repo = "discord-rpc";
-      rev = "144f3a3f1209994d8d9e8a87964a989cb9911c1e";
-      hash = "sha256-VyL8bEjY001eHWcEoUPIAFDAmaAbwcNb1hqlV2a3cWs=";
-    };
-    patches = (old.patches or [ ]);
-  });
-
-  soundtouch-patched = stdenv.mkDerivation (finalAttrs: {
-    pname = "soundtouch-patched-for-duckstation";
-    version = "2.2.3-unstable-2024-08-02";
-    src = fetchFromGitHub {
-      owner = "stenzek";
-      repo = "soundtouch";
-      rev = "463ade388f3a51da078dc9ed062bf28e4ba29da7";
-      hash = "sha256-hvBW/z+fmh/itNsJnlDBtiI1DZmUMO9TpHEztjo2pA0=";
-    };
-
-    nativeBuildInputs = [
-      cmake
-      ninja
-    ];
-
-    meta = {
-      homepage = "https://github.com/stenzek/soundtouch";
-      description = "SoundTouch Audio Processing Library (forked from https://codeberg.org/soundtouch/soundtouch)";
-      license = lib.licenses.lgpl21;
-      platforms = lib.platforms.linux;
-    };
-
-  });
-
-  lunasvg = stdenv.mkDerivation (finalAttrs: {
-    pname = "lunasvg-patched-for-duckstation";
-    version = "2.4.1-unstable-2024-08-24";
-    src = fetchFromGitHub {
-      owner = "stenzek";
-      repo = "lunasvg";
-      rev = "9af1ac7b90658a279b372add52d6f77a4ebb482c";
-      hash = "sha256-ZzOe84ZF5JRrJ9Lev2lwYOccqtEGcf76dyCDBDTvI2o=";
-    };
-
-    nativeBuildInputs = [
-      cmake
-      ninja
-    ];
-
-    meta = {
-      homepage = "https://github.com/stenzek/lunasvg";
-      description = "Standalone SVG rendering library in C++";
-      license = lib.licenses.mit;
-      platforms = lib.platforms.linux;
-    };
-  });
-}

nix/steam_deck/configuration/roles/shipwright/default.nix

@@ -49,7 +49,6 @@ in
           (
             final: prev:
             let
-              modified_package = (pkgs.callPackage ./package/package.nix { });
               optimizeWithFlags =
                 pkg: flags:
                 pkg.overrideAttrs (old: {
@@ -58,12 +57,12 @@ in
                 });
               original_package =
                 if config.me.optimizations.enable then
-                  (optimizeWithFlags modified_package [
+                  (optimizeWithFlags prev.shipwright [
                     "-march=znver2"
                     "-mtune=znver2"
                   ])
                 else
-                  modified_package;
+                  prev.shipwright;
             in
             {
               shipwright = pkgs.buildEnv {

nix/steam_deck/configuration/roles/shipwright/package/LICENSE

@@ -1,26 +0,0 @@
-# The files in this folder are imported from nixpkg https://github.com/NixOS/nixpkgs .
-#
-# They have slight modifications to fix the package build on my home-manager systems.
-#
-# The original license is reproduced below:
-
-Copyright (c) 2003-2025 Eelco Dolstra and the Nixpkgs/NixOS contributors
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

nix/steam_deck/configuration/roles/shipwright/package/darwin-fixes.patch

@@ -1,37 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 2771ee8c..0702adad 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -250,17 +250,13 @@ endif()
- if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
- add_custom_target(CreateOSXIcons
-     COMMAND mkdir -p ${CMAKE_BINARY_DIR}/macosx/soh.iconset
--    COMMAND sips -z 16 16     ${CMAKE_SOURCE_DIR}/soh/macosx/sohIcon.png --out ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_16x16.png
--    COMMAND sips -z 32 32     ${CMAKE_SOURCE_DIR}/soh/macosx/sohIcon.png --out ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_16x16@2x.png
--    COMMAND sips -z 32 32     ${CMAKE_SOURCE_DIR}/soh/macosx/sohIcon.png --out ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_32x32.png
--    COMMAND sips -z 64 64     ${CMAKE_SOURCE_DIR}/soh/macosx/sohIcon.png --out ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_32x32@2x.png
--    COMMAND sips -z 128 128   ${CMAKE_SOURCE_DIR}/soh/macosx/sohIcon.png --out ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_128x128.png
--    COMMAND sips -z 256 256   ${CMAKE_SOURCE_DIR}/soh/macosx/sohIcon.png --out ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_128x128@2x.png
--    COMMAND sips -z 256 256   ${CMAKE_SOURCE_DIR}/soh/macosx/sohIcon.png --out ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_256x256.png
--    COMMAND sips -z 512 512   ${CMAKE_SOURCE_DIR}/soh/macosx/sohIcon.png --out ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_256x256@2x.png
--    COMMAND sips -z 512 512   ${CMAKE_SOURCE_DIR}/soh/macosx/sohIcon.png --out ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_512x512.png
--    COMMAND cp                ${CMAKE_SOURCE_DIR}/soh/macosx/sohIcon.png ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_512x512@2x.png
--    COMMAND iconutil -c icns -o ${CMAKE_BINARY_DIR}/macosx/soh.icns ${CMAKE_BINARY_DIR}/macosx/soh.iconset
-+    COMMAND convert ${CMAKE_SOURCE_DIR}/soh/macosx/sohIcon.png -resize 16x16 ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_16.png
-+    COMMAND convert ${CMAKE_SOURCE_DIR}/soh/macosx/sohIcon.png -resize 32x32 ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_32.png
-+    COMMAND convert ${CMAKE_SOURCE_DIR}/soh/macosx/sohIcon.png -resize 64x64 ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_64.png
-+    COMMAND convert ${CMAKE_SOURCE_DIR}/soh/macosx/sohIcon.png -resize 128x128 ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_128.png
-+    COMMAND convert ${CMAKE_SOURCE_DIR}/soh/macosx/sohIcon.png -resize 256x256 ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_256.png
-+    COMMAND convert ${CMAKE_SOURCE_DIR}/soh/macosx/sohIcon.png -resize 512x512 ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_512.png
-+    COMMAND png2icns ${CMAKE_BINARY_DIR}/macosx/soh.icns ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_{16,32,64,128,256,512}.png
-     WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-     COMMENT "Creating OSX icons ..."
-     )
-@@ -288,7 +284,6 @@ INSTALL(CODE "FILE(RENAME \${CMAKE_INSTALL_PREFIX}/../MacOS/soh-macos \${CMAKE_I
- 
- install(CODE "
-     include(BundleUtilities)
--    fixup_bundle(\"\${CMAKE_INSTALL_PREFIX}/../MacOS/soh\" \"\" \"${dirs}\")
-     ")
- 
- endif()

nix/steam_deck/configuration/roles/shipwright/package/disable-downloading-stb_image.patch

@@ -1,16 +0,0 @@
-Submodule libultraship contains modified content
-diff --git a/libultraship/cmake/dependencies/common.cmake b/libultraship/cmake/dependencies/common.cmake
-index 596158c..c62d7b2 100644
---- a/libultraship/cmake/dependencies/common.cmake
-+++ b/libultraship/cmake/dependencies/common.cmake
-@@ -47,10 +47,6 @@ set(stormlib_optimizations_patch git apply ${CMAKE_CURRENT_SOURCE_DIR}/cmake/dep
- endif()
- 
- #=================== STB ===================
--set(STB_DIR ${CMAKE_BINARY_DIR}/_deps/stb)
--file(DOWNLOAD "https://github.com/nothings/stb/raw/0bc88af4de5fb022db643c2d8e549a0927749354/stb_image.h" "${STB_DIR}/stb_image.h")
--file(WRITE "${STB_DIR}/stb_impl.c" "#define STB_IMAGE_IMPLEMENTATION\n#include \"stb_image.h\"")
--
- add_library(stb STATIC)
- 
- target_sources(stb PRIVATE

nix/steam_deck/configuration/roles/shipwright/package/package.nix

@@ -1,291 +0,0 @@
-{
-  apple-sdk_13,
-  stdenv,
-  cmake,
-  lsb-release,
-  ninja,
-  lib,
-  fetchFromGitHub,
-  fetchurl,
-  copyDesktopItems,
-  makeDesktopItem,
-  python3,
-  glew,
-  boost,
-  SDL2,
-  SDL2_net,
-  pkg-config,
-  libpulseaudio,
-  libpng,
-  imagemagick,
-  zenity,
-  makeWrapper,
-  darwin,
-  libicns,
-  libzip,
-  nlohmann_json,
-  tinyxml-2,
-  spdlog,
-  writeTextFile,
-  fixDarwinDylibNames,
-  applyPatches,
-}:
-
-let
-
-  # The following would normally get fetched at build time, or a specific version is required
-
-  shipwright_version = "9.0.5";
-  shipwright_src = fetchFromGitHub {
-    owner = "harbourmasters";
-    repo = "shipwright";
-    tag = shipwright_version;
-    hash = "sha256-F5d4u3Nq/+yYiOgkH/bwWPhZDxgBpJ5ktee0Hc5UmEo=";
-    fetchSubmodules = true;
-    deepClone = true;
-    postFetch = ''
-      cd $out
-      git branch --show-current > GIT_BRANCH
-      git rev-parse --short=7 HEAD > GIT_COMMIT_HASH
-      (git describe --tags --abbrev=0 --exact-match HEAD 2>/dev/null || echo "") > GIT_COMMIT_TAG
-      rm -rf .git
-    '';
-  };
-
-  gamecontrollerdb = fetchFromGitHub {
-    owner = "mdqinc";
-    repo = "SDL_GameControllerDB";
-    rev = "a74711e1e87733ccdf02d7020d8fa9e4fa67176e";
-    hash = "sha256-rXC4akz9BaKzr/C2CryZC6RGk6+fGVG7RsQryUFUUk0=";
-  };
-
-  imgui' = applyPatches {
-    src = fetchFromGitHub {
-      owner = "ocornut";
-      repo = "imgui";
-      tag = "v1.91.6-docking";
-      hash = "sha256-28wyzzwXE02W5vbEdRCw2iOF8ONkb3M3Al8XlYBvz1A=";
-    };
-    patches = [
-      "${shipwright_src}/libultraship/cmake/dependencies/patches/imgui-fixes-and-config.patch"
-    ];
-  };
-
-  libgfxd = fetchFromGitHub {
-    owner = "glankk";
-    repo = "libgfxd";
-    rev = "008f73dca8ebc9151b205959b17773a19c5bd0da";
-    hash = "sha256-AmHAa3/cQdh7KAMFOtz5TQpcM6FqO9SppmDpKPTjTt8=";
-  };
-
-  prism = fetchFromGitHub {
-    owner = "KiritoDv";
-    repo = "prism-processor";
-    rev = "fb3f8b4a2d14dfcbae654d0f0e59a73b6f6ca850";
-    hash = "sha256-gGdQSpX/TgCNZ0uyIDdnazgVHpAQhl30e+V0aVvTFMM=";
-  };
-
-  stb_impl = writeTextFile {
-    name = "stb_impl.c";
-    text = ''
-      #define STB_IMAGE_IMPLEMENTATION
-      #include "stb_image.h"
-    '';
-  };
-
-  stb' = fetchurl {
-    name = "stb_image.h";
-    url = "https://raw.githubusercontent.com/nothings/stb/0bc88af4de5fb022db643c2d8e549a0927749354/stb_image.h";
-    hash = "sha256-xUsVponmofMsdeLsI6+kQuPg436JS3PBl00IZ5sg3Vw=";
-  };
-
-  stormlib' = applyPatches {
-    src = fetchFromGitHub {
-      owner = "ladislav-zezula";
-      repo = "StormLib";
-      tag = "v9.25";
-      hash = "sha256-HTi2FKzKCbRaP13XERUmHkJgw8IfKaRJvsK3+YxFFdc=";
-    };
-    patches = [
-      "${shipwright_src}/libultraship/cmake/dependencies/patches/stormlib-optimizations.patch"
-    ];
-  };
-
-  thread_pool = fetchFromGitHub {
-    owner = "bshoshany";
-    repo = "thread-pool";
-    tag = "v4.1.0";
-    hash = "sha256-zhRFEmPYNFLqQCfvdAaG5VBNle9Qm8FepIIIrT9sh88=";
-  };
-
-  metalcpp = fetchFromGitHub {
-    owner = "briaguya-ai";
-    repo = "single-header-metal-cpp";
-    tag = "macOS13_iOS16";
-    hash = "sha256-CSYIpmq478bla2xoPL/cGYKIWAeiORxyFFZr0+ixd7I";
-  };
-in
-stdenv.mkDerivation (finalAttrs: {
-  pname = "shipwright";
-  version = shipwright_version;
-  src = shipwright_src;
-
-  patches = [
-    ./darwin-fixes.patch
-    ./disable-downloading-stb_image.patch
-  ];
-
-  nativeBuildInputs = [
-    cmake
-    ninja
-    pkg-config
-    python3
-    imagemagick
-    makeWrapper
-  ]
-  ++ lib.optionals stdenv.hostPlatform.isLinux [
-    lsb-release
-    copyDesktopItems
-  ]
-  ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    libicns
-    darwin.sigtool
-    fixDarwinDylibNames
-  ];
-
-  buildInputs = [
-    boost
-    glew
-    SDL2
-    SDL2_net
-    libpng
-    libzip
-    nlohmann_json
-    tinyxml-2
-    spdlog
-  ]
-  ++ lib.optionals stdenv.hostPlatform.isLinux [
-    libpulseaudio
-    zenity
-  ]
-  ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    # Metal.hpp requires macOS 13.x min.
-    apple-sdk_13
-  ];
-
-  cmakeFlags = [
-    (lib.cmakeBool "BUILD_REMOTE_CONTROL" true)
-    (lib.cmakeBool "NON_PORTABLE" true)
-    (lib.cmakeFeature "CMAKE_INSTALL_PREFIX" "${placeholder "out"}/lib")
-    (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_IMGUI" "${imgui'}")
-    (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_LIBGFXD" "${libgfxd}")
-    (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_PRISM" "${prism}")
-    (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_STORMLIB" "${stormlib'}")
-    (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_THREADPOOL" "${thread_pool}")
-  ]
-  ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_METALCPP" "${metalcpp}")
-    (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_SPDLOG" "${spdlog}")
-  ];
-
-  env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-Wno-int-conversion -Wno-implicit-int -Wno-elaborated-enum-base";
-
-  dontAddPrefix = true;
-
-  # Linking fails without this
-  hardeningDisable = [ "format" ];
-
-  preConfigure = ''
-    mkdir stb
-    cp ${stb'} ./stb/${stb'.name}
-    cp ${stb_impl} ./stb/${stb_impl.name}
-    substituteInPlace libultraship/cmake/dependencies/common.cmake \
-      --replace-fail "\''${STB_DIR}" "$(readlink -f ./stb)"
-  '';
-
-  postPatch = ''
-    substituteInPlace soh/src/boot/build.c.in \
-    --replace-fail "@CMAKE_PROJECT_GIT_BRANCH@" "$(cat GIT_BRANCH)" \
-    --replace-fail "@CMAKE_PROJECT_GIT_COMMIT_HASH@" "$(cat GIT_COMMIT_HASH)" \
-    --replace-fail "@CMAKE_PROJECT_GIT_COMMIT_TAG@" "$(cat GIT_COMMIT_TAG)"
-  '';
-
-  postBuild = ''
-    port_ver=$(grep CMAKE_PROJECT_VERSION: "$PWD/CMakeCache.txt" | cut -d= -f2)
-    cp ${gamecontrollerdb}/gamecontrollerdb.txt gamecontrollerdb.txt
-    mv ../libultraship/src/graphic/Fast3D/shaders ../soh/assets/custom
-    pushd ../OTRExporter
-    python3 ./extract_assets.py -z ../build/ZAPD/ZAPD.out --norom --xml-root ../soh/assets/xml --custom-assets-path ../soh/assets/custom --custom-otr-file soh.otr --port-ver $port_ver
-    popd
-  '';
-
-  preInstall = ''
-    # Cmake likes it here for its install paths
-    cp ../OTRExporter/soh.otr soh/soh.otr
-  '';
-
-  postInstall =
-    lib.optionalString stdenv.hostPlatform.isLinux ''
-      mkdir -p $out/bin
-      ln -s $out/lib/soh.elf $out/bin/soh
-      install -Dm644 ../soh/macosx/sohIcon.png $out/share/pixmaps/soh.png
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      # Recreate the macOS bundle (without using cpack)
-      # We mirror the structure of the bundle distributed by the project
-
-      mkdir -p $out/Applications/soh.app/Contents
-      cp $src/soh/macosx/Info.plist.in $out/Applications/soh.app/Contents/Info.plist
-      substituteInPlace $out/Applications/soh.app/Contents/Info.plist \
-        --replace-fail "@CMAKE_PROJECT_VERSION@" "${finalAttrs.version}"
-
-      mv $out/MacOS $out/Applications/soh.app/Contents/MacOS
-
-      # "lib" contains all resources that are in "Resources" in the official bundle.
-      # We move them to the right place and symlink them back to $out/lib,
-      # as that's where the game expects them.
-      mv $out/Resources $out/Applications/soh.app/Contents/Resources
-      mv $out/lib/** $out/Applications/soh.app/Contents/Resources
-      rm -rf $out/lib
-      ln -s $out/Applications/soh.app/Contents/Resources $out/lib
-
-      # Copy icons
-      cp -r ../build/macosx/soh.icns $out/Applications/soh.app/Contents/Resources/soh.icns
-
-      # Codesign (ad-hoc)
-      codesign -f -s - $out/Applications/soh.app/Contents/MacOS/soh
-    '';
-
-  fixupPhase = lib.optionalString stdenv.hostPlatform.isLinux ''
-    wrapProgram $out/lib/soh.elf --prefix PATH ":" ${lib.makeBinPath [ zenity ]}
-  '';
-
-  desktopItems = [
-    (makeDesktopItem {
-      name = "soh";
-      icon = "soh";
-      exec = "soh";
-      comment = finalAttrs.meta.description;
-      genericName = "Ship of Harkinian";
-      desktopName = "soh";
-      categories = [ "Game" ];
-    })
-  ];
-
-  meta = {
-    homepage = "https://github.com/HarbourMasters/Shipwright";
-    description = "PC port of Ocarina of Time with modern controls, widescreen, high-resolution, and more";
-    mainProgram = "soh";
-    platforms = lib.platforms.linux ++ lib.platforms.darwin;
-    maintainers = with lib.maintainers; [
-      j0lol
-      matteopacini
-    ];
-    license = with lib.licenses; [
-      # OTRExporter, OTRGui, ZAPDTR, libultraship
-      mit
-      # Ship of Harkinian itself
-      unfree
-    ];
-  };
-})

nix/steam_deck/configuration/roles/spaghettikart/default.nix

@@ -1,89 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-
-let
-  steam_spaghettikart = pkgs.writeScriptBin "steam_Spaghettify" ''
-    export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${pkgs.libglvnd}/lib"
-    exec ${pkgs.spaghettikart}/bin/Spaghettify "''${@}"
-  '';
-in
-{
-  imports = [ ];
-
-  options.me = {
-    spaghettikart.enable = lib.mkOption {
-      type = lib.types.bool;
-      default = false;
-      example = true;
-      description = "Whether we want to install spaghettikart.";
-    };
-  };
-
-  config = lib.mkIf config.me.spaghettikart.enable (
-    lib.mkMerge [
-      {
-        allowedUnfree = [ "spaghettikart" ];
-      }
-      (lib.mkIf config.me.graphical {
-        home.packages = with pkgs; [
-          spaghettikart
-          steam_spaghettikart
-        ];
-
-        home.file.".local/share/spaghettikart/spaghettify.cfg.json" = {
-          source = ./files/spaghettify.cfg.json;
-        };
-
-        home.persistence."/home/deck/.persist" = {
-          files = [
-            ".local/share/spaghettikart/default.sav"
-            ".local/share/spaghettikart/mk64.o2r"
-          ];
-        };
-
-        nixpkgs.overlays = [
-          (
-            final: prev:
-            let
-              modified_package = (pkgs.callPackage ./package/package.nix { });
-              optimizeWithFlags =
-                pkg: flags:
-                pkg.overrideAttrs (old: {
-                  NIX_CFLAGS_COMPILE = [ (old.NIX_CFLAGS_COMPILE or "") ] ++ flags;
-                });
-              original_package =
-                if config.me.optimizations.enable then
-                  (optimizeWithFlags modified_package [
-                    "-march=znver2"
-                    "-mtune=znver2"
-                  ])
-                else
-                  modified_package;
-            in
-            {
-              spaghettikart = pkgs.buildEnv {
-                name = prev.spaghettikart.name;
-                paths = [
-                  (config.lib.nixGL.wrap original_package)
-                ];
-                extraOutputsToInstall = [
-                  "man"
-                  "doc"
-                  "info"
-                ];
-                # We have to use 555 instead of the normal 444 here because the .desktop file ends up inside $HOME on steam deck and desktop files must be either not in $HOME or must be executable, otherwise KDE Plasma refuses to execute them.
-                postBuild = ''
-                  chmod 0555 $out/share/applications/spaghettikart.desktop
-                '';
-              };
-            }
-          )
-        ];
-      })
-    ]
-  );
-}

nix/steam_deck/configuration/roles/spaghettikart/files/spaghettify.cfg.json

@@ -1,14 +0,0 @@
-{
-  "CVars": {
-    "gDisableLod": 1,
-    "gMSAAValue": 2,
-    "gShowSpaghettiVersion": 0,
-    "gSkipIntro": 1,
-    "gVsyncEnabled": 1
-  },
-  "Window": {
-    "Fullscreen": {
-      "Enabled": true
-    }
-  }
-}

nix/steam_deck/configuration/roles/spaghettikart/package/LICENSE

@@ -1,26 +0,0 @@
-# The files in this folder are imported from nixpkg https://github.com/NixOS/nixpkgs .
-#
-# They have slight modifications to fix the package build on my home-manager systems.
-#
-# The original license is reproduced below:
-
-Copyright (c) 2003-2025 Eelco Dolstra and the Nixpkgs/NixOS contributors
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

nix/steam_deck/configuration/roles/spaghettikart/package/dont-fetch-stb.patch

@@ -1,16 +0,0 @@
-Submodule libultraship contains modified content
-diff --git a/libultraship/cmake/dependencies/common.cmake b/libultraship/cmake/dependencies/common.cmake
-index 596158c..c62d7b2 100644
---- a/libultraship/cmake/dependencies/common.cmake
-+++ b/libultraship/cmake/dependencies/common.cmake
-@@ -47,10 +47,6 @@ set(stormlib_optimizations_patch git apply ${CMAKE_CURRENT_SOURCE_DIR}/cmake/dep
- endif()
- 
- #=================== STB ===================
--set(STB_DIR ${CMAKE_BINARY_DIR}/_deps/stb)
--file(DOWNLOAD "https://github.com/nothings/stb/raw/0bc88af4de5fb022db643c2d8e549a0927749354/stb_image.h" "${STB_DIR}/stb_image.h")
--file(WRITE "${STB_DIR}/stb_impl.c" "#define STB_IMAGE_IMPLEMENTATION\n#include \"stb_image.h\"")
--
- add_library(stb STATIC)
- 
- target_sources(stb PRIVATE