Still not working.

Same issue with package based on 2ship2harkinian.
Add a package for starship (Star Fox 64).
2025-01-27 20:38:45 -05:00 · 2025-01-27 19:26:38 -05:00 · 2025-01-27 19:26:38 -05:00
73 changed files with 405 additions and 3207 deletions
--- a/nix/configuration/configuration.nix
+++ b/nix/configuration/configuration.nix
@@ -63,14 +63,6 @@
    ./roles/shipwright
    ./roles/2ship2harkinian
    ./roles/nix_index
-    ./roles/flux
-    ./roles/tekton
-    ./roles/gnuplot
-    ./roles/sops
-    ./roles/gcloud
-    ./roles/steam_run_free
-    ./roles/pcsx2
-    ./roles/hydra
  ];

  nix.settings.experimental-features = [
@@ -119,14 +111,6 @@
      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
@@ -168,12 +152,6 @@
    ncdu
    nix-tree
    libarchive # bsdtar
-    lsof
-    doas-sudo-shim # To support --use-remote-sudo for remote builds
-    dmidecode # Read SMBIOS information.
-    ipcalc
-    gptfdisk # for cgdisk
-    nix-output-monitor # For better view into nixos-rebuild
  ];

  services.openssh = {
--- a/nix/configuration/flake.lock
+++ b/nix/configuration/flake.lock
@@ -135,11 +135,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1742588233,
-        "narHash": "sha256-Fi5g8H5FXMSRqy+mU6gPG0v+C9pzjYbkkiePtz8+PpA=",
+        "lastModified": 1737762889,
+        "narHash": "sha256-5HGG09bh/Yx0JA8wtBMAzt0HMCL1bYZ93x4IqzVExio=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "296ddc64627f4a6a4eb447852d7346b9dd16197d",
+        "rev": "daf04c5950b676f47a794300657f1d3d14c1a120",
        "type": "github"
      },
      "original": {
@@ -191,11 +191,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1742422364,
-        "narHash": "sha256-mNqIplmEohk5jRkqYqG19GA8MbQ/D4gQSK0Mu4LvfRQ=",
+        "lastModified": 1737885589,
+        "narHash": "sha256-Zf0hSrtzaM1DEz8//+Xs51k/wdSajticVrATqDrfQjg=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "a84ebe20c6bc2ecbcfb000a50776219f48d134cc",
+        "rev": "852ff1d9e153d8875a83602e03fdef8a63f0ecf8",
        "type": "github"
      },
      "original": {
@@ -237,22 +237,6 @@
        "type": "github"
      }
    },
-    "nixpkgs-unoptimized": {
-      "locked": {
-        "lastModified": 1742422364,
-        "narHash": "sha256-mNqIplmEohk5jRkqYqG19GA8MbQ/D4gQSK0Mu4LvfRQ=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "a84ebe20c6bc2ecbcfb000a50776219f48d134cc",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
    "pre-commit-hooks-nix": {
      "inputs": {
        "flake-compat": [
@@ -288,7 +272,6 @@
        "lanzaboote": "lanzaboote",
        "nixpkgs": "nixpkgs",
        "nixpkgs-b93b4e9b5": "nixpkgs-b93b4e9b5",
-        "nixpkgs-unoptimized": "nixpkgs-unoptimized",
        "zsh-histdb": "zsh-histdb"
      }
    },
--- a/nix/configuration/flake.nix
+++ b/nix/configuration/flake.nix
@@ -3,7 +3,7 @@
 #   output: result/iso/nixos.iso

 # Run the ISO image
-#   doas "$(nix-build '<nixpkgs>' --no-out-link -A 'qemu')/bin/qemu-system-x86_64" \
+#   "$(nix-build '<nixpkgs>' --no-out-link -A 'qemu')/bin/qemu-system-x86_64" \
 #        -accel kvm \
 #        -cpu host \
 #        -smp cores=8 \
@@ -12,7 +12,7 @@
 #        -drive if=pflash,format=raw,file="/tmp/OVMF_VARS.fd" \
 #        -nic user,hostfwd=tcp::60022-:22 \
 #        -boot order=d \
-#        -cdrom "$(readlink -f ./result/iso/nixos*.iso)" \
+#        -cdrom "$(readlink -f ./result/iso/nixos.iso)" \
 #        -display vnc=127.0.0.1:0
 #
 # doas cp "$(nix-build '<nixpkgs>' --no-out-link -A 'OVMF.fd')/FV/OVMF_VARS.fd" /tmp/OVMF_VARS.fd
@@ -32,7 +32,6 @@
    impermanence.url = "github:nix-community/impermanence";
    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
    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 = {
@@ -59,7 +58,6 @@
    {
      self,
      nixpkgs,
-      nixpkgs-unoptimized,
      nixpkgs-b93b4e9b5,
      impermanence,
      home-manager,
@@ -75,11 +73,6 @@
          pkgs-b93b4e9b5 = import nixpkgs-b93b4e9b5 {
            inherit system;
          };
-          pkgs-unoptimized = import nixpkgs-unoptimized {
-            inherit system;
-            hostPlatform.gcc.arch = "default";
-            hostPlatform.gcc.tune = "default";
-          };
        };
        modules = [
          impermanence.nixosModules.impermanence
@@ -149,30 +142,6 @@
            }
          );
        };
-        hydra = {
-          main = nixpkgs.lib.nixosSystem (
-            base_x86_64_linux
-            // {
-              modules = base_x86_64_linux.modules ++ [
-                ./hosts/hydra
-              ];
-            }
-          );
-          iso = nixpkgs.lib.nixosSystem (
-            base_x86_64_linux
-            // {
-              modules = base_x86_64_linux.modules ++ [
-                ./hosts/hydra
-                (nixpkgs + "/nixos/modules/installer/cd-dvd/iso-image.nix")
-                {
-                  isoImage.makeEfiBootable = true;
-                  isoImage.makeUsbBootable = true;
-                  me.buildingIso = true;
-                }
-              ];
-            }
-          );
-        };
      };
    in
    {
@@ -180,7 +149,5 @@
      iso.odo = systems.odo.iso.config.system.build.isoImage;
      nixosConfigurations.neelix = systems.neelix.main;
      iso.neelix = systems.neelix.iso.config.system.build.isoImage;
-      nixosConfigurations.hydra = systems.hydra.main;
-      iso.hydra = systems.hydra.iso.config.system.build.isoImage;
    };
 }
--- a/nix/configuration/flakes/starship-game/flake.lock
+++ b/nix/configuration/flakes/starship-game/flake.lock
@@ -0,0 +1,61 @@
+{
+  "nodes": {
+    "flake-utils": {
+      "inputs": {
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1735141468,
+        "narHash": "sha256-VIAjBr1qGcEbmhLwQJD6TABppPMggzOvqFsqkDoMsAY=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "4005c3ff7505313cbc21081776ad0ce5dfd7a3ce",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-24.11",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "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",
+  "version": 7
+}
--- a/nix/configuration/flakes/starship-game/flake.nix
+++ b/nix/configuration/flakes/starship-game/flake.nix
@@ -0,0 +1,34 @@
+{
+  description = "A slightly better history for zsh";
+  inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
+  inputs.flake-utils.url = "github:numtide/flake-utils";
+
+  outputs =
+    {
+      self,
+      nixpkgs,
+      flake-utils,
+      ...
+    }:
+    let
+      out =
+        system:
+        let
+          pkgs = nixpkgs.legacyPackages.${system};
+          # Maybe pkgs = import nixpkgs { inherit system; }; ?
+          appliedOverlay = self.overlays.default pkgs pkgs;
+        in
+        {
+          packages = rec {
+            default = starship-game;
+            starship-game = appliedOverlay.starship-game;
+          };
+        };
+    in
+    flake-utils.lib.eachDefaultSystem out
+    // {
+      overlays.default = final: prev: {
+        starship-game = final.callPackage ./package.nix { };
+      };
+    };
+}
--- a/nix/configuration/flakes/starship-game/package.nix
+++ b/nix/configuration/flakes/starship-game/package.nix
@@ -0,0 +1,261 @@
+{
+  lib,
+  stdenv,
+  SDL2,
+  cmake,
+  copyDesktopItems,
+  fetchFromGitHub,
+  fetchpatch,
+  fetchurl,
+  imagemagick,
+  imgui,
+  libpng,
+  libpulseaudio,
+  libzip,
+  lsb-release,
+  makeDesktopItem,
+  makeWrapper,
+  ninja,
+  nlohmann_json,
+  pkg-config,
+  python3,
+  spdlog,
+  stormlib,
+  tinyxml-2,
+  writeTextFile,
+  zenity,
+}:
+
+let
+
+  # This would get fetched at build time otherwise, see:
+  # https://github.com/HarbourMasters/2ship2harkinian/blob/1.0.2/mm/CMakeLists.txt#L708
+  gamecontrollerdb = fetchurl {
+    name = "gamecontrollerdb.txt";
+    url = "https://raw.githubusercontent.com/gabomdq/SDL_GameControllerDB/b1759cf84028aab89caa1c395e198c340b8dfd89/gamecontrollerdb.txt";
+    hash = "sha256-7C5EkqBIhLGNJuhi3832y0ffW5Ep7iuTYXb1bL5h2Js=";
+  };
+
+  # 2ship needs a specific imgui version
+  imgui' = imgui.overrideAttrs rec {
+    version = "1.90.6";
+    src = fetchFromGitHub {
+      owner = "ocornut";
+      repo = "imgui";
+      rev = "v${version}-docking";
+      hash = "sha256-Y8lZb1cLJF48sbuxQ3vXq6GLru/WThR78pq7LlORIzc=";
+    };
+  };
+
+  libgfxd = fetchFromGitHub {
+    owner = "glankk";
+    repo = "libgfxd";
+    rev = "96fd3b849f38b3a7c7b7f3ff03c5921d328e6cdf";
+    hash = "sha256-dedZuV0BxU6goT+rPvrofYqTz9pTA/f6eQcsvpDWdvQ=";
+  };
+
+  yaml_cpp = fetchFromGitHub {
+    owner = "jbeder";
+    repo = "yaml-cpp";
+    rev = "f7320141120f720aecc4c32be25586e7da9eb978";
+    hash = "sha256-J87oS6Az1/vNdyXu3L7KmUGWzU0IAkGrGMUUha+xDXI=";
+  };
+
+  # spdlog = fetchFromGitHub {
+  #   owner = "gabime";
+  #   repo = "spdlog";
+  #   rev = "7e635fca68d014934b4af8a1cf874f63989352b7";
+  #   hash = "sha256-cxTaOuLXHRU8xMz9gluYz0a93O0ez2xOxbloyc1m1ns=";
+  # };
+
+  # 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=";
+  # };
+
+  # Apply 2ship's patch for stormlib
+  stormlib' = stormlib.overrideAttrs (prev: rec {
+    version = "9.25";
+    src = fetchFromGitHub {
+      owner = "ladislav-zezula";
+      repo = "StormLib";
+      rev = "v${version}";
+      hash = "sha256-HTi2FKzKCbRaP13XERUmHkJgw8IfKaRJvsK3+YxFFdc=";
+    };
+    nativeBuildInputs = prev.nativeBuildInputs ++ [ pkg-config ];
+    patches = (prev.patches or [ ]) ++ [
+      (fetchpatch {
+        name = "stormlib-optimizations.patch";
+        url = "https://github.com/briaguya-ai/StormLib/commit/ff338b230544f8b2bb68d2fbe075175ed2fd758c.patch";
+        hash = "sha256-Jbnsu5E6PkBifcx/yULMVC//ab7tszYgktS09Azs5+4=";
+      })
+    ];
+  });
+
+  thread_pool = fetchFromGitHub {
+    owner = "bshoshany";
+    repo = "thread-pool";
+    rev = "v4.1.0";
+    hash = "sha256-zhRFEmPYNFLqQCfvdAaG5VBNle9Qm8FepIIIrT9sh88=";
+  };
+
+in
+stdenv.mkDerivation (finalAttrs: {
+  pname = "starship-game";
+  version = "v1.0.0";
+
+  src = fetchFromGitHub {
+    owner = "HarbourMasters";
+    repo = "starship";
+    # rev = "5e5e49da93e066f51c3010ba38f09331d866f2db";
+    tag = finalAttrs.version;
+    hash = "sha256-kaLLlLuonqE2DJcRlWR4tCEBNjwIYFlzeDLcYsvMO7I=";
+    fetchSubmodules = true;
+  };
+
+  # patches = [
+  #   # remove fetching stb as we will patch our own
+  #   ./0001-deps.patch
+  # ];
+
+  nativeBuildInputs = [
+    cmake
+    copyDesktopItems
+    imagemagick
+    lsb-release
+    makeWrapper
+    ninja
+    pkg-config
+    python3
+  ];
+
+  buildInputs = [
+    SDL2
+    imgui'
+    libpng
+    libpulseaudio
+    libzip
+    nlohmann_json
+    spdlog
+    stormlib'
+    tinyxml-2
+    zenity
+  ];
+
+  cmakeFlags = [
+    (lib.cmakeBool "NON_PORTABLE" true)
+    (lib.cmakeFeature "CMAKE_INSTALL_PREFIX" "${placeholder "out"}/starship-game")
+    (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_IMGUI" "${imgui'.src}")
+    (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_LIBGFXD" "${libgfxd}")
+    (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_STORMLIB" "${stormlib'}")
+    (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_THREADPOOL" "${thread_pool}")
+  ];
+
+  dontAddPrefix = true;
+
+  # Linking fails without this
+  hardeningDisable = [ "format" ];
+
+  # Pie needs to be enabled or else it segfaults
+  hardeningEnable = [ "pie" ];
+
+  # preConfigure = ''
+  #   # mirror 2ship's stb
+  #   mkdir stb
+  #   cp ${stb'} ./stb/${stb'.name}
+  #   cp ${stb_impl} ./stb/${stb_impl.name}
+
+  #   substituteInPlace libultraship/cmake/dependencies/common.cmake \
+  #     --replace-fail "\''${STB_DIR}" "/build/source/stb"
+  # '';
+
+  # (cd tools/Torch && cmake -H. -Bbuild-cmake -GNinja \
+  # -DFETCHCONTENT_SOURCE_DIR_LIBGFXD=${libgfxd} \
+  # -DFETCHCONTENT_SOURCE_DIR_YAML-CPP=${finalAttrs.yaml_cpp_src} \
+  # -DFETCHCONTENT_SOURCE_DIR_SPDLOG=${finalAttrs.spdlog_src}
+  # )
+
+  configurePhase = ''
+    cmake -H. -Bbuild-cmake -GNinja \
+    -DFETCHCONTENT_SOURCE_DIR_IMGUI=${imgui'.src} \
+    -DFETCHCONTENT_SOURCE_DIR_STORMLIB=${stormlib'} \
+    -DFETCHCONTENT_SOURCE_DIR_THREADPOOL=${thread_pool}
+
+    (cd tools/Torch && cmake -H. -Bbuild-cmake -GNinja \
+    -DFETCHCONTENT_SOURCE_DIR_LIBGFXD=${libgfxd} \
+    -DFETCHCONTENT_SOURCE_DIR_YAML-CPP=${yaml_cpp} \
+    -DFETCHCONTENT_SOURCE_DIR_SPDLOG=${spdlog}
+    )
+
+    (cd libultraship && cmake -H. -Bbuild-cmake -GNinja \
+    -DFETCHCONTENT_SOURCE_DIR_LIBGFXD=${libgfxd} \
+    -DFETCHCONTENT_SOURCE_DIR_IMGUI=${imgui'.src} \
+    -DFETCHCONTENT_SOURCE_DIR_STORMLIB=${stormlib'} \
+    -DFETCHCONTENT_SOURCE_DIR_THREADPOOL=${thread_pool}
+    )
+
+  '';
+
+  buildPhase = ''
+    cmake --build build-cmake
+  '';
+
+  postBuild = ''
+    cp ${gamecontrollerdb} ${gamecontrollerdb.name}
+    pushd ../OTRExporter
+    python3 ./extract_assets.py -z ../build/ZAPD/ZAPD.out --norom --xml-root ../mm/assets/xml --custom-assets-path ../mm/assets/custom --custom-otr-file 2ship.o2r --port-ver ${finalAttrs.version}
+    popd
+  '';
+
+  preInstall = ''
+    # Cmake likes it here for its install paths
+    cp ../OTRExporter/2ship.o2r mm/
+  '';
+
+  postInstall = ''
+    mkdir -p $out/bin
+    ln -s $out/2s2h/2s2h.elf $out/bin/2s2h
+    install -Dm644 ../mm/linux/2s2hIcon.png $out/share/pixmaps/2s2h.png
+  '';
+
+  postFixup = ''
+    wrapProgram $out/2s2h/2s2h.elf --prefix PATH ":" ${lib.makeBinPath [ zenity ]}
+  '';
+
+  desktopItems = [
+    (makeDesktopItem {
+      name = "starship";
+      icon = "starship";
+      exec = "starship";
+      comment = finalAttrs.meta.description;
+      genericName = "Starship";
+      desktopName = "starship";
+      categories = [ "Game" ];
+    })
+  ];
+
+  meta = {
+    homepage = "https://github.com/HarbourMasters/2ship2harkinian";
+    description = "A PC port of Majora's Mask with modern controls, widescreen, high-resolution, and more";
+    mainProgram = "starship";
+    platforms = [ "x86_64-linux" ];
+    maintainers = with lib.maintainers; [ ];
+    license = with lib.licenses; [
+      # # OTRExporter, OTRGui, ZAPDTR, libultraship
+      # mit
+      # # 2 Ship 2 Harkinian
+      # cc0
+      # # Reverse engineering
+      # unfree
+    ];
+  };
+})
--- a/nix/configuration/hosts/hydra/default.nix
+++ b/nix/configuration/hosts/hydra/default.nix
@@ -1,56 +0,0 @@
-#
-# Testing:
-# doas "$(nix-build '<nixpkgs>' --no-out-link -A 'qemu')/bin/qemu-system-x86_64" \
-#      -accel kvm \
-#      -cpu host \
-#      -smp cores=8 \
-#      -m 32768 \
-#      -drive "file=$(nix-build '<nixpkgs>' --no-out-link -A 'OVMF.fd')/FV/OVMF.fd,if=pflash,format=raw,readonly=on" \
-#      -drive file=/tmp/localdisk.img,if=none,id=nvm,format=raw \
-#      -device nvme,serial=deadbeef,drive=nvm \
-#      -nic user,hostfwd=tcp::60022-:22 \
-#      -boot order=d \
-#      -cdrom "$(readlink -f /persist/machine_setup/nix/configuration/result/iso/nixos*.iso)" \
-#      -display vnc=127.0.0.1:0
-#
-
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-{
-  imports = [
-    ./disk-config.nix
-    ./hardware-configuration.nix
-    ./optimized_build.nix
-    ./vm_disk.nix
-  ];
-
-  # Generate with `head -c4 /dev/urandom | od -A none -t x4`
-  networking.hostId = "fbd233d8";
-
-  networking.hostName = "hydra"; # Define your hostname.
-
-  time.timeZone = "America/New_York";
-  i18n.defaultLocale = "en_US.UTF-8";
-
-  me.secureBoot.enable = false;
-
-  # Mount tmpfs at /tmp
-  boot.tmp.useTmpfs = true;
-
-  me.emacs_flavor = "plainmacs";
-  me.graphical = false;
-  me.hydra.enable = false;
-  me.vm_disk.enable = true;
-  me.wireguard.activated = [ ];
-  me.wireguard.deactivated = [ ];
-  me.zsh.enable = true;
-
-  # Trust this key so nix running as root can ssh into hydra.
-  users.users.talexander.openssh.authorizedKeys.keys = [
-    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIB/IlYTQ0M5pFN5tdoswh37CDl/gbULI3h+SsKXCansh talexander@odo"
-  ];
-}
--- a/nix/configuration/hosts/hydra/disk-config.nix
+++ b/nix/configuration/hosts/hydra/disk-config.nix
@@ -1,140 +0,0 @@
-# Manual Step:
-#   Check if drive supports 4kn: nvme id-ns -H /dev/nvme0n1
-#   Format the drive to 4kn: nvme format --lbaf=1 /dev/nvme0n1
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-
-lib.mkIf (!config.me.buildingIso) {
-  disko.devices = {
-    disk = {
-      main = {
-        type = "disk";
-        device = "/dev/nvme0n1";
-        content = {
-          type = "gpt";
-          partitions = {
-            ESP = {
-              size = "1G";
-              type = "EF00";
-              content = {
-                type = "filesystem";
-                format = "vfat";
-                mountpoint = "/boot";
-                mountOptions = [
-                  "umask=0077"
-                  "noatime"
-                  "discard"
-                ];
-              };
-            };
-            zfs = {
-              size = "100%";
-              content = {
-                type = "zfs";
-                pool = "zroot";
-              };
-            };
-          };
-        };
-      };
-    };
-    zpool = {
-      zroot = {
-        type = "zpool";
-        # mode = "mirror";
-        # Workaround: cannot import 'zroot': I/O error in disko tests
-        options.cachefile = "none";
-        options = {
-          ashift = "12";
-          compatibility = "openzfs-2.2-freebsd";
-          autotrim = "on";
-        };
-        rootFsOptions = {
-          acltype = "posixacl";
-          atime = "off";
-          relatime = "off";
-          xattr = "sa";
-          mountpoint = "none";
-          compression = "lz4";
-          canmount = "off";
-          utf8only = "on";
-          dnodesize = "auto";
-          normalization = "formD";
-        };
-
-        datasets = {
-          "linux/nix" = {
-            type = "zfs_fs";
-            options.mountpoint = "none";
-          };
-          "linux/nix/root" = {
-            type = "zfs_fs";
-            options.mountpoint = "legacy";
-            mountpoint = "/";
-            postCreateHook = "zfs list -t snapshot -H -o name | grep -E '^zroot/linux/nix/root@blank$' || zfs snapshot zroot/linux/nix/root@blank";
-          };
-          "linux/nix/nix" = {
-            type = "zfs_fs";
-            options.mountpoint = "legacy";
-            mountpoint = "/nix";
-            postCreateHook = "zfs list -t snapshot -H -o name | grep -E '^zroot/linux/nix/nix@blank$' || zfs snapshot zroot/linux/nix/nix@blank";
-            options = {
-              recordsize = "1MiB";
-              compression = "lz4";
-            };
-          };
-          "linux/nix/home" = {
-            type = "zfs_fs";
-            options.mountpoint = "legacy";
-            mountpoint = "/home";
-            postCreateHook = "zfs list -t snapshot -H -o name | grep -E '^zroot/linux/nix/home@blank$' || zfs snapshot zroot/linux/nix/home@blank";
-          };
-          "linux/nix/persist" = {
-            type = "zfs_fs";
-            options.mountpoint = "legacy";
-            mountpoint = "/persist";
-            postCreateHook = "zfs list -t snapshot -H -o name | grep -E '^zroot/linux/nix/persist@blank$' || zfs snapshot zroot/linux/nix/persist@blank";
-          };
-          "linux/nix/state" = {
-            type = "zfs_fs";
-            options.mountpoint = "legacy";
-            mountpoint = "/state";
-            postCreateHook = "zfs list -t snapshot -H -o name | grep -E '^zroot/linux/nix/state@blank$' || zfs snapshot zroot/linux/nix/state@blank";
-          };
-        };
-      };
-    };
-  };
-
-  # Make sure all persistent volumes are marked as neededForBoot
-  #
-  # Also mounts /home so it is mounted before the user home directories are created.
-  fileSystems."/persist".neededForBoot = true;
-  fileSystems."/state".neededForBoot = true;
-  fileSystems."/home".neededForBoot = true;
-
-  fileSystems."/".options = [
-    "noatime"
-    "norelatime"
-  ];
-  fileSystems."/nix".options = [
-    "noatime"
-    "norelatime"
-  ];
-  fileSystems."/persist".options = [
-    "noatime"
-    "norelatime"
-  ];
-  fileSystems."/state".options = [
-    "noatime"
-    "norelatime"
-  ];
-  fileSystems."/home".options = [
-    "noatime"
-    "norelatime"
-  ];
-}
--- a/nix/configuration/hosts/hydra/hardware-configuration.nix
+++ b/nix/configuration/hosts/hydra/hardware-configuration.nix
@@ -1,39 +0,0 @@
-# Do not modify this file!  It was generated by ‘nixos-generate-config’
-# and may be overwritten by future invocations.  Please make changes
-# to /etc/nixos/configuration.nix instead.
-{
-  config,
-  lib,
-  pkgs,
-  modulesPath,
-  ...
-}:
-
-{
-  imports = [
-    (modulesPath + "/installer/scan/not-detected.nix")
-  ];
-
-  boot.initrd.availableKernelModules = [
-    "xhci_pci"
-    "nvme"
-    "usbhid"
-    "usb_storage"
-    "sd_mod"
-    "sdhci_pci"
-  ];
-  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ ];
-  boot.extraModulePackages = [ ];
-
-  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
-  # (the default) this is the recommended approach. When using systemd-networkd it's
-  # still possible to use this option, but it's recommended to use it in conjunction
-  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
-  networking.dhcpcd.enable = lib.mkForce true;
-  networking.useDHCP = lib.mkForce true;
-  networking.interfaces.enp0s2.useDHCP = lib.mkForce true;
-  # systemd.network.enable = true;
-
-  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-}
--- a/nix/configuration/hosts/hydra/optimized_build.nix
+++ b/nix/configuration/hosts/hydra/optimized_build.nix
@@ -1,88 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-{
-  imports = [ ];
-
-  config = lib.mkMerge [
-    {
-      nix.settings.system-features = lib.mkForce [
-        "gccarch-znver4"
-        "gccarch-x86-64-v3"
-        "gccarch-x86-64-v4"
-        "benchmark"
-        "big-parallel"
-        # "kvm"
-        # "nixos-test"
-      ];
-    }
-    (lib.mkIf (!config.me.buildingIso) {
-      nix.settings.system-features = lib.mkForce [
-        "gccarch-znver4"
-        "gccarch-x86-64-v3"
-        "gccarch-x86-64-v4"
-        "benchmark"
-        "big-parallel"
-        # "kvm"
-        # "nixos-test"
-      ];
-
-      # nixpkgs.hostPlatform = {
-      #   gcc.arch = "alderlake";
-      #   gcc.tune = "alderlake";
-      #   system = "x86_64-linux";
-      # };
-
-      nixpkgs.overlays = [
-        (
-          final: prev:
-          let
-            optimizeWithFlags =
-              pkg: flags:
-              pkg.overrideAttrs (old: {
-                NIX_CFLAGS_COMPILE = [ (old.NIX_CFLAGS_COMPILE or "") ] ++ flags;
-              });
-            addConfig =
-              additionalConfig: pkg:
-              pkg.override (oldconfig: {
-                structuredExtraConfig = pkg.structuredExtraConfig // additionalConfig;
-              });
-          in
-          {
-            linux_znver4 =
-              addConfig
-                {
-                  # Full preemption
-                  PREEMPT = lib.mkOverride 60 lib.kernel.yes;
-                  PREEMPT_VOLUNTARY = lib.mkOverride 60 lib.kernel.no;
-
-                  # Google's BBRv3 TCP congestion Control
-                  TCP_CONG_BBR = lib.kernel.yes;
-                  DEFAULT_BBR = lib.kernel.yes;
-
-                  # Preemptive Full Tickless Kernel at 300Hz
-                  HZ = lib.kernel.freeform "300";
-                  HZ_300 = lib.kernel.yes;
-                  HZ_1000 = lib.kernel.no;
-                }
-                (
-                  optimizeWithFlags prev.linux_6_13 [
-                    "-march=znver4"
-                    "-mtune=znver4"
-                  ]
-                );
-          }
-        )
-      ];
-
-      boot.kernelPackages = pkgs.linuxPackagesFor pkgs.linux_znver4;
-    })
-    (lib.mkIf (config.me.buildingIso) {
-      boot.kernelPackages = pkgs.linuxPackagesFor pkgs.linux_6_13;
-      boot.supportedFilesystems = [ "zfs" ];
-    })
-  ];
-}
--- a/nix/configuration/hosts/hydra/vm_disk.nix
+++ b/nix/configuration/hosts/hydra/vm_disk.nix
@@ -1,77 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-
-{
-  imports = [ ];
-
-  options.me = {
-    vm_disk.enable = lib.mkOption {
-      type = lib.types.bool;
-      default = false;
-      example = true;
-      description = "Whether we want to mount the local disk for persistent storage.";
-    };
-  };
-
-  config = lib.mkIf config.me.vm_disk.enable (
-    lib.mkMerge [
-      {
-        # Mount the local disk
-        fileSystems = {
-          "/.disk" = lib.mkForce {
-            device = "/dev/nvme0n1p1";
-            fsType = "ext4";
-            options = [
-              "noatime"
-              "discard"
-            ];
-            neededForBoot = true;
-          };
-
-          "/persist" = {
-            fsType = "none";
-            device = "/.disk/persist";
-            options = [
-              "bind"
-              "rw"
-            ];
-            depends = [
-              "/.disk/persist"
-            ];
-          };
-
-          "/state" = {
-            fsType = "none";
-            device = "/.disk/state";
-            options = [
-              "bind"
-              "rw"
-            ];
-            depends = [
-              "/.disk/state"
-            ];
-          };
-
-          "/nix/store" = lib.mkForce {
-            fsType = "overlay";
-            device = "overlay";
-            options = [
-              "lowerdir=/nix/.ro-store"
-              "upperdir=/.disk/persist/store"
-              "workdir=/.disk/state/work"
-            ];
-            depends = [
-              "/nix/.ro-store"
-              "/.disk/persist/store"
-              "/.disk/state/work"
-            ];
-          };
-        };
-      }
-    ]
-  );
-}
--- a/nix/configuration/hosts/neelix/default.nix
+++ b/nix/configuration/hosts/neelix/default.nix
@@ -21,7 +21,7 @@
  boot.initrd.kernelModules = [ "i915" ];

  # Mount tmpfs at /tmp
-  # boot.tmp.useTmpfs = true;
+  boot.tmp.useTmpfs = true;

  me.bluetooth.enable = true;
  me.emacs_flavor = "plainmacs";
--- a/nix/configuration/hosts/odo/default.nix
+++ b/nix/configuration/hosts/odo/default.nix
@@ -1,19 +1,12 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
+{ config, pkgs, ... }:
 {
  imports = [
    ./hardware-configuration.nix
    ./disk-config.nix
    ./optimized_build.nix
-    ./distributed_build.nix
    ./power_management.nix
    ./screen_brightness.nix
    ./wifi.nix
-    ./framework_module.nix
  ];

  # Generate with `head -c4 /dev/urandom | od -A none -t x4`
@@ -34,15 +27,8 @@

  environment.systemPackages = with pkgs; [
    fw-ectool
-    framework-tool
  ];

-  # Enable light sensor
-  # hardware.sensor.iio.enable = lib.mkDefault true;
-
-  # Enable TRIM
-  # services.fstrim.enable = lib.mkDefault true;
-
  me.alacritty.enable = true;
  me.ansible.enable = true;
  me.ares.enable = true;
@@ -52,10 +38,7 @@
  me.docker.enable = true;
  me.emacs_flavor = "full";
  me.firefox.enable = true;
-  me.flux.enable = true;
-  me.gcloud.enable = true;
  me.git.config = ../../roles/git/files/gitconfig_home;
-  me.gnuplot.enable = true;
  me.gpg.enable = true;
  me.graphical = true;
  me.graphics_card_type = "amd";
@@ -66,16 +49,12 @@
  me.lvfs.enable = true;
  me.media.enable = true;
  me.nix_index.enable = true;
-  me.pcsx2.enable = true;
  me.python.enable = true;
  me.qemu.enable = true;
  me.rust.enable = true;
-  me.sops.enable = true;
  me.sound.enable = true;
  me.steam.enable = true;
-  me.steam_run_free.enable = true;
  me.sway.enable = true;
-  me.tekton.enable = true;
  me.terraform.enable = true;
  me.vnc_client.enable = true;
  me.vscode.enable = true;
--- a/nix/configuration/hosts/odo/distributed_build.nix
+++ b/nix/configuration/hosts/odo/distributed_build.nix
@@ -1,36 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-{
-  imports = [ ];
-
-  config = lib.mkMerge [
-    {
-      nix.distributedBuilds = true;
-      nix.buildMachines = [
-        {
-          hostName = "hydra";
-          sshUser = "talexander";
-          systems = [
-            "x86_64-linux"
-            # "aarch64-linux"
-          ];
-          maxJobs = 1;
-          speedFactor = 2;
-          supportedFeatures = [
-            # "nixos-test"
-            "benchmark"
-            "big-parallel"
-            # "kvm"
-            "gccarch-znver4"
-            "gccarch-x86-64-v3"
-            "gccarch-x86-64-v4"
-          ];
-        }
-      ];
-    }
-  ];
-}
--- a/nix/configuration/hosts/odo/framework_module.nix
+++ b/nix/configuration/hosts/odo/framework_module.nix
@@ -1,23 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-
-{
-  imports = [ ];
-
-  config = lib.mkMerge [
-    {
-      boot.extraModulePackages = with config.boot.kernelPackages; [
-        framework-laptop-kmod
-      ];
-      # https://github.com/DHowett/framework-laptop-kmod?tab=readme-ov-file#usage
-      boot.kernelModules = [
-        "cros_ec"
-        "cros_ec_lpcs"
-      ];
-    }
-  ];
-}
--- a/nix/configuration/hosts/odo/optimized_build.nix
+++ b/nix/configuration/hosts/odo/optimized_build.nix
@@ -2,7 +2,6 @@
  config,
  lib,
  pkgs,
-  pkgs-unoptimized,
  ...
 }:
 {
@@ -23,18 +22,16 @@
        "nixos-test"
      ];

-      # Keep ALL dependencies so we can rebuild offline. This DRASTICALLY increase disk usage, but disk space is cheap.
-      # system.includeBuildDependencies = true;
+      # nixpkgs.hostPlatform = {
+      #   gcc.arch = "znver4";
+      #   gcc.tune = "znver4";
+      #   system = "x86_64-linux";

-      nixpkgs.hostPlatform = {
-        gcc.arch = "znver4";
-        gcc.tune = "znver4";
-        system = "x86_64-linux";
-      };
+      # };

      nixpkgs.overlays = [
        (
-          final: prev:
+          self: super:
          let
            optimizeWithFlags =
              pkg: flags:
@@ -65,45 +62,19 @@
                  HZ_1000 = lib.kernel.no;
                }
                (
-                  optimizeWithFlags prev.linux_6_13 [
+                  optimizeWithFlags super.linux_6_12 [
                    "-march=znver4"
                    "-mtune=znver4"
                  ]
                );
-            # gsl = prev.gsl.overrideAttrs (old: {
-            #   # gsl tests fails when optimizations are enabled.
-            #   # > FAIL: cholesky_invert unscaled hilbert (  4,  4)[0,2]: 2.55795384873636067e-13                        0
-            #   # >  (2.55795384873636067e-13 observed vs 0 expected) [28259614]
-            #   doCheck = false;
-            # });
          }
        )
-        (final: prev: {
-          haskellPackages = prev.haskellPackages.extend (
-            final': prev': {
-              crypton = pkgs-unoptimized.haskellPackages.crypton;
-            }
-          );
-        })
-        # (final: prev: {
-        #   haskell = prev.haskell // {
-        #     packageOverrides = final.lib.composeExtensions prev.haskell.packageOverrides (
-        #       final': prev': {
-        #         crypton = pkgs-unoptimized.haskellPackages.crypton;
-        #       }
-        #     );
-        #   };
-        # })
-        (final: prev: {
-          redis = pkgs-unoptimized.redis;
-          gsl = pkgs-unoptimized.gsl;
-        })
      ];

      boot.kernelPackages = pkgs.linuxPackagesFor pkgs.linux_znver4;
    })
    (lib.mkIf (config.me.buildingIso) {
-      boot.kernelPackages = pkgs.linuxPackagesFor pkgs.linux_6_13;
+      boot.kernelPackages = pkgs.linuxPackagesFor pkgs.linux_6_12;
      boot.supportedFilesystems.zfs = true;
    })
  ];
--- a/nix/configuration/hosts/odo/wifi.nix
+++ b/nix/configuration/hosts/odo/wifi.nix
@@ -9,10 +9,9 @@
  imports = [ ];

  config = {
-    # Doesn't seem necessary starting with 6.13
-    # environment.loginShellInit = lib.mkIf (!config.me.buildingIso) ''
-    #   doas iw dev wlan0 set power_save off
-    # '';
+    environment.loginShellInit = lib.mkIf (!config.me.buildingIso) ''
+      doas iw dev wlan0 set power_save off
+    '';

    # Enable debug logging for ath12k wifi card.
    boot.kernelParams = [
--- a/nix/configuration/roles/docker/default.nix
+++ b/nix/configuration/roles/docker/default.nix
@@ -56,32 +56,6 @@
          # };
        };

-        systemd.services.link-docker-creds = {
-          # Contains credentials so it cannot be added to the nix store
-          enable = true;
-          description = "link-docker-creds";
-          wantedBy = [ "multi-user.target" ];
-          wants = [ "multi-user.target" ];
-          after = [ "multi-user.target" ];
-          # path = with pkgs; [
-          #   zfs
-          # ];
-          unitConfig.DefaultDependencies = "no";
-          serviceConfig = {
-            Type = "oneshot";
-            RemainAfterExit = "yes";
-          };
-          script = ''
-            if [ -e /persist/manual/docker/config.json ]; then
-              install --directory --owner talexander --group talexander --mode 0700 /home/talexander/.docker
-              ln -s /persist/manual/docker/config.json /home/talexander/.docker/config.json
-            fi
-          '';
-          preStop = ''
-            rm -f /home/talexander/.docker/config.json
-          '';
-        };
-
        # Needed for non-rootless docker
        users.users.talexander.extraGroups = [ "docker" ];
      }
--- a/nix/configuration/roles/emacs/default.nix
+++ b/nix/configuration/roles/emacs/default.nix
@@ -89,7 +89,7 @@ in
      (lib.mkIf (config.me.graphical) {
        nixpkgs.overlays = [
          (final: prev: {
-            my_emacs = final.emacs30-pgtk;
+            my_emacs = final.emacs29-pgtk;
          })
        ];
      })
@@ -121,7 +121,6 @@ in
                      dicts: with dicts; [
                        en
                        en-computers
-                        # en-science # TODO: Why is en-science non-free?
                      ]
                    ))
                    final.nixd # nix language server
@@ -130,9 +129,6 @@ in
                    final.shellcheck
                    final.cmake-language-server
                    final.cmake # Used by cmake-language-server
-                    final.rust-analyzer
-                    final.nodePackages_latest.prettier # Format yaml, json, and JS
-                    final.terraform-ls
                  ]
                }
              '';
--- a/nix/configuration/roles/emacs/files/emacs/elisp/base-extensions.el
+++ b/nix/configuration/roles/emacs/files/emacs/elisp/base-extensions.el
@@ -51,27 +51,17 @@
 ;; Persist history over Emacs restarts. Vertico sorts by history position.
 (use-package savehist
  ;; This is an emacs built-in but we're pulling the latest version
-  :pin gnu
  :config
  (savehist-mode))

 (use-package which-key
-  :pin gnu
  :diminish
  :config
  (which-key-mode))

 (use-package windmove
-  ;; This is an emacs built-in but we're pulling the latest version
-  :pin gnu
-  :bind
-  (
-   ("S-<up>" . windmove-up)
-   ("S-<right>" . windmove-right)
-   ("S-<down>" . windmove-down)
-   ("S-<left>" . windmove-left)
-   )
-  )
+  :config
+  (windmove-default-keybindings))

 (setq tramp-default-method "ssh")

--- a/nix/configuration/roles/emacs/files/emacs/elisp/base.el
+++ b/nix/configuration/roles/emacs/files/emacs/elisp/base.el
@@ -63,9 +63,6 @@
 show-trailing-whitespace t
 ;; Remove the line when killing it with ctrl-k
 kill-whole-line t
-
- ;; Show the current project in the mode line
- project-mode-line t
 )

 ;; (setq-default fringes-outside-margins t)
--- a/nix/configuration/roles/emacs/files/emacs/elisp/lang-org.el
+++ b/nix/configuration/roles/emacs/files/emacs/elisp/lang-org.el
@@ -1,23 +1,16 @@
 (use-package org
  :ensure nil
  :commands org-mode
-  :bind (:map org-mode-map
+  :bind (
         ("C-c l" . org-store-link)
         ("C-c a" . org-agenda)
-         ("S-<up>" . org-shiftup)
-         ("S-<right>" . org-shiftright)
-         ("S-<down>" . org-shiftdown)
-         ("S-<left>" . org-shiftleft)
+         ("C--" . org-timestamp-down)
+         ("C-=" . org-timestamp-up)
         )
  :hook (
         (org-mode . (lambda ()
                       (org-indent-mode +1)
                        ))
-         ;; Make windmove work in Org mode:
-         (org-shiftup-final . windmove-up)
-         (org-shiftleft-final . windmove-left)
-         (org-shiftdown-final . windmove-down)
-         (org-shiftright-final . windmove-right)
         )
  :config
  (require 'org-tempo)
--- a/nix/configuration/roles/flux/default.nix
+++ b/nix/configuration/roles/flux/default.nix
@@ -1,29 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-
-{
-  imports = [ ];
-
-  options.me = {
-    flux.enable = lib.mkOption {
-      type = lib.types.bool;
-      default = false;
-      example = true;
-      description = "Whether we want to install flux.";
-    };
-  };
-
-  config = lib.mkIf config.me.flux.enable (
-    lib.mkMerge [
-      {
-        environment.systemPackages = with pkgs; [
-          fluxcd
-        ];
-      }
-    ]
-  );
-}
--- a/nix/configuration/roles/fonts/files/fonts.conf
+++ b/nix/configuration/roles/fonts/files/fonts.conf
@@ -47,17 +47,17 @@
  </alias>


-  <!-- Screw it. Force Liberation Mono to be cascadia mono. -->
-  <!-- <match target="pattern"> -->
-  <!--   <test qual="any" name="family"><string>Liberation Mono</string></test> -->
-  <!--   <edit name="family" mode="assign" binding="same"><string>Cascadia Mono</string></edit> -->
-  <!-- </match> -->
+  <!-- Screw it. Force Liberation Mono to be source code pro. -->
+  <match target="pattern">
+    <test qual="any" name="family"><string>Liberation Mono</string></test>
+    <edit name="family" mode="assign" binding="same"><string>Cascadia Mono</string></edit>
+  </match>

  <!-- Dejavu Sans Mono keeps coming back when I query "monospace". Doesn't happen when I'm using Souce Code Pro but does happen with cascadia... force it to cascadia -->
-  <!-- <match target="pattern"> -->
-  <!--   <test qual="any" name="family"><string>monospace</string></test> -->
-  <!--   <edit name="family" mode="assign" binding="same"><string>Cascadia Mono</string></edit> -->
-  <!-- </match> -->
+  <match target="pattern">
+    <test qual="any" name="family"><string>monospace</string></test>
+    <edit name="family" mode="assign" binding="same"><string>Cascadia Mono</string></edit>
+  </match>

  <!-- Disable ligatures in monospace fonts. -->
  <match target="font">
--- a/nix/configuration/roles/gcloud/default.nix
+++ b/nix/configuration/roles/gcloud/default.nix
@@ -1,43 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-
-{
-  imports = [ ];
-
-  options.me = {
-    gcloud.enable = lib.mkOption {
-      type = lib.types.bool;
-      default = false;
-      example = true;
-      description = "Whether we want to install gcloud.";
-    };
-  };
-
-  config = lib.mkIf config.me.gcloud.enable (
-    lib.mkMerge [
-      {
-        environment.systemPackages = with pkgs; [
-          (google-cloud-sdk.withExtraComponents [ google-cloud-sdk.components.gke-gcloud-auth-plugin ])
-        ];
-
-        environment.persistence."/state" = lib.mkIf (!config.me.buildingIso) {
-          hideMounts = true;
-          users.talexander = {
-            directories = [
-              {
-                directory = ".config/gcloud";
-                user = "talexander";
-                group = "talexander";
-                mode = "0700";
-              }
-            ];
-          };
-        };
-      }
-    ]
-  );
-}
--- a/nix/configuration/roles/git/files/gitconfig_home
+++ b/nix/configuration/roles/git/files/gitconfig_home
@@ -3,7 +3,7 @@
 	name = Tom Alexander
 	signingkey = D3A179C9A53C0EDE
 [push]
-	default = simple # (default since 2.0)
+	default = simple
 [alias]
 	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
@@ -12,42 +12,24 @@
 	excludesfile = ~/.gitignore_global
 [commit]
 	gpgsign = true
-	verbose = true
 [pull]
 	rebase = true
 [log]
 	date = local
 [init]
 	defaultBranch = main
+
+# Use meld for `git difftool` and `git mergetool`
 [diff]
-	tool = meld # Use meld for `git difftool` and `git mergetool`
-	algorithm = histogram
-	colorMoved = plain
-	mnemonicPrefix = true
-	renames = true
+	tool = meld
 [difftool]
 	prompt = false
 [difftool "meld"]
 	cmd = meld "$LOCAL" "$REMOTE"
 [merge]
 	tool = meld
-	conflictStyle = zdiff3
 [mergetool "meld"]
        # Make the middle pane start with partially-merged contents:
 	cmd = meld "$LOCAL" "$MERGED" "$REMOTE" --output "$MERGED"
        # Make the middle pane start without any merge progress:
 	# cmd = meld "$LOCAL" "$BASE" "$REMOTE" --output "$MERGED"
-[column]
-	ui = auto
-[branch]
-	sort = -committerdate
-[tag]
-	sort = version:refname
-[fetch]
-	prune = true
-	pruneTags = true
-	all = true
-[rebase]
-	autoSquash = true
-	autoStash = true
-	updateRefs = true
--- a/nix/configuration/roles/gnuplot/default.nix
+++ b/nix/configuration/roles/gnuplot/default.nix
@@ -1,29 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-
-{
-  imports = [ ];
-
-  options.me = {
-    gnuplot.enable = lib.mkOption {
-      type = lib.types.bool;
-      default = false;
-      example = true;
-      description = "Whether we want to install gnuplot.";
-    };
-  };
-
-  config = lib.mkIf config.me.gnuplot.enable (
-    lib.mkMerge [
-      {
-        environment.systemPackages = with pkgs; [
-          gnuplot
-        ];
-      }
-    ]
-  );
-}
--- a/nix/configuration/roles/graphics/default.nix
+++ b/nix/configuration/roles/graphics/default.nix
@@ -37,11 +37,6 @@
          xorg.xeyes # to test which windows are using x11
        ];
        hardware.graphics.enable = true;
-        # hardware.graphics.enable32Bit = true;
-
-        # Vulkan Support (64-bit is enabled by default, 32-bit is disabled by default)
-        # hardware.opengl.driSupport = true; # This is already enabled by default
-        # hardware.opengl.driSupport32Bit = true; # For 32 bit applications
      })
    ]
  );
--- a/nix/configuration/roles/hydra/default.nix
+++ b/nix/configuration/roles/hydra/default.nix
@@ -1,50 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-
-{
-  imports = [ ];
-
-  options.me = {
-    hydra.enable = lib.mkOption {
-      type = lib.types.bool;
-      default = false;
-      example = true;
-      description = "Whether we want to install hydra.";
-    };
-  };
-
-  config = lib.mkIf config.me.hydra.enable (
-    lib.mkMerge [
-      {
-        services.hydra = {
-          enable = true;
-          hydraURL = "http://localhost:3000"; # externally visible URL
-          notificationSender = "hydra@localhost"; # e-mail of Hydra service
-          # a standalone Hydra will require you to unset the buildMachinesFiles list to avoid using a nonexistant /etc/nix/machines
-          buildMachinesFiles = [ ];
-          # you will probably also want, otherwise *everything* will be built from scratch
-          useSubstitutes = true;
-        };
-
-        # nix.buildMachines = [
-        #   {
-        #     hostName = "localhost";
-        #     protocol = null;
-        #     system = "x86_64-linux";
-        #     supportedFeatures = [
-        #       "kvm"
-        #       "nixos-test"
-        #       "big-parallel"
-        #       "benchmark"
-        #     ];
-        #     maxJobs = 8;
-        #   }
-        # ];
-      }
-    ]
-  );
-}
--- a/nix/configuration/roles/kubernetes/default.nix
+++ b/nix/configuration/roles/kubernetes/default.nix
@@ -28,21 +28,6 @@ let
  alias_klog = pkgs.writeShellScriptBin "klog" ''
    exec ${pkgs.kubectl}/bin/kubectl logs --all-containers "$@"
  '';
-  decrypt_k8s_secret =
-    (pkgs.writeScriptBin "decrypt_k8s_secret" (builtins.readFile ./files/decrypt_k8s_secret.bash))
-    .overrideAttrs
-      (old: {
-        buildCommand = "${old.buildCommand}\n patchShebangs $out";
-        buildInputs = [ pkgs.makeWrapper ];
-        postBuild = ''
-          wrapProgram $out/bin/decrypt_k8s_secret --prefix PATH : ${
-            lib.makeBinPath [
-              pkgs.kubectl
-              pkgs.jq
-            ]
-          }
-        '';
-      });
 in
 {
  imports = [ ];
@@ -70,8 +55,6 @@ in
          alias_kdel
          alias_kd
          alias_klog
-          decrypt_k8s_secret
-          ingress2gateway # Convert ingress yaml to gateway yaml
        ];

        environment.persistence."/persist" = lib.mkIf (!config.me.buildingIso) {
--- a/nix/configuration/roles/kubernetes/files/decrypt_k8s_secret.bash
+++ b/nix/configuration/roles/kubernetes/files/decrypt_k8s_secret.bash
@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-#
-set -euo pipefail
-IFS=$'\n\t'
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-kubectl get secret -o json "${@}" | jq '.data[] |= @base64d | .data'
--- a/nix/configuration/roles/media/default.nix
+++ b/nix/configuration/roles/media/default.nix
@@ -17,8 +17,6 @@ let
        buildCommand = "${old.buildCommand}\n patchShebangs $out";

      });
-  kernel_version_check = lib.versionAtLeast config.boot.kernelPackages.kernel.version "6.12";
-  nixos_version_check = lib.versionAtLeast (lib.versions.majorMinor lib.version) "25.05";
 in
 {
  imports = [ ];
@@ -37,8 +35,6 @@ in
      {
        environment.systemPackages = with pkgs; [
          ffmpeg
-          libva-utils # for vainfo
-          vdpauinfo
        ];
      }
      (lib.mkIf config.me.graphical {
@@ -63,21 +59,6 @@ in
          cast_file_vaapi
        ];
      })
-      (lib.mkIf (config.me.graphics_card_type == "amd") {
-        environment.sessionVariables = {
-          VDPAU_DRIVER = "radeonsi";
-        };
-      })
-      (lib.mkIf (config.me.graphics_card_type == "intel") {
-        hardware.graphics.extraPackages = with pkgs; [
-          intel-media-driver
-          libvdpau-va-gl # Support vdpau applications using va-api
-        ];
-
-        environment.sessionVariables = {
-          VDPAU_DRIVER = "va_gl";
-        };
-      })
    ]
  );
 }
--- a/nix/configuration/roles/network/default.nix
+++ b/nix/configuration/roles/network/default.nix
@@ -61,7 +61,6 @@
    iwd
    ldns # for drill
    arp-scan # To find devices on the network
-    wavemon
  ];

  boot.extraModprobeConfig = ''
--- a/nix/configuration/roles/pcsx2/default.nix
+++ b/nix/configuration/roles/pcsx2/default.nix
@@ -1,95 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-
-{
-  imports = [ ];
-
-  options.me = {
-    pcsx2.enable = lib.mkOption {
-      type = lib.types.bool;
-      default = false;
-      example = true;
-      description = "Whether we want to install pcsx2.";
-    };
-  };
-
-  config = lib.mkIf config.me.pcsx2.enable (
-    lib.mkMerge [
-      (lib.mkIf config.me.graphical {
-        environment.systemPackages = with pkgs; [
-          pcsx2
-        ];
-
-        environment.persistence."/state" = lib.mkIf (!config.me.buildingIso) {
-          hideMounts = true;
-          users.talexander = {
-            directories = [
-              {
-                # Shaders, games list, and achievement data.
-                directory = ".config/PCSX2/cache";
-                user = "talexander";
-                group = "talexander";
-                mode = "0755";
-              }
-              {
-                # Save states.
-                directory = ".config/PCSX2/sstates";
-                user = "talexander";
-                group = "talexander";
-                mode = "0755";
-              }
-              {
-                # Screenshots.
-                directory = ".config/PCSX2/snaps";
-                user = "talexander";
-                group = "talexander";
-                mode = "0755";
-              }
-              {
-                # Game covers.
-                directory = ".config/PCSX2/covers";
-                user = "talexander";
-                group = "talexander";
-                mode = "0755";
-              }
-              {
-                # Video recordings.
-                directory = ".config/PCSX2/videos";
-                user = "talexander";
-                group = "talexander";
-                mode = "0755";
-              }
-            ];
-          };
-        };
-
-        environment.persistence."/persist" = lib.mkIf (!config.me.buildingIso) {
-          hideMounts = true;
-          users.talexander = {
-            directories = [
-              {
-                # Game saves
-                directory = ".config/PCSX2/memcards";
-                user = "talexander";
-                group = "talexander";
-                mode = "0755";
-              }
-            ];
-          };
-        };
-
-        home-manager.users.talexander =
-          { pkgs, ... }:
-          {
-            home.file.".config/PCSX2/inis/PCSX2.ini" = {
-              source = ./files/PCSX2.ini;
-            };
-          };
-      })
-    ]
-  );
-}
--- a/nix/configuration/roles/pcsx2/files/PCSX2.ini
+++ b/nix/configuration/roles/pcsx2/files/PCSX2.ini
@@ -1,104 +0,0 @@
-[UI]
-SettingsVersion = 1
-InhibitScreensaver = true
-ConfirmShutdown = false
-StartPaused = false
-PauseOnFocusLoss = true
-StartFullscreen = true
-
-
-[Folders]
-Bios = ../../persist/games/ps2/bios
-Snapshots = snaps
-Savestates = sstates
-MemoryCards = memcards
-Logs = logs
-Cheats = cheats
-Patches = patches
-UserResources = resources
-Cache = cache
-Textures = textures
-InputProfiles = inputprofiles
-Videos = videos
-
-
-[EmuCore/GS]
-VsyncEnable = true
-# Internal resolution aspect corrected
-ScreenshotSize = 1
-# webp
-ScreenshotFormat = 2
-OsdShowFPS = true
-# Capture video at internal resolution
-VideoCaptureAutoResolution = true
-# 2x native resolution
-upscale_multiplier = 2
-CaptureContainer = mkv
-VideoCaptureCodec = av1_vaapi
-AudioCaptureCodec = flac
-
-
-[Filenames]
-BIOS = ps2-0230a-20080220.bin
-
-[MemoryCards]
-Slot1_Enable = true
-Slot1_Filename = Mcd001.ps2
-Slot2_Enable = true
-Slot2_Filename = Mcd002.ps2
-
-
-[InputSources]
-Keyboard = false
-Mouse = false
-SDL = true
-# Enhanced ps4 and ps5 controller support
-SDLControllerEnhancedMode = true
-SDLPS5PlayerLED = true
-
-
-[Pad1]
-Type = DualShock2
-InvertL = 0
-InvertR = 0
-Deadzone = 0
-AxisScale = 1.33
-LargeMotorScale = 1
-SmallMotorScale = 1
-ButtonDeadzone = 0
-PressureModifier = 0.5
-Up = SDL-0/DPadUp
-Right = SDL-0/DPadRight
-Down = SDL-0/DPadDown
-Left = SDL-0/DPadLeft
-Triangle = SDL-0/Y
-Circle = SDL-0/B
-Cross = SDL-0/A
-Square = SDL-0/X
-Select = SDL-0/Back
-Start = SDL-0/Start
-L1 = SDL-0/LeftShoulder
-L2 = SDL-0/+LeftTrigger
-R1 = SDL-0/RightShoulder
-R2 = SDL-0/+RightTrigger
-L3 = SDL-0/LeftStick
-R3 = SDL-0/RightStick
-LUp = SDL-0/-LeftY
-LRight = SDL-0/+LeftX
-LDown = SDL-0/+LeftY
-LLeft = SDL-0/-LeftX
-RUp = SDL-0/-RightY
-RRight = SDL-0/+RightX
-RDown = SDL-0/+RightY
-RLeft = SDL-0/-RightX
-Analog = SDL-0/Guide
-LargeMotor = SDL-0/LargeMotor
-SmallMotor = SDL-0/SmallMotor
-
-
-[AutoUpdater]
-CheckAtStartup = false
-
-
-[GameList]
-RecursivePaths = /home/talexander/persist/games/ps2/roms
--- a/nix/configuration/roles/rust/default.nix
+++ b/nix/configuration/roles/rust/default.nix
@@ -1,6 +1,3 @@
-# MANUAL: rustup target add x86_64-unknown-linux-musl
-# MANUAL: rustup target add wasm32-unknown-unknown
-# MANUAL: rustup component add rustc-codegen-cranelift
 {
  config,
  lib,
@@ -8,21 +5,6 @@
  ...
 }:

-let
-  cargo_wrapped =
-    package: prog:
-    pkgs.writeShellScriptBin "${prog}" ''
-      export PATH="$PATH:${
-        lib.makeBinPath [
-          pkgs.clang
-          pkgs.pkg-config # Needed for openssl-sys
-        ]
-      }"
-      # Needed for openssl-sys
-      export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:${pkgs.openssl.dev}/lib/pkgconfig"
-      exec ${package}/bin/${prog} "''${@}"
-    '';
-in
 {
  imports = [ ];

@@ -42,6 +24,7 @@ in
          rustup
          lldb # for lldb-vscode
          musl # for building static binaries
+          rust-analyzer
          cargo-semver-checks
          # ? cargo-bloat
          # ? cargo-outdated
@@ -55,89 +38,17 @@ in
              ".cargo/config.toml" = {
                source = ./files/cargo_config.toml;
              };
-              ".rustup/settings.toml" = {
-                source = ./files/rustup_settings.toml;
-              };
-            };
-          };
-
-        environment.persistence."/state" = lib.mkIf (!config.me.buildingIso) {
-          hideMounts = true;
-          users.talexander = {
-            directories = [
-              {
-                directory = ".rustup";
-                user = "talexander";
-                group = "talexander";
-                mode = "0755";
-              }
-              {
-                directory = ".cargo/registry";
-                user = "talexander";
-                group = "talexander";
-                mode = "0755";
-              }
-            ];
+              # # TODO: Figure out what to do with credentials.
+              # ".cargo/credentials.toml" = {
+              #   source = ./files/cargo_credentials.toml;
+              # };
            };
          };

-        systemd.services.link-rust-creds = {
-          # Contains credentials so it cannot be added to the nix store
-          enable = true;
-          description = "link-rust-creds";
-          wantedBy = [ "multi-user.target" ];
-          wants = [ "multi-user.target" ];
-          after = [ "multi-user.target" ];
-          # path = with pkgs; [
-          #   zfs
-          # ];
-          unitConfig.DefaultDependencies = "no";
-          serviceConfig = {
-            Type = "oneshot";
-            RemainAfterExit = "yes";
-          };
-          script = ''
-            if [ -e /persist/manual/rust/cargo_credentials.toml ]; then
-              install --directory --owner talexander --group talexander --mode 0755 /home/talexander/.cargo
-              ln -s /persist/manual/rust/cargo_credentials.toml /home/talexander/.cargo/credentials.toml
-            fi
-          '';
-          preStop = ''
-            rm -f /home/talexander/.cargo/credentials.toml
-          '';
-        };
-
-        nixpkgs.overlays = [
-          (final: prev: {
-            rustup = pkgs.symlinkJoin {
-              name = "rustup";
-              paths =
-                (builtins.map (cargo_wrapped prev.rustup) [
-                  "cargo"
-                  "cargo-clippy"
-                  "cargo-fmt"
-                  "cargo-miri"
-                  "clippy-driver"
-                  "rls"
-                  "rust-analyzer"
-                  "rust-gdb"
-                  "rust-gdbgui"
-                  "rust-lldb"
-                  "rustc"
-                  "rustdoc"
-                  "rustfmt"
-                  "rustup"
-                ])
-                ++ [
-                  prev.rustup
-                ];
-              buildInputs = [ pkgs.makeWrapper ];
-            };
-          })
-        ];
      }
    ]
  );
 }

 # TODO: Install clippy, cranelift, rust-src
+# TODO: Install rust targets x86_64-unknown-linux-musl and wasm32-unknown-unknown
--- a/nix/configuration/roles/rust/files/rustup_settings.toml
+++ b/nix/configuration/roles/rust/files/rustup_settings.toml
@@ -1,5 +0,0 @@
-default_toolchain = "nightly-x86_64-unknown-linux-gnu"
-profile = "default"
-version = "12"
-
-[overrides]
--- a/nix/configuration/roles/sops/default.nix
+++ b/nix/configuration/roles/sops/default.nix
@@ -1,29 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-
-{
-  imports = [ ];
-
-  options.me = {
-    sops.enable = lib.mkOption {
-      type = lib.types.bool;
-      default = false;
-      example = true;
-      description = "Whether we want to install sops.";
-    };
-  };
-
-  config = lib.mkIf config.me.sops.enable (
-    lib.mkMerge [
-      {
-        environment.systemPackages = with pkgs; [
-          sops # For encrypting kubernetes secrets.
-        ];
-      }
-    ]
-  );
-}
--- a/nix/configuration/roles/ssh/default.nix
+++ b/nix/configuration/roles/ssh/default.nix
@@ -19,27 +19,5 @@
        ".ssh/known_hosts"
      ];
    };
-    users.root = {
-      home = "/root";
-      files = [
-        ".ssh/known_hosts"
-      ];
-    };
-  };
-
-  home-manager.users.talexander =
-    { pkgs, ... }:
-    {
-      home.file.".ssh/config" = {
-        source = ./files/ssh_config;
-      };
-    };
-
-  home-manager.users.root =
-    { pkgs, ... }:
-    {
-      home.file.".ssh/config" = {
-        source = ./files/ssh_config_root;
-      };
  };
 }
--- a/nix/configuration/roles/ssh/files/ssh_config
+++ b/nix/configuration/roles/ssh/files/ssh_config
@@ -1,38 +0,0 @@
-Host poudriere
-  ProxyJump talexander@mrmanager
-  HostName 10.215.1.203
-
-Host controller0
-  ProxyJump talexander@mrmanager
-  HostName 10.215.1.204
-
-Host controller1
-  ProxyJump talexander@mrmanager
-  HostName 10.215.1.205
-
-Host controller2
-  ProxyJump talexander@mrmanager
-  HostName 10.215.1.206
-
-Host worker0
-  ProxyJump talexander@mrmanager
-  HostName 10.215.1.207
-
-Host worker1
-  ProxyJump talexander@mrmanager
-  HostName 10.215.1.208
-
-Host worker2
-  ProxyJump talexander@mrmanager
-  HostName 10.215.1.209
-
-Host brianai
-  ProxyJump talexander@mrmanager
-  HostName 10.215.1.215
-
-Host hydra
-  ProxyJump talexander@mrmanager
-  HostName 10.215.1.219
-
-Host *
-  Compression yes
--- a/nix/configuration/roles/ssh/files/ssh_config_root
+++ b/nix/configuration/roles/ssh/files/ssh_config_root
@@ -1,9 +0,0 @@
-Host hydra
-  HostName ns1.fizz.buzz
-  Port 65122
-  User talexander
-  IdentitiesOnly yes
-  IdentityFile /persist/manual/ssh/root/keys/id_ed25519
-
-Host *
-  Compression yes
--- a/nix/configuration/roles/steam_run_free/default.nix
+++ b/nix/configuration/roles/steam_run_free/default.nix
@@ -1,29 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-
-{
-  imports = [ ];
-
-  options.me = {
-    steam_run_free.enable = lib.mkOption {
-      type = lib.types.bool;
-      default = false;
-      example = true;
-      description = "Whether we want to install steam_run_free.";
-    };
-  };
-
-  config = lib.mkIf config.me.steam_run_free.enable (
-    lib.mkMerge [
-      {
-        environment.systemPackages = with pkgs; [
-          steam-run-free
-        ];
-      }
-    ]
-  );
-}
--- a/nix/configuration/roles/tekton/default.nix
+++ b/nix/configuration/roles/tekton/default.nix
@@ -1,29 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-
-{
-  imports = [ ];
-
-  options.me = {
-    tekton.enable = lib.mkOption {
-      type = lib.types.bool;
-      default = false;
-      example = true;
-      description = "Whether we want to install tekton.";
-    };
-  };
-
-  config = lib.mkIf config.me.tekton.enable (
-    lib.mkMerge [
-      {
-        environment.systemPackages = with pkgs; [
-          tektoncd-cli
-        ];
-      }
-    ]
-  );
-}
--- a/nix/configuration/roles/terraform/default.nix
+++ b/nix/configuration/roles/terraform/default.nix
@@ -48,12 +48,6 @@ in
          };
        };
      }
-      (lib.mkIf config.me.kubernetes.enable {
-        environment.systemPackages = with pkgs; [
-          tfk8s # Converts k8s yaml manifests to terraform kubernetes_manifest.
-          k2tf # Converts k8s yaml manifests to terraform real types.
-        ];
-      })
    ]
  );
 }
--- a/nix/configuration/roles/wasm/default.nix
+++ b/nix/configuration/roles/wasm/default.nix
@@ -2,7 +2,6 @@
  config,
  lib,
  pkgs,
-  pkgs-unoptimized,
  ...
 }:

@@ -24,7 +23,7 @@
        environment.systemPackages = with pkgs; [
          wabt
          wasm-bindgen-cli
-          pkgs-unoptimized.binaryen # for wasm-opt
+          binaryen # for wasm-opt
        ];
      }
    ]
--- a/nix/configuration/roles/waybar/files/style.css
+++ b/nix/configuration/roles/waybar/files/style.css
@@ -53,7 +53,6 @@
 }

 tooltip {
-  /* CSS for hover menu */
  background-color: #323232;
 }

@@ -184,23 +183,7 @@ tooltip {
 }

 #tray {
-  /* CSS rules for the tray (not the right-click or hover menu) */
-}
-
-/* #tray menu menuitem */
-#tray menu {
-  /* CSS for right click menu */
-  background: #323232;
-  padding: 5px;
-  border: 1px solid white;
-}
-#tray menu menuitem {
-  /* CSS for menu items in the right click menu */
-}
-
-#tray menu menuitem:hover {
-  /* CSS for hovering over a right-click menu item. */
-  background-color: #434343;
+  /* No styles */
 }

 #window {
--- a/nix/steam_deck/configuration/flake.lock
+++ b/nix/steam_deck/configuration/flake.lock
@@ -1,101 +0,0 @@
-{
-  "nodes": {
-    "flake-utils": {
-      "locked": {
-        "lastModified": 1659877975,
-        "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "home-manager": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1739314552,
-        "narHash": "sha256-ggVf2BclyIW3jexc/uvgsgJH4e2cuG6Nyg54NeXgbFI=",
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "rev": "83bd3a26ac0526ae04fa74df46738bb44b89dcdd",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "type": "github"
-      }
-    },
-    "impermanence": {
-      "locked": {
-        "lastModified": 1737831083,
-        "narHash": "sha256-LJggUHbpyeDvNagTUrdhe/pRVp4pnS6wVKALS782gRI=",
-        "owner": "nix-community",
-        "repo": "impermanence",
-        "rev": "4b3e914cdf97a5b536a889e939fb2fd2b043a170",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "impermanence",
-        "type": "github"
-      }
-    },
-    "nixgl": {
-      "inputs": {
-        "flake-utils": "flake-utils",
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1713543440,
-        "narHash": "sha256-lnzZQYG0+EXl/6NkGpyIz+FEOc/DSEG57AP1VsdeNrM=",
-        "owner": "nix-community",
-        "repo": "nixGL",
-        "rev": "310f8e49a149e4c9ea52f1adf70cdc768ec53f8a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "nixGL",
-        "type": "github"
-      }
-    },
-    "nixpkgs": {
-      "locked": {
-        "lastModified": 1739138025,
-        "narHash": "sha256-M4ilIfGxzbBZuURokv24aqJTbdjPA9K+DtKUzrJaES4=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "b2243f41e860ac85c0b446eadc6930359b294e79",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "root": {
-      "inputs": {
-        "home-manager": "home-manager",
-        "impermanence": "impermanence",
-        "nixgl": "nixgl",
-        "nixpkgs": "nixpkgs"
-      }
-    }
-  },
-  "root": "root",
-  "version": 7
-}
--- a/nix/steam_deck/configuration/flake.nix
+++ b/nix/steam_deck/configuration/flake.nix
@@ -1,51 +0,0 @@
-# MANUAL: echo 80 | sudo tee /sys/class/hwmon/hwmon3/max_battery_charge_level
-{
-  description = "My system configuration";
-
-  inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
-    nixgl.url = "github:nix-community/nixGL";
-    nixgl.inputs.nixpkgs.follows = "nixpkgs";
-    home-manager = {
-      url = "github:nix-community/home-manager";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-    impermanence = {
-      url = "github:nix-community/impermanence";
-    };
-  };
-  outputs =
-    {
-      nixpkgs,
-      nixgl,
-      home-manager,
-      impermanence,
-      ...
-    }:
-    let
-      system = "x86_64-linux";
-      pkgs = import nixpkgs {
-        inherit system;
-        overlays = [ nixgl.overlay ];
-      };
-    in
-    # pkgs = nixpkgs.legacyPackages.${system};
-    {
-      defaultPackage.${system} = home-manager.defaultPackage.${system};
-      homeConfigurations."deck" = home-manager.lib.homeManagerConfiguration {
-        inherit pkgs;
-
-        extraSpecialArgs = {
-          inherit nixgl;
-          inherit home-manager;
-        };
-
-        modules = [
-          { nixpkgs.overlays = [ nixgl.overlay ]; }
-          impermanence.homeManagerModules.impermanence
-          ./hosts/deck
-          ./home.nix
-        ];
-      };
-    };
-}
--- a/nix/steam_deck/configuration/home.nix
+++ b/nix/steam_deck/configuration/home.nix
@@ -1,58 +0,0 @@
-# TODO: Optimize for znver2
-{
-  config,
-  pkgs,
-  nixgl,
-  ...
-}:
-{
-  imports = [
-    ./roles/2ship2harkinian
-    ./roles/ares
-    ./roles/dolphin
-    ./roles/global_options
-    ./roles/graphics
-    ./roles/pcsx2
-    ./roles/rpcs3
-    ./roles/shipwright
-    ./roles/sm64ex
-    ./roles/steam_rom_manager
-    ./util/unfree_polyfill
-    ./util/persist_symlink
-  ];
-
-  home.username = "deck";
-  home.homeDirectory = "/home/deck";
-  home.stateVersion = "24.11";
-
-  programs.home-manager.enable = true;
-
-  # enable flakes
-  nix = {
-    package = pkgs.nix;
-    settings.experimental-features = [
-      "nix-command"
-      "flakes"
-    ];
-  };
-  # Automatic garbage collection
-  nix.gc = {
-    # Runs nix-collect-garbage --delete-older-than 30d
-    automatic = true;
-    randomizedDelaySec = "14m";
-    options = "--delete-older-than 30d";
-  };
-  nix.settings.auto-optimise-store = true;
-
-  home.packages = with pkgs; [
-    pkgs.nixgl.nixGLIntel
-    (pkgs.nixgl.nixGLCommon pkgs.nixgl.nixGLIntel)
-    pkgs.nixgl.nixVulkanIntel
-  ];
-
-  # This would keep build-time dependencies so I can rebuild while offline.
-  # nix.settings = {
-  #   keep-outputs = true;
-  #   keep-derivations = true;
-  # };
-}
--- a/nix/steam_deck/configuration/hosts/deck/default.nix
+++ b/nix/steam_deck/configuration/hosts/deck/default.nix
@@ -1,23 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-
-{
-  imports = [ ];
-
-  config = {
-    me.ares.enable = true;
-    me.dolphin.enable = true;
-    me.graphical = true;
-    me.optimizations.enable = true;
-    me.pcsx2.enable = true;
-    me.rpcs3.enable = true;
-    me.ship2harkinian.enable = true;
-    me.shipwright.enable = true;
-    me.sm64ex.enable = true;
-    me.steam_rom_manager.enable = true; # Steam rom manager UI does not render. I think it wants to be in an AppImage.
-  };
-}
--- a/nix/steam_deck/configuration/roles/2ship2harkinian/default.nix
+++ b/nix/steam_deck/configuration/roles/2ship2harkinian/default.nix
@@ -1,88 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-
-let
-  steam_2s2h = pkgs.writeScriptBin "steam_2s2h" ''
-    export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${pkgs.libglvnd}/lib"
-    exec ${pkgs._2ship2harkinian}/bin/2s2h "''${@}"
-  '';
-in
-{
-  imports = [ ];
-
-  options.me = {
-    ship2harkinian.enable = lib.mkOption {
-      type = lib.types.bool;
-      default = false;
-      example = true;
-      description = "Whether we want to install 2ship2harkinian.";
-    };
-  };
-
-  config = lib.mkIf config.me.ship2harkinian.enable (
-    lib.mkMerge [
-      {
-        allowedUnfree = [ "2ship2harkinian" ];
-      }
-      (lib.mkIf config.me.graphical {
-        home.packages = with pkgs; [
-          _2ship2harkinian
-          steam_2s2h
-        ];
-
-        home.file.".local/share/2ship/2ship2harkinian.json" = {
-          source = ./files/2ship2harkinian.json;
-        };
-
-        me.persist.directories = [ ".local/share/2ship/saves" ];
-        home.persistence."/home/deck/.state" = {
-          files = [
-            ".local/share/2ship/mm.o2r"
-          ];
-        };
-
-        nixpkgs.overlays = [
-          (
-            final: prev:
-            let
-              optimizeWithFlags =
-                pkg: flags:
-                pkg.overrideAttrs (old: {
-                  NIX_CFLAGS_COMPILE = [ (old.NIX_CFLAGS_COMPILE or "") ] ++ flags;
-                });
-              original_package =
-                if config.me.optimizations.enable then
-                  (optimizeWithFlags prev._2ship2harkinian [
-                    "-march=znver2"
-                    "-mtune=znver2"
-                  ])
-                else
-                  prev._2ship2harkinian;
-            in
-            {
-              _2ship2harkinian = pkgs.buildEnv {
-                name = prev._2ship2harkinian.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/2s2h.desktop
-                '';
-              };
-            }
-          )
-        ];
-      })
-    ]
-  );
-}
--- a/nix/steam_deck/configuration/roles/2ship2harkinian/files/2ship2harkinian.json
+++ b/nix/steam_deck/configuration/roles/2ship2harkinian/files/2ship2harkinian.json
@@ -1,20 +0,0 @@
-{
-  "CVars": {
-    "gInterpolationFPS": 60,
-    "gEnhancements": {
-      "Graphics": {
-        "AuthenticLogo": 1
-      }
-    },
-    "gSettings": {
-      "InternalResolution": 2.0,
-      "MSAAValue": 2,
-      "OpenMenuBar": 0
-    }
-  },
-  "Window": {
-    "Fullscreen": {
-      "Enabled": true
-    }
-  }
-}
--- a/nix/steam_deck/configuration/roles/ares/default.nix
+++ b/nix/steam_deck/configuration/roles/ares/default.nix
@@ -1,87 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-
-let
-  steam_ares = pkgs.writeScriptBin "steam_ares" ''
-    export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${pkgs.libglvnd}/lib"
-    exec ${pkgs.ares}/bin/ares "''${@}"
-  '';
-in
-{
-  imports = [ ];
-
-  options.me = {
-    ares.enable = lib.mkOption {
-      type = lib.types.bool;
-      default = false;
-      example = true;
-      description = "Whether we want to install ares.";
-    };
-  };
-
-  config = lib.mkIf config.me.ares.enable (
-    lib.mkMerge [
-      (lib.mkIf config.me.graphical {
-        nixGL.vulkan.enable = true;
-
-        home.packages = with pkgs; [
-          ares
-          steam_ares
-        ];
-
-        me.persist.directories = [
-          ".local/share/ares/saves"
-          ".local/share/ares/screenshots"
-        ];
-
-        home.file.".local/share/ares/settings.bml" = {
-          source = ./files/settings.bml;
-        };
-
-        nixpkgs.overlays = [
-          (
-            final: prev:
-            let
-              optimizeWithFlags =
-                pkg: flags:
-                pkg.overrideAttrs (old: {
-                  env.NIX_CFLAGS_COMPILE =
-                    (old.env.NIX_CFLAGS_COMPILE or "") + (lib.strings.concatStringsSep " " flags);
-                });
-              original_package =
-                if config.me.optimizations.enable then
-                  (optimizeWithFlags prev.ares [
-                    # Verified working with ps
-                    "-march=znver2"
-                    "-mtune=znver2"
-                  ])
-                else
-                  prev.ares;
-            in
-            {
-              ares = pkgs.buildEnv {
-                name = prev.ares.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/ares.desktop
-                '';
-              };
-            }
-          )
-        ];
-      })
-    ]
-  );
-}
--- a/nix/steam_deck/configuration/roles/ares/files/settings.bml
+++ b/nix/steam_deck/configuration/roles/ares/files/settings.bml
@@ -1,418 +0,0 @@
-Video
-  Driver: OpenGL 3.2
-  Monitor: Primary
-  Format: ARGB24
-  Exclusive: false
-  Blocking: false
-  PresentSRGB: false
-  ThreadedRenderer: true
-  NativeFullScreen: false
-  Flush: false
-  Shader: bilinear.slangp
-  Multiplier: 1
-  Output: Scale
-  AspectCorrection: true
-  AdaptiveSizing: true
-  AutoCentering: false
-  Luminance: 1.0
-  Saturation: 1.0
-  Gamma: 1.0
-  ColorBleed: false
-  ColorEmulation: true
-  DeepBlackBoost: false
-  InterframeBlending: true
-  Overscan: false
-  PixelAccuracy: false
-  Quality: SD
-  Supersampling: false
-  DisableVideoInterfaceProcessing: false
-  WeaveDeinterlacing: true
-Audio
-  Driver: PulseAudio Simple
-  Device: Default
-  Frequency: 48000
-  Latency: 0
-  Exclusive: false
-  Blocking: false
-  Dynamic: false
-  Mute: false
-  Volume: 1.0
-  Balance: 0.0
-Input
-  Driver: SDL
-  Defocus: Pause
-Boot
-  Fast: false
-  Debugger: false
-  Prefer: NTSC-U
-General
-  ShowStatusBar: true
-  Rewind: false
-  RunAhead: false
-  AutoSaveMemory: true
-  HomebrewMode: false
-  ForceInterpreter: false
-Rewind
-  Length: 100
-  Frequency: 10
-Paths
-  Home
-  Firmware
-  Saves: /home/deck/.local/share/ares/saves/
-  Screenshots: /home/deck/.local/share/ares/screenshots/
-  Debugging: /home/deck/.local/share/ares/debug/
-  ArcadeRoms
-  SuperFamicom
-    GameBoy
-    BSMemory
-    SufamiTurbo
-DebugServer
-  Port: 9123
-  Enabled: false
-  UseIPv4: false
-Nintendo64
-  ExpansionPak: true
-  Visible: true
-  Path: /home/deck/.persist/manual/games/nintendo_64/roms/
-MegaDrive
-  TMSS: false
-  Visible: false
-  Path
-Recent
-  Game-1
-  Game-2
-  Game-3
-  Game-4
-  Game-5
-  Game-6
-  Game-7
-  Game-8
-  Game-9
-VirtualPad1
-  Pad.Up: 0x28de1205/1/1/Lo;;
-  Pad.Down: 0x28de1205/1/1/Hi;;
-  Pad.Left: 0x28de1205/1/0/Lo;;
-  Pad.Right: 0x28de1205/1/0/Hi;;
-  Select: ;;
-  Start: 0x28de1205/3/7;;
-  A..South: 0x28de1205/3/0;;
-  B..East: ;;
-  X..West: 0x28de1205/3/1;;
-  Y..North: ;;
-  L-Bumper: 0x28de1205/3/4;;
-  R-Bumper: 0x28de1205/3/5;;
-  L-Trigger: ;;
-  R-Trigger: 0x28de1205/0/2/Hi;;
-  L-Stick..Click: ;;
-  R-Stick..Click: ;;
-  L-Up: 0x28de1205/0/1/Lo;;
-  L-Down: 0x28de1205/0/1/Hi;;
-  L-Left: 0x28de1205/0/0/Lo;;
-  L-Right: 0x28de1205/0/0/Hi;;
-  R-Up: 0x28de1205/0/4/Lo;;
-  R-Down: 0x28de1205/0/4/Hi;;
-  R-Left: 0x28de1205/0/3/Lo;;
-  R-Right: 0x28de1205/0/3/Hi;;
-  Rumble: 0x28de1205/3/6;;
-VirtualMouse1
-  X: ;;
-  Y: ;;
-  Left: ;;
-  Middle: ;;
-  Right: ;;
-  Extra: ;;
-VirtualPad2
-  Pad.Up: ;;
-  Pad.Down: ;;
-  Pad.Left: ;;
-  Pad.Right: ;;
-  Select: ;;
-  Start: ;;
-  A..South: ;;
-  B..East: ;;
-  X..West: ;;
-  Y..North: ;;
-  L-Bumper: ;;
-  R-Bumper: ;;
-  L-Trigger: ;;
-  R-Trigger: ;;
-  L-Stick..Click: ;;
-  R-Stick..Click: ;;
-  L-Up: ;;
-  L-Down: ;;
-  L-Left: ;;
-  L-Right: ;;
-  R-Up: ;;
-  R-Down: ;;
-  R-Left: ;;
-  R-Right: ;;
-  Rumble: ;;
-VirtualMouse2
-  X: ;;
-  Y: ;;
-  Left: ;;
-  Middle: ;;
-  Right: ;;
-  Extra: ;;
-VirtualPad3
-  Pad.Up: ;;
-  Pad.Down: ;;
-  Pad.Left: ;;
-  Pad.Right: ;;
-  Select: ;;
-  Start: ;;
-  A..South: ;;
-  B..East: ;;
-  X..West: ;;
-  Y..North: ;;
-  L-Bumper: ;;
-  R-Bumper: ;;
-  L-Trigger: ;;
-  R-Trigger: ;;
-  L-Stick..Click: ;;
-  R-Stick..Click: ;;
-  L-Up: ;;
-  L-Down: ;;
-  L-Left: ;;
-  L-Right: ;;
-  R-Up: ;;
-  R-Down: ;;
-  R-Left: ;;
-  R-Right: ;;
-  Rumble: ;;
-VirtualMouse3
-  X: ;;
-  Y: ;;
-  Left: ;;
-  Middle: ;;
-  Right: ;;
-  Extra: ;;
-VirtualPad4
-  Pad.Up: ;;
-  Pad.Down: ;;
-  Pad.Left: ;;
-  Pad.Right: ;;
-  Select: ;;
-  Start: ;;
-  A..South: ;;
-  B..East: ;;
-  X..West: ;;
-  Y..North: ;;
-  L-Bumper: ;;
-  R-Bumper: ;;
-  L-Trigger: ;;
-  R-Trigger: ;;
-  L-Stick..Click: ;;
-  R-Stick..Click: ;;
-  L-Up: ;;
-  L-Down: ;;
-  L-Left: ;;
-  L-Right: ;;
-  R-Up: ;;
-  R-Down: ;;
-  R-Left: ;;
-  R-Right: ;;
-  Rumble: ;;
-VirtualMouse4
-  X: ;;
-  Y: ;;
-  Left: ;;
-  Middle: ;;
-  Right: ;;
-  Extra: ;;
-VirtualPad5
-  Pad.Up: ;;
-  Pad.Down: ;;
-  Pad.Left: ;;
-  Pad.Right: ;;
-  Select: ;;
-  Start: ;;
-  A..South: ;;
-  B..East: ;;
-  X..West: ;;
-  Y..North: ;;
-  L-Bumper: ;;
-  R-Bumper: ;;
-  L-Trigger: ;;
-  R-Trigger: ;;
-  L-Stick..Click: ;;
-  R-Stick..Click: ;;
-  L-Up: ;;
-  L-Down: ;;
-  L-Left: ;;
-  L-Right: ;;
-  R-Up: ;;
-  R-Down: ;;
-  R-Left: ;;
-  R-Right: ;;
-  Rumble: ;;
-VirtualMouse5
-  X: ;;
-  Y: ;;
-  Left: ;;
-  Middle: ;;
-  Right: ;;
-  Extra: ;;
-Hotkey
-  ToggleFullscreen: ;;
-  ToggleMouseCapture: ;;
-  ToggleKeyboardCapture: ;;
-  FastForward: ;;
-  ToggleFastForward: ;;
-  Rewind: ;;
-  FrameAdvance: ;;
-  CaptureScreenshot: ;;
-  SaveState: ;;
-  LoadState: ;;
-  DecrementStateSlot: ;;
-  IncrementStateSlot: ;;
-  PauseEmulation: ;;
-  ResetSystem: ;;
-  ReloadCurrentGame: ;;
-  QuitEmulator: ;;
-  MuteAudio: ;;
-  IncreaseAudio: ;;
-  DecreaseAudio: ;;
-Arcade
-  Visible: false
-  Path
-Atari2600
-  Visible: false
-  Path
-WonderSwan
-  Visible: false
-  Path
-WonderSwanColor
-  Visible: false
-  Path
-PocketChallengeV2
-  Visible: false
-  Path
-ColecoVision
-  Visible: false
-  Path
-  Firmware
-    BIOS.World
-MyVision
-  Visible: false
-  Path
-MSX
-  Visible: false
-  Path
-  Firmware
-    BIOS.Japan
-MSX2
-  Visible: false
-  Path
-  Firmware
-    MAIN.Japan
-    SUB.Japan
-PCEngine
-  Visible: false
-  Path
-PCEngineCD
-  Visible: false
-  Path
-  Firmware
-    System-Card-1.0.Japan
-    Arcade-Card.Japan
-    System-Card-3.0.US
-    Games-Express.Japan
-SuperGrafx
-  Visible: false
-  Path
-SuperGrafxCD
-  Visible: false
-  Path
-  Firmware
-    Arcade-Card.Japan
-Famicom
-  Visible: false
-  Path
-FamicomDiskSystem
-  Visible: false
-  Path
-  Firmware
-    BIOS.Japan
-SuperFamicom
-  Visible: true
-  Path
-Nintendo64DD
-  Visible: false
-  Path
-  Firmware
-    BIOS.Japan
-    BIOS.US
-    BIOS.DEV
-GameBoy
-  Visible: true
-  Path
-GameBoyColor
-  Visible: true
-  Path
-GameBoyAdvance
-  Visible: true
-  Path
-  Firmware
-    BIOS.World
-SG-1000
-  Visible: false
-  Path
-MasterSystem
-  Visible: false
-  Path
-  Firmware
-    BIOS.US
-    BIOS.Japan
-    BIOS.Europe
-GameGear
-  Visible: false
-  Path
-  Firmware
-    BIOS.World
-Mega32X
-  Visible: false
-  Path
-MegaCD
-  Visible: false
-  Path
-  Firmware
-    BIOS.US
-    BIOS.Japan
-    BIOS.Europe
-MegaCD32X
-  Visible: false
-  Path
-NeoGeoAES
-  Visible: false
-  Path
-  Firmware
-    BIOS.World
-NeoGeoMVS
-  Visible: false
-  Path
-  Firmware
-    BIOS.World
-NeoGeoPocket
-  Visible: false
-  Path
-  Firmware
-    BIOS.World
-NeoGeoPocketColor
-  Visible: false
-  Path
-  Firmware
-    BIOS.World
-PlayStation
-  Visible: true
-  Path
-  Firmware
-    BIOS.US
-    BIOS.Japan
-    BIOS.Europe
-ZXSpectrum
-  Visible: false
-  Path
-ZXSpectrum128
-  Visible: false
-  Path
--- a/nix/steam_deck/configuration/roles/blank/default.nix
+++ b/nix/steam_deck/configuration/roles/blank/default.nix
@@ -1,30 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-
-{
-  imports = [ ];
-
-  options.me = {
-    blank.enable = lib.mkOption {
-      type = lib.types.bool;
-      default = false;
-      example = true;
-      description = "Whether we want to install blank.";
-    };
-  };
-
-  config = lib.mkIf config.me.blank.enable (
-    lib.mkMerge [
-      {
-        home.packages = with pkgs; [
-        ];
-      }
-      (lib.mkIf config.me.graphical {
-      })
-    ]
-  );
-}
--- a/nix/steam_deck/configuration/roles/dolphin/default.nix
+++ b/nix/steam_deck/configuration/roles/dolphin/default.nix
@@ -1,104 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-
-let
-  steam_dolphin = pkgs.writeScriptBin "steam_dolphin" ''
-    export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${pkgs.libglvnd}/lib"
-    exec ${pkgs.dolphin-emu}/bin/dolphin-emu "''${@}"
-  '';
-in
-{
-  imports = [ ];
-
-  options.me = {
-    dolphin.enable = lib.mkOption {
-      type = lib.types.bool;
-      default = false;
-      example = true;
-      description = "Whether we want to install dolphin.";
-    };
-  };
-
-  config = lib.mkIf config.me.dolphin.enable (
-    lib.mkMerge [
-      (lib.mkIf config.me.graphical {
-        home.packages = with pkgs; [
-          dolphin-emu
-          steam_dolphin
-        ];
-
-        home.file.".config/dolphin-emu/Dolphin.ini" = {
-          source = ./files/Dolphin.ini;
-        };
-
-        home.file.".config/dolphin-emu/GFX.ini" = {
-          source = ./files/GFX.ini;
-        };
-
-        home.file.".config/dolphin-emu/Profiles/GCPad/deck.ini" = {
-          source = ./files/deck.ini;
-        };
-
-        home.file.".config/dolphin-emu/GCPadNew.ini" = {
-          source = ./files/GCPadNew.ini;
-        };
-
-        me.persist.directories = [
-          ".local/share/dolphin-emu/Wii" # The system memory
-          ".local/share/dolphin-emu/Load" # Memory card(s)
-          ".local/share/dolphin-emu/GC" # Gamecube
-          ".local/share/dolphin-emu/ScreenShots" # Screenshots
-          ".local/share/dolphin-emu/GBA/Saves" # GameBoy Advanced
-        ];
-        me.state.directories = [
-          ".cache/dolphin-emu"
-          ".local/share/dolphin-emu/Shaders"
-          ".local/share/dolphin-emu/StateSaves"
-        ];
-
-        nixpkgs.overlays = [
-          (
-            final: prev:
-            let
-              optimizeWithFlags =
-                pkg: flags:
-                pkg.overrideAttrs (old: {
-                  NIX_CFLAGS_COMPILE = [ (old.NIX_CFLAGS_COMPILE or "") ] ++ flags;
-                });
-              original_package =
-                if config.me.optimizations.enable then
-                  (optimizeWithFlags prev.dolphin-emu [
-                    # Verified working with ps
-                    "-march=znver2"
-                    "-mtune=znver2"
-                  ])
-                else
-                  prev.dolphin-emu;
-            in
-            {
-              dolphin-emu = pkgs.buildEnv {
-                name = prev.dolphin-emu.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/dolphin-emu.desktop
-                '';
-              };
-            }
-          )
-        ];
-      })
-    ]
-  );
-}
--- a/nix/steam_deck/configuration/roles/dolphin/files/Dolphin.ini
+++ b/nix/steam_deck/configuration/roles/dolphin/files/Dolphin.ini
@@ -1,25 +0,0 @@
-[Analytics]
-Enabled = False
-PermissionAsked = True
-[Core]
-GFXBackend = Vulkan
-# GFXBackend = OGL
-SlotA = 8 # GCI Folder (each game gets its own file)
-SlotB = 255 # None
-WiiSDCard = False
-[Display]
-RenderToMain = True
-[General]
-ISOPath0 = /home/deck/.persist/manual/games/nintendo_gamecube/roms
-ISOPath1 = /home/deck/.persist/manual/games/nintendo_wii/roms
-ISOPaths = 2
-RecursiveISOPaths = True
-[DSP]
-Backend = Cubeb
-# Backend = Pulse
-# Backend = ALSA
-[USBPassthrough]
-Devices = 057e:0305
-# BluetoothPassthrough must be at the end for the pairings to save properly
-[BluetoothPassthrough]
-Enabled = True
--- a/nix/steam_deck/configuration/roles/dolphin/files/GCPadNew.ini
+++ b/nix/steam_deck/configuration/roles/dolphin/files/GCPadNew.ini
@@ -1,32 +0,0 @@
-[GCPad1]
-Device = SDL/0/Steam Deck Controller
-Buttons/A = `Button S`
-Buttons/B = `Button E`
-Buttons/X = `Button W`
-Buttons/Y = `Button N`
-Buttons/Z = `Shoulder R`
-Buttons/Start = Start
-Main Stick/Up = `Left Y+`
-Main Stick/Down = `Left Y-`
-Main Stick/Left = `Left X-`
-Main Stick/Right = `Left X+`
-Main Stick/Modifier = `Thumb L`
-Main Stick/Calibration = 100.00 101.96 108.24 120.27 137.87 120.27 108.24 101.96 100.00 101.96 108.24 120.27 141.42 120.27 108.24 101.96 100.00 101.96 108.24 120.27 141.42 120.27 108.24 101.96 100.00 101.96 108.24 120.27 136.32 120.27 108.24 101.96
-C-Stick/Up = `Right Y+`
-C-Stick/Down = `Right Y-`
-C-Stick/Left = `Right X-`
-C-Stick/Right = `Right X+`
-C-Stick/Modifier = `Thumb R`
-C-Stick/Calibration = 100.00 101.96 108.24 120.27 141.42 120.27 108.24 101.96 100.00 101.96 108.24 120.27 136.25 120.27 108.24 101.96 100.00 101.96 108.24 120.27 134.42 120.27 108.24 101.96 100.00 101.96 108.24 120.27 141.42 120.27 108.24 101.96
-D-Pad/Up = `Pad N`
-D-Pad/Down = `Pad S`
-D-Pad/Left = `Pad W`
-D-Pad/Right = `Pad E`
-Triggers/L-Analog = `Trigger L`
-Triggers/R-Analog = `Trigger R`
-[GCPad2]
-Device = XInput2/0/Virtual core pointer
-[GCPad3]
-Device = XInput2/0/Virtual core pointer
-[GCPad4]
-Device = XInput2/0/Virtual core pointer
--- a/nix/steam_deck/configuration/roles/dolphin/files/GFX.ini
+++ b/nix/steam_deck/configuration/roles/dolphin/files/GFX.ini
@@ -1,16 +0,0 @@
-# [Enhancements]
-#MaxAnisotropy = 4 # 16x Anisotropic texture filtering
-# MaxAnisotropy = 2 # 4x Anisotropic texture filtering
-#MaxAnisotropy = 1 # 2x Anisotropic texture filtering
-#MaxAnisotropy = 0 # default
-[Settings]
-WaitForShadersBeforeStarting = True
-# WaitForShadersBeforeStarting = False
-# MSAA = 0x00000004 # 4x MSAA
-#MSAA = 0x00000002 # 2x MSAA
-#MSAA = 0x00000001 # none
-SSAA = False
-# InternalResolution = 1 # 2x native
-#ShaderCompilationMode = 2 # Hybrid ubershaders
-ShaderCompilationMode = 3 # Skip
-# ShowGraphs = True
--- a/nix/steam_deck/configuration/roles/dolphin/files/deck.ini
+++ b/nix/steam_deck/configuration/roles/dolphin/files/deck.ini
@@ -1,26 +0,0 @@
-[Profile]
-Device = SDL/0/Steam Deck Controller
-Buttons/A = `Button S`
-Buttons/B = `Button E`
-Buttons/X = `Button W`
-Buttons/Y = `Button N`
-Buttons/Z = `Shoulder R`
-Buttons/Start = Start
-Main Stick/Up = `Left Y+`
-Main Stick/Down = `Left Y-`
-Main Stick/Left = `Left X-`
-Main Stick/Right = `Left X+`
-Main Stick/Modifier = `Thumb L`
-Main Stick/Calibration = 100.00 101.96 108.24 120.27 137.87 120.27 108.24 101.96 100.00 101.96 108.24 120.27 141.42 120.27 108.24 101.96 100.00 101.96 108.24 120.27 141.42 120.27 108.24 101.96 100.00 101.96 108.24 120.27 136.32 120.27 108.24 101.96
-C-Stick/Up = `Right Y+`
-C-Stick/Down = `Right Y-`
-C-Stick/Left = `Right X-`
-C-Stick/Right = `Right X+`
-C-Stick/Modifier = `Thumb R`
-C-Stick/Calibration = 100.00 101.96 108.24 120.27 141.42 120.27 108.24 101.96 100.00 101.96 108.24 120.27 136.25 120.27 108.24 101.96 100.00 101.96 108.24 120.27 134.42 120.27 108.24 101.96 100.00 101.96 108.24 120.27 141.42 120.27 108.24 101.96
-Triggers/L-Analog = `Trigger L`
-Triggers/R-Analog = `Trigger R`
-D-Pad/Up = `Pad N`
-D-Pad/Down = `Pad S`
-D-Pad/Left = `Pad W`
-D-Pad/Right = `Pad E`
--- a/nix/steam_deck/configuration/roles/global_options/default.nix
+++ b/nix/steam_deck/configuration/roles/global_options/default.nix
@@ -1,19 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-
-{
-  imports = [ ];
-
-  options.me = {
-    optimizations.enable = lib.mkOption {
-      type = lib.types.bool;
-      default = false;
-      example = true;
-      description = "Whether we want to enable CPU optimizations (will trigger a rebuild from source).";
-    };
-  };
-}
--- a/nix/steam_deck/configuration/roles/graphics/default.nix
+++ b/nix/steam_deck/configuration/roles/graphics/default.nix
@@ -1,43 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  nixgl,
-  ...
-}:
-
-{
-  imports = [ ];
-
-  options.me.graphics_card_type = lib.mkOption {
-    type = lib.types.nullOr (
-      lib.types.enum [
-        "amd"
-        "intel"
-        "nvidia"
-      ]
-    );
-    default = null;
-    example = "amd";
-    description = "What graphics card type is in the computer.";
-  };
-
-  options.me.graphical = lib.mkOption {
-    type = lib.types.bool;
-    default = false;
-    example = true;
-    description = "Whether we want to install graphical programs.";
-  };
-
-  config = (
-    lib.mkMerge [
-      (lib.mkIf config.me.graphical {
-        nixGL.packages = nixgl.packages;
-        # home.packages = with pkgs; [
-        #   mesa-demos # for glxgears
-        #   vulkan-tools # for vkcube
-        # ];
-      })
-    ]
-  );
-}
--- a/nix/steam_deck/configuration/roles/pcsx2/default.nix
+++ b/nix/steam_deck/configuration/roles/pcsx2/default.nix
@@ -1,87 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-
-let
-  steam_pcsx2 = pkgs.writeScriptBin "steam_pcsx2" ''
-    export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${pkgs.libglvnd}/lib"
-    exec ${pkgs.pcsx2}/bin/pcsx2-qt "''${@}"
-  '';
-in
-{
-  imports = [ ];
-
-  options.me = {
-    pcsx2.enable = lib.mkOption {
-      type = lib.types.bool;
-      default = false;
-      example = true;
-      description = "Whether we want to install pcsx2.";
-    };
-  };
-
-  config = lib.mkIf config.me.pcsx2.enable (
-    lib.mkMerge [
-      (lib.mkIf config.me.graphical {
-        home.packages = with pkgs; [
-          pcsx2
-          steam_pcsx2
-        ];
-
-        home.file.".config/PCSX2/inis/PCSX2.ini" = {
-          source = ./files/PCSX2.ini;
-        };
-
-        me.persist.directories = [ ".config/PCSX2/memcards" ];
-        me.state.directories = [
-          ".config/PCSX2/cache"
-          ".config/PCSX2/sstates"
-          ".config/PCSX2/snaps"
-          ".config/PCSX2/covers"
-          ".config/PCSX2/videos"
-        ];
-
-        nixpkgs.overlays = [
-          (
-            final: prev:
-            let
-              optimizeWithFlags =
-                pkg: flags:
-                pkg.overrideAttrs (old: {
-                  NIX_CFLAGS_COMPILE = [ (old.NIX_CFLAGS_COMPILE or "") ] ++ flags;
-                });
-              original_package =
-                if config.me.optimizations.enable then
-                  (optimizeWithFlags prev.pcsx2 [
-                    "-march=znver2"
-                    "-mtune=znver2"
-                  ])
-                else
-                  prev.pcsx2;
-            in
-            {
-              pcsx2 = pkgs.buildEnv {
-                name = prev.pcsx2.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/PCSX2.desktop
-                '';
-              };
-            }
-          )
-        ];
-      })
-    ]
-  );
-}
--- a/nix/steam_deck/configuration/roles/pcsx2/files/PCSX2.ini
+++ b/nix/steam_deck/configuration/roles/pcsx2/files/PCSX2.ini
@@ -1,104 +0,0 @@
-[UI]
-SettingsVersion = 1
-InhibitScreensaver = true
-ConfirmShutdown = false
-StartPaused = false
-PauseOnFocusLoss = true
-StartFullscreen = true
-
-
-[Folders]
-Bios = ../../.persist/manual/games/ps2/bios
-Snapshots = snaps
-Savestates = sstates
-MemoryCards = memcards
-Logs = logs
-Cheats = cheats
-Patches = patches
-UserResources = resources
-Cache = cache
-Textures = textures
-InputProfiles = inputprofiles
-Videos = videos
-
-
-[EmuCore/GS]
-VsyncEnable = true
-# Internal resolution aspect corrected
-ScreenshotSize = 1
-# webp
-ScreenshotFormat = 2
-OsdShowFPS = false
-# Capture video at internal resolution
-VideoCaptureAutoResolution = true
-# 2x native resolution
-upscale_multiplier = 2
-CaptureContainer = mkv
-VideoCaptureCodec = av1_vaapi
-AudioCaptureCodec = flac
-
-
-[Filenames]
-BIOS = ps2-0230a-20080220.bin
-
-[MemoryCards]
-Slot1_Enable = true
-Slot1_Filename = Mcd001.ps2
-Slot2_Enable = true
-Slot2_Filename = Mcd002.ps2
-
-
-[InputSources]
-Keyboard = false
-Mouse = false
-SDL = true
-# Enhanced ps4 and ps5 controller support
-SDLControllerEnhancedMode = true
-SDLPS5PlayerLED = true
-
-
-[Pad1]
-Type = DualShock2
-InvertL = 0
-InvertR = 0
-Deadzone = 0
-AxisScale = 1.33
-LargeMotorScale = 1
-SmallMotorScale = 1
-ButtonDeadzone = 0
-PressureModifier = 0.5
-Up = SDL-0/DPadUp
-Right = SDL-0/DPadRight
-Down = SDL-0/DPadDown
-Left = SDL-0/DPadLeft
-Triangle = SDL-0/Y
-Circle = SDL-0/B
-Cross = SDL-0/A
-Square = SDL-0/X
-Select = SDL-0/Back
-Start = SDL-0/Start
-L1 = SDL-0/LeftShoulder
-L2 = SDL-0/+LeftTrigger
-R1 = SDL-0/RightShoulder
-R2 = SDL-0/+RightTrigger
-L3 = SDL-0/LeftStick
-R3 = SDL-0/RightStick
-LUp = SDL-0/-LeftY
-LRight = SDL-0/+LeftX
-LDown = SDL-0/+LeftY
-LLeft = SDL-0/-LeftX
-RUp = SDL-0/-RightY
-RRight = SDL-0/+RightX
-RDown = SDL-0/+RightY
-RLeft = SDL-0/-RightX
-Analog = SDL-0/Guide
-LargeMotor = SDL-0/LargeMotor
-SmallMotor = SDL-0/SmallMotor
-
-
-[AutoUpdater]
-CheckAtStartup = false
-
-
-[GameList]
-RecursivePaths = /home/deck/.persist/manual/games/ps2/roms
--- a/nix/steam_deck/configuration/roles/rpcs3/default.nix
+++ b/nix/steam_deck/configuration/roles/rpcs3/default.nix
@@ -1,86 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-
-let
-  steam_rpcs3 = pkgs.writeScriptBin "steam_rpcs3" ''
-    export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${pkgs.libglvnd}/lib"
-    exec ${pkgs.rpcs3}/bin/rpcs3 "''${@}"
-  '';
-in
-{
-  imports = [ ];
-
-  options.me = {
-    rpcs3.enable = lib.mkOption {
-      type = lib.types.bool;
-      default = false;
-      example = true;
-      description = "Whether we want to install rpcs3.";
-    };
-  };
-
-  config = lib.mkIf config.me.rpcs3.enable (
-    lib.mkMerge [
-      (lib.mkIf config.me.graphical {
-        home.packages = with pkgs; [
-          rpcs3
-          steam_rpcs3
-        ];
-
-        # .config/rpcs3/config.yml
-        # .config/rpcs3/GuiConfigs/CurrentSettings.ini
-
-        me.persist.directories = [
-          ".config/rpcs3/dev_hdd0"
-          ".config/rpcs3/dev_hdd1"
-          ".config/rpcs3/savestates"
-          ".config/rpcs3/dev_usb000"
-          ".config/rpcs3/dev_flash" # Seems to be where the firmware is installed.
-        ];
-        me.state.directories = [ ".cache/rpcs3" ];
-
-        nixpkgs.overlays = [
-          (
-            final: prev:
-            let
-              optimizeWithFlags =
-                pkg: flags:
-                pkg.overrideAttrs (old: {
-                  NIX_CFLAGS_COMPILE = [ (old.NIX_CFLAGS_COMPILE or "") ] ++ flags;
-                });
-              original_package =
-                if config.me.optimizations.enable then
-                  (optimizeWithFlags prev.rpcs3 [
-                    "-march=znver2"
-                    "-mtune=znver2"
-                  ])
-                else
-                  prev.rpcs3;
-            in
-            {
-              rpcs3 = pkgs.buildEnv {
-                name = prev.rpcs3.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/rpcs3.desktop
-                '';
-              };
-            }
-          )
-        ];
-      })
-    ]
-  );
-}
--- a/nix/steam_deck/configuration/roles/shipwright/default.nix
+++ b/nix/steam_deck/configuration/roles/shipwright/default.nix
@@ -1,90 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-
-let
-  steam_shipwright = pkgs.writeScriptBin "steam_soh" ''
-    export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${pkgs.libglvnd}/lib"
-    exec ${pkgs.shipwright}/bin/soh "''${@}"
-  '';
-in
-{
-  imports = [ ];
-
-  options.me = {
-    shipwright.enable = lib.mkOption {
-      type = lib.types.bool;
-      default = false;
-      example = true;
-      description = "Whether we want to install shipwright.";
-    };
-  };
-
-  config = lib.mkIf config.me.shipwright.enable (
-    lib.mkMerge [
-      {
-        allowedUnfree = [ "shipwright" ];
-      }
-      (lib.mkIf config.me.graphical {
-        home.packages = with pkgs; [
-          shipwright
-          steam_shipwright
-        ];
-
-        home.file.".local/share/soh/shipofharkinian.json" = {
-          source = ./files/shipofharkinian.json;
-        };
-
-        me.persist.directories = [ ".local/share/soh/Save" ];
-        home.persistence."/home/deck/.state" = {
-          files = [
-            ".local/share/soh/oot.otr"
-          ];
-        };
-
-        nixpkgs.overlays = [
-          (
-            final: prev:
-            let
-              optimizeWithFlags =
-                pkg: flags:
-                pkg.overrideAttrs (old: {
-                  NIX_CFLAGS_COMPILE = [ (old.NIX_CFLAGS_COMPILE or "") ] ++ flags;
-                });
-              original_package = prev.shipwright;
-              # Optimization is broken for shipwright, fails to build "The following attributes are overlapping"
-              # original_package =
-              #   if !config.me.optimizations.enable then
-              #     (optimizeWithFlags prev.shipwright [
-              #       "-march=znver2"
-              #       "-mtune=znver2"
-              #     ])
-              #   else
-              #     prev.shipwright;
-            in
-            {
-              shipwright = pkgs.buildEnv {
-                name = prev.shipwright.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/soh.desktop
-                '';
-              };
-            }
-          )
-        ];
-      })
-    ]
-  );
-}
--- a/nix/steam_deck/configuration/roles/shipwright/files/shipofharkinian.json
+++ b/nix/steam_deck/configuration/roles/shipwright/files/shipofharkinian.json
@@ -1,20 +0,0 @@
-{
-  "CVars": {
-    "gAuthenticLogo": 1,
-    "gInternalResolution": 2.0,
-    "gInterpolationFPS": 60,
-    "gMSAAValue": 2,
-    "gMatchRefreshRate": 1,
-    "gOnFileSelectNameEntry": 0,
-    "gOpenWindows": {
-      "modalWindowEnabled": 1
-    },
-    "gZFightingMode": 0
-  },
-  "ConfigVersion": 2,
-  "Window": {
-    "Fullscreen": {
-      "Enabled": true
-    }
-  }
-}
--- a/nix/steam_deck/configuration/roles/sm64ex/default.nix
+++ b/nix/steam_deck/configuration/roles/sm64ex/default.nix
@@ -1,109 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-
-let
-  steam_sm64ex = pkgs.writeScriptBin "steam_sm64ex" ''
-    export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${pkgs.libglvnd}/lib"
-    exec ${pkgs.sm64ex}/bin/sm64ex "''${@}"
-  '';
-in
-{
-  imports = [ ];
-
-  options.me = {
-    sm64ex.enable = lib.mkOption {
-      type = lib.types.bool;
-      default = false;
-      example = true;
-      description = "Whether we want to install sm64ex.";
-    };
-  };
-
-  config = lib.mkIf config.me.sm64ex.enable (
-    lib.mkMerge [
-      (lib.mkIf config.me.graphical {
-        allowedUnfree = [ "sm64ex" ];
-
-        home.packages = with pkgs; [
-          sm64ex
-          steam_sm64ex
-        ];
-
-        # nixpkgs.overlays = [
-        #   (final: prev: {
-        #     sm4ex = prev.sm64ex.override {
-        #       baseRom.name = "SuperMario64.z64";
-        #     };
-        #   })
-        # ];
-
-        home.file.".local/share/sm64ex/sm64config.txt" = {
-          source = ./files/sm64config.txt;
-        };
-
-        home.persistence."/home/deck/.persist" = {
-          files = [
-            ".local/share/sm64ex/sm64_save_file.bin"
-          ];
-        };
-
-        nixpkgs.overlays = [
-          (
-            final: prev:
-            let
-              optimizeWithFlags =
-                pkg: flags:
-                pkg.overrideAttrs (old: {
-                  NIX_CFLAGS_COMPILE = [ (old.NIX_CFLAGS_COMPILE or "") ] ++ flags;
-                });
-              original_package =
-                if config.me.optimizations.enable then
-                  (optimizeWithFlags prev.sm64ex [
-                    "-march=znver2"
-                    "-mtune=znver2"
-                  ])
-                else
-                  prev.sm64ex;
-            in
-            {
-              sm64ex =
-                let
-                  desktop_item = pkgs.makeDesktopItem {
-                    name = "sm64ex";
-                    desktopName = "Super Mario 64";
-                    comment = "A PC Port of Super Mario 64.";
-                    categories = [
-                      "Game"
-                    ];
-                    icon = "sm64ex";
-                    type = "Application";
-                    exec = "sm64ex";
-                  };
-                in
-                pkgs.buildEnv {
-                  name = prev.sm64ex.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 = ''
-                    install -m 555 -D "${desktop_item}/share/applications/"* -t $out/share/applications/
-                    install -m 444 -D "${./files/icon.png}" $out/share/pixmaps/sm64ex.png
-                  '';
-                };
-            }
-          )
-        ];
-      })
-    ]
-  );
-}
--- a/nix/steam_deck/configuration/roles/sm64ex/files/sm64config.txt
+++ b/nix/steam_deck/configuration/roles/sm64ex/files/sm64config.txt
@@ -1 +0,0 @@
-fullscreen true
--- a/nix/steam_deck/configuration/roles/steam_rom_manager/default.nix
+++ b/nix/steam_deck/configuration/roles/steam_rom_manager/default.nix
@@ -1,54 +0,0 @@
-{
-  stdenv,
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-
-let
-  package = (pkgs.callPackage ./package.nix { });
-in
-{
-  imports = [ ];
-
-  options.me = {
-    steam_rom_manager.enable = lib.mkOption {
-      type = lib.types.bool;
-      default = false;
-      example = true;
-      description = "Whether we want to install steam_rom_manager.";
-    };
-  };
-
-  config = lib.mkIf config.me.steam_rom_manager.enable (
-    lib.mkMerge [
-      (lib.mkIf config.me.graphical {
-        home.packages = with pkgs; [
-          package
-        ];
-
-        me.persist.directories = [ ".config/steam-rom-manager/userData" ];
-
-        home.persistence."/home/deck/.persist" = {
-          directories = [
-            {
-              directory = ".config/steam-rom-manager/userData";
-              method = "symlink";
-            }
-          ];
-        };
-
-        # TODO: Install a fully configured /home/deck/.persist/.config/steam-rom-manager/userData/userConfigurations.json (which contains the parser definitions) and /home/deck/.persist/.config/steam-rom-manager/userData/userSettings.json (which contains the applications settings like steam directory).
-        # TODO: Maybe only persist /home/deck/.persist/.config/steam-rom-manager/userData/artworkBackups and /home/deck/.persist/.config/steam-rom-manager/userData/artworkCache.json after the parser config is being installed.
-
-        # home.persistence."/home/deck/.state" = {
-        #   files = [
-        #     ".config/steam-rom-manager/userData/configPresets.json"
-        #   ];
-        # };
-
-      })
-    ]
-  );
-}
--- a/nix/steam_deck/configuration/roles/steam_rom_manager/package.nix
+++ b/nix/steam_deck/configuration/roles/steam_rom_manager/package.nix
@@ -1,49 +0,0 @@
-{
-  stdenv,
-  lib,
-  pkgs,
-  makeDesktopItem,
-}:
-
-let
-  version = "2.5.29";
-  icon = pkgs.fetchurl {
-    url = "https://github.com/SteamGridDB/steam-rom-manager/blob/master/src/assets/icons/512x512.png?raw=true";
-    hash = "sha256-Nx29nJ2+44AYrTLP+CNmDJFAf2sjrH7sfYhg9fJx2qo=";
-  };
-in
-stdenv.mkDerivation {
-  name = "steam-rom-manager";
-  src = pkgs.fetchurl {
-    url = "https://github.com/SteamGridDB/steam-rom-manager/releases/download/v${version}/Steam-ROM-Manager-${version}.AppImage";
-    hash = "sha256-6ZJ+MGIgr2osuQuqD6N9NnPiJFNq/HW6ivG8tyXUhvs=";
-  };
-  phases = [
-    "installPhase"
-  ];
-  installPhase = ''
-    runHook preInstall
-    mkdir -p $out/bin
-    install --mode=0755 $src $out/bin/steam-rom-manager
-    runHook postInstall
-  '';
-  # 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.
-  postInstall = ''
-    mkdir -p $out/share/{applications,pixmaps}
-    install -m 555 -D "$desktopItem/share/applications/"* -t $out/share/applications/
-    install -m 444 -D "${icon}" $out/share/pixmaps/steamrommanager.png
-  '';
-
-  desktopItem = makeDesktopItem {
-    name = "steam-rom-manager";
-    desktopName = "Steam Rom Manager";
-    comment = "Manage additional entries in the Steam launcher.";
-    categories = [
-      "Application"
-      "Utility"
-    ];
-    icon = "steamrommanager";
-    type = "Application";
-    exec = "steam-rom-manager";
-  };
-}
--- a/nix/steam_deck/configuration/util/persist_symlink/default.nix
+++ b/nix/steam_deck/configuration/util/persist_symlink/default.nix
@@ -1,79 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  home-manager,
-  ...
-}:
-
-{
-  imports = [ ];
-
-  options.me = {
-    persist.directories = lib.mkOption {
-      type = lib.types.listOf lib.types.str;
-      default = [ ];
-      example = [ ".local/share/dolphin-emu/Wii" ];
-      description = "List of folders relative to the home directory to persist.";
-    };
-    state.directories = lib.mkOption {
-      type = lib.types.listOf lib.types.str;
-      default = [ ];
-      example = [ ".local/share/dolphin-emu/Shaders" ];
-      description = "List of folders relative to the home directory to keep as state.";
-    };
-  };
-
-  config = lib.mkMerge [
-    (lib.mkIf (config.me.persist.directories != [ ]) {
-      home.persistence."/home/deck/.persist" = {
-        directories = (
-          builtins.map (entry: {
-            directory = entry;
-            method = "symlink";
-          }) config.me.persist.directories
-        );
-      };
-
-      home.activation = {
-        createPersistDirectories = home-manager.lib.hm.dag.entryAfter [ "writeBoundary" ] (
-          let
-            dirlist = lib.strings.escapeShellArgs config.me.persist.directories;
-          in
-          ''
-            for dir in ${dirlist} ; do
-              if [[ ! -d "$HOME/.persist/$dir" ]]; then
-                $DRY_RUN_CMD mkdir $VERBOSE_ARG -p "$HOME/.persist/$dir"
-              fi
-            done
-          ''
-        );
-      };
-    })
-    (lib.mkIf (config.me.state.directories != [ ]) {
-      home.persistence."/home/deck/.state" = {
-        directories = (
-          builtins.map (entry: {
-            directory = entry;
-            method = "symlink";
-          }) config.me.state.directories
-        );
-      };
-
-      home.activation = {
-        createStateDirectories = home-manager.lib.hm.dag.entryAfter [ "writeBoundary" ] (
-          let
-            dirlist = lib.strings.escapeShellArgs config.me.state.directories;
-          in
-          ''
-            for dir in ${dirlist} ; do
-              if [[ ! -d "$HOME/.state/$dir" ]]; then
-                $DRY_RUN_CMD mkdir $VERBOSE_ARG -p "$HOME/.state/$dir"
-              fi
-            done
-          ''
-        );
-      };
-    })
-  ];
-}
--- a/nix/steam_deck/configuration/util/unfree_polyfill/default.nix
+++ b/nix/steam_deck/configuration/util/unfree_polyfill/default.nix
@@ -1,15 +0,0 @@
-{ config, lib, ... }:
-
-let
-  inherit (builtins) elem;
-  inherit (lib) getName mkOption;
-  inherit (lib.types) listOf str;
-in
-{
-  # Pending https://github.com/NixOS/nixpkgs/issues/55674
-  options.allowedUnfree = mkOption {
-    type = listOf str;
-    default = [ ];
-  };
-  config.nixpkgs.config.allowUnfreePredicate = p: elem (getName p) config.allowedUnfree;
-}
Author	SHA1	Message	Date
Tom Alexander	9513882870	Still not working.	2025-01-27 20:38:45 -05:00
Tom Alexander	71a6843b37	Same issue with package based on 2ship2harkinian.	2025-01-27 19:26:38 -05:00
Tom Alexander	7d9d1ca80e	Add a package for starship (Star Fox 64).	2025-01-27 19:26:38 -05:00