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 · 2025-01-26 19:04:17 -05:00 · 2025-01-26 18:55:53 -05:00 · 2025-01-26 16:57:18 -05:00
42 changed files with 1565 additions and 588 deletions
--- a/nix/configuration/configuration.nix
+++ b/nix/configuration/configuration.nix
@@ -59,6 +59,10 @@
    ./roles/kodi
    ./roles/ansible
    ./roles/bluetooth
+    ./roles/sm64ex
+    ./roles/shipwright
+    ./roles/2ship2harkinian
+    ./roles/nix_index
  ];

  nix.settings.experimental-features = [
@@ -128,9 +132,6 @@
    }
  ];

-  # Do not use default packages (nixos includes some defaults like nano)
-  environment.defaultPackages = lib.mkForce [ ];
-
  environment.systemPackages = with pkgs; [
    wget
    mg
@@ -147,9 +148,10 @@
    trace-cmd # ftrace
    tcpdump
    git-crypt
-    nix-index-unwrapped
    gnumake
    ncdu
+    nix-tree
+    libarchive # bsdtar
  ];

  services.openssh = {
@@ -186,10 +188,16 @@
      "/etc/ssh/ssh_host_ed25519_key"
      "/etc/ssh/ssh_host_ed25519_key.pub"
    ];
-    # users.talexander = {
-    #   directories = [];
-    #   files = [];
-    # };
+    users.talexander = {
+      directories = [
+        {
+          directory = "persist";
+          user = "talexander";
+          group = "talexander";
+          mode = "0700";
+        }
+      ];
+    };
  };

  # Write a list of the currently installed packages to /etc/current-system-packages
@@ -201,12 +209,24 @@
    in
    formatted;

+  # environment.etc."system-packages-with-source".text = builtins.concatStringsSep "\n\n" (
+  #   builtins.map (
+  #     x: x.file + "\n" + builtins.concatStringsSep "\n" (builtins.map (s: "  " + s) x.value)
+  #   ) config.environment.systemPackages.definitionsWithLocations
+  # );
+
  # nixpkgs.overlays = [
  #   (final: prev: {
  #     nix = pkgs-unstable.nix;
  #   })
  # ];

+  # nixpkgs.overlays = [
+  #   (final: prev: {
+  #     foot = throw "foo";
+  #   })
+  # ];
+
  # Copy the NixOS configuration file and link it from the resulting system
  # (/run/current-system/configuration.nix). This is useful in case you
  # accidentally delete configuration.nix.
--- a/nix/configuration/flake.lock
+++ b/nix/configuration/flake.lock
@@ -1,18 +1,30 @@
 {
  "nodes": {
-    "crane": {
+    "ansible-sshjail": {
      "inputs": {
+        "flake-utils": "flake-utils",
        "nixpkgs": [
-          "lanzaboote",
          "nixpkgs"
        ]
      },
      "locked": {
-        "lastModified": 1717535930,
-        "narHash": "sha256-1hZ/txnbd/RmiBPNUs7i8UQw2N89uAK3UzrGAWdnFfU=",
+        "lastModified": 1,
+        "narHash": "sha256-c4Ds4E/10Zj5AQLuJ3JvJTuDK8o2WjVXLcIL7eyhTfw=",
+        "path": "flakes/ansible-sshjail",
+        "type": "path"
+      },
+      "original": {
+        "path": "flakes/ansible-sshjail",
+        "type": "path"
+      }
+    },
+    "crane": {
+      "locked": {
+        "lastModified": 1731098351,
+        "narHash": "sha256-HQkYvKvaLQqNa10KEFGgWHfMAbWBfFp+4cAgkut+NNE=",
        "owner": "ipetkov",
        "repo": "crane",
-        "rev": "55e7754ec31dac78980c8be45f8a28e80e370946",
+        "rev": "ef80ead953c1b28316cc3f8613904edc2eb90c28",
        "type": "github"
      },
      "original": {
@@ -45,11 +57,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1717285511,
-        "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=",
+        "lastModified": 1730504689,
+        "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=",
        "owner": "hercules-ci",
        "repo": "flake-parts",
-        "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8",
+        "rev": "506278e768c2a08bec68eb62932193e341f55c90",
        "type": "github"
      },
      "original": {
@@ -63,11 +75,11 @@
        "systems": "systems"
      },
      "locked": {
-        "lastModified": 1710146030,
-        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
        "owner": "numtide",
        "repo": "flake-utils",
-        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
        "type": "github"
      },
      "original": {
@@ -123,11 +135,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1737120639,
-        "narHash": "sha256-p5e/45V41YD3tMELuiNIoVCa25/w4nhOTm0B9MtdHFI=",
+        "lastModified": 1737762889,
+        "narHash": "sha256-5HGG09bh/Yx0JA8wtBMAzt0HMCL1bYZ93x4IqzVExio=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "a0046af169ce7b1da503974e1b22c48ef4d71887",
+        "rev": "daf04c5950b676f47a794300657f1d3d14c1a120",
        "type": "github"
      },
      "original": {
@@ -138,11 +150,11 @@
    },
    "impermanence": {
      "locked": {
-        "lastModified": 1736688610,
-        "narHash": "sha256-1Zl9xahw399UiZSJ9Vxs1W4WRFjO1SsNdVZQD4nghz0=",
+        "lastModified": 1737831083,
+        "narHash": "sha256-LJggUHbpyeDvNagTUrdhe/pRVp4pnS6wVKALS782gRI=",
        "owner": "nix-community",
        "repo": "impermanence",
-        "rev": "c64bed13b562fc3bb454b48773d4155023ac31b7",
+        "rev": "4b3e914cdf97a5b536a889e939fb2fd2b043a170",
        "type": "github"
      },
      "original": {
@@ -156,7 +168,6 @@
        "crane": "crane",
        "flake-compat": "flake-compat",
        "flake-parts": "flake-parts",
-        "flake-utils": "flake-utils",
        "nixpkgs": [
          "nixpkgs"
        ],
@@ -164,27 +175,27 @@
        "rust-overlay": "rust-overlay"
      },
      "locked": {
-        "lastModified": 1718178907,
-        "narHash": "sha256-eSZyrQ9uoPB9iPQ8Y5H7gAmAgAvCw3InStmU3oEjqsE=",
+        "lastModified": 1737639419,
+        "narHash": "sha256-AEEDktApTEZ5PZXNDkry2YV2k6t0dTgLPEmAZbnigXU=",
        "owner": "nix-community",
        "repo": "lanzaboote",
-        "rev": "b627ccd97d0159214cee5c7db1412b75e4be6086",
+        "rev": "a65905a09e2c43ff63be8c0e86a93712361f871e",
        "type": "github"
      },
      "original": {
        "owner": "nix-community",
-        "ref": "v0.4.1",
+        "ref": "v0.4.2",
        "repo": "lanzaboote",
        "type": "github"
      }
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1737062831,
-        "narHash": "sha256-Tbk1MZbtV2s5aG+iM99U8FqwxU/YNArMcWAv6clcsBc=",
+        "lastModified": 1737885589,
+        "narHash": "sha256-Zf0hSrtzaM1DEz8//+Xs51k/wdSajticVrATqDrfQjg=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "5df43628fdf08d642be8ba5b3625a6c70731c19c",
+        "rev": "852ff1d9e153d8875a83602e03fdef8a63f0ecf8",
        "type": "github"
      },
      "original": {
@@ -212,16 +223,16 @@
    },
    "nixpkgs-stable": {
      "locked": {
-        "lastModified": 1710695816,
-        "narHash": "sha256-3Eh7fhEID17pv9ZxrPwCLfqXnYP006RKzSs0JptsN84=",
+        "lastModified": 1730741070,
+        "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "614b4613980a522ba49f0d194531beddbb7220d3",
+        "rev": "d063c1dd113c91ab27959ba540c0d9753409edf3",
        "type": "github"
      },
      "original": {
        "owner": "NixOS",
-        "ref": "nixos-23.11",
+        "ref": "nixos-24.05",
        "repo": "nixpkgs",
        "type": "github"
      }
@@ -240,11 +251,11 @@
        "nixpkgs-stable": "nixpkgs-stable"
      },
      "locked": {
-        "lastModified": 1717664902,
-        "narHash": "sha256-7XfBuLULizXjXfBYy/VV+SpYMHreNRHk9nKMsm1bgb4=",
+        "lastModified": 1731363552,
+        "narHash": "sha256-vFta1uHnD29VUY4HJOO/D6p6rxyObnf+InnSMT4jlMU=",
        "owner": "cachix",
        "repo": "pre-commit-hooks.nix",
-        "rev": "cc4d466cb1254af050ff7bdf47f6d404a7c646d1",
+        "rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0",
        "type": "github"
      },
      "original": {
@@ -255,6 +266,7 @@
    },
    "root": {
      "inputs": {
+        "ansible-sshjail": "ansible-sshjail",
        "home-manager": "home-manager",
        "impermanence": "impermanence",
        "lanzaboote": "lanzaboote",
@@ -265,21 +277,17 @@
    },
    "rust-overlay": {
      "inputs": {
-        "flake-utils": [
-          "lanzaboote",
-          "flake-utils"
-        ],
        "nixpkgs": [
          "lanzaboote",
          "nixpkgs"
        ]
      },
      "locked": {
-        "lastModified": 1717813066,
-        "narHash": "sha256-wqbRwq3i7g5EHIui0bIi84mdqZ/It1AXBSLJ5tafD28=",
+        "lastModified": 1731897198,
+        "narHash": "sha256-Ou7vLETSKwmE/HRQz4cImXXJBr/k9gp4J4z/PF8LzTE=",
        "owner": "oxalica",
        "repo": "rust-overlay",
-        "rev": "6dc3e45fe4aee36efeed24d64fc68b1f989d5465",
+        "rev": "0be641045af6d8666c11c2c40e45ffc9667839b5",
        "type": "github"
      },
      "original": {
--- a/nix/configuration/flake.nix
+++ b/nix/configuration/flake.nix
@@ -35,7 +35,7 @@
    home-manager.url = "github:nix-community/home-manager";
    home-manager.inputs.nixpkgs.follows = "nixpkgs";
    lanzaboote = {
-      url = "github:nix-community/lanzaboote/v0.4.1";
+      url = "github:nix-community/lanzaboote/v0.4.2";

      # Optional but recommended to limit the size of your system closure.
      inputs.nixpkgs.follows = "nixpkgs";
@@ -43,6 +43,12 @@
    zsh-histdb = {
      url = "path:flakes/zsh-histdb";

+      # Optional but recommended to limit the size of your system closure.
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    ansible-sshjail = {
+      url = "path:flakes/ansible-sshjail";
+
      # Optional but recommended to limit the size of your system closure.
      inputs.nixpkgs.follows = "nixpkgs";
    };
@@ -57,6 +63,7 @@
      home-manager,
      lanzaboote,
      zsh-histdb,
+      ansible-sshjail,
      ...
    }@inputs:
    let
@@ -75,7 +82,12 @@
            home-manager.useGlobalPkgs = true;
            home-manager.useUserPackages = true;
          }
-          { nixpkgs.overlays = [ zsh-histdb.overlays.default ]; }
+          {
+            nixpkgs.overlays = [
+              zsh-histdb.overlays.default
+              ansible-sshjail.overlays.default
+            ];
+          }
          ./configuration.nix
        ];
      };
--- a/nix/configuration/flakes/ansible-sshjail/flake.lock
+++ b/nix/configuration/flakes/ansible-sshjail/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/ansible-sshjail/flake.nix
+++ b/nix/configuration/flakes/ansible-sshjail/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 = ansible-sshjail;
+            ansible-sshjail = appliedOverlay.ansible-sshjail;
+          };
+        };
+    in
+    flake-utils.lib.eachDefaultSystem out
+    // {
+      overlays.default = final: prev: {
+        ansible-sshjail = final.callPackage ./package.nix { };
+      };
+    };
+}
--- a/nix/configuration/flakes/ansible-sshjail/package.nix
+++ b/nix/configuration/flakes/ansible-sshjail/package.nix
@@ -0,0 +1,33 @@
+# unpackPhase
+# patchPhase
+# configurePhase
+# buildPhase
+# checkPhase
+# installPhase
+# fixupPhase
+# installCheckPhase
+# distPhase
+{
+  stdenv,
+  fetchgit,
+  ...
+}:
+stdenv.mkDerivation {
+  name = "ansible-sshjail";
+  src = fetchgit {
+    url = "https://github.com/austinhyde/ansible-sshjail.git";
+    rev = "a7b0076fdb680b915d35efafd1382919100532b6";
+    sha256 = "sha256-4QX/017fDRzb363NexgvHZ/VFKXOjRgGPDKKygyUylM=";
+  };
+  phases = [
+    "installPhase"
+  ];
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/share/ansible/plugins/connection_plugins
+    cp $src/sshjail.py $out/share/ansible/plugins/connection_plugins/
+
+    runHook postInstall
+  '';
+}
--- 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/neelix/default.nix
+++ b/nix/configuration/hosts/neelix/default.nix
@@ -28,4 +28,11 @@
  me.graphical = true;
  me.graphics_card_type = "intel";
  me.kodi.enable = true;
+  me.lvfs.enable = true;
+  me.sound.enable = true;
+  me.wireguard.activated = [ "wgh" ];
+  me.wireguard.deactivated = [ "wgf" ];
+  me.zrepl.enable = true;
+  me.zsh.enable = true;
+
 }
--- a/nix/configuration/hosts/odo/default.nix
+++ b/nix/configuration/hosts/odo/default.nix
@@ -32,16 +32,44 @@
  me.alacritty.enable = true;
  me.ansible.enable = true;
  me.ares.enable = true;
+  me.bluetooth.enable = true;
  me.chromecast.enable = true;
  me.chromium.enable = true;
  me.docker.enable = true;
  me.emacs_flavor = "full";
  me.firefox.enable = true;
-  me.git.config = ./roles/git/files/gitconfig_home;
+  me.git.config = ../../roles/git/files/gitconfig_home;
+  me.gpg.enable = true;
  me.graphical = true;
  me.graphics_card_type = "amd";
  me.kanshi.enable = true;
  me.kubernetes.enable = true;
  me.latex.enable = true;
+  me.launch_keyboard.enable = true;
+  me.lvfs.enable = true;
+  me.media.enable = true;
+  me.nix_index.enable = true;
+  me.python.enable = true;
+  me.qemu.enable = true;
+  me.rust.enable = true;
+  me.sound.enable = true;
+  me.steam.enable = true;
  me.sway.enable = true;
+  me.terraform.enable = true;
+  me.vnc_client.enable = true;
+  me.vscode.enable = true;
+  me.wasm.enable = true;
+  me.waybar.enable = true;
+  me.wireguard.activated = [
+    "drmario"
+    "wgh"
+    "colo"
+  ];
+  me.wireguard.deactivated = [ "wgf" ];
+  me.zrepl.enable = true;
+  me.zsh.enable = true;
+
+  me.sm64ex.enable = true;
+  me.shipwright.enable = true;
+  me.ship2harkinian.enable = true;
 }
--- a/nix/configuration/hosts/odo/wifi.nix
+++ b/nix/configuration/hosts/odo/wifi.nix
@@ -12,5 +12,10 @@
    environment.loginShellInit = lib.mkIf (!config.me.buildingIso) ''
      doas iw dev wlan0 set power_save off
    '';
+
+    # Enable debug logging for ath12k wifi card.
+    boot.kernelParams = [
+      "ath12k.debug_mask=0xffffffff"
+    ];
  };
 }
--- a/nix/configuration/roles/2ship2harkinian/default.nix
+++ b/nix/configuration/roles/2ship2harkinian/default.nix
@@ -0,0 +1,48 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+
+{
+  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 {
+        environment.systemPackages = with pkgs; [
+          _2ship2harkinian
+        ];
+
+        # TODO perhaps install ~/.local/share/2ship/2ship2harkinian.json
+
+        environment.persistence."/persist" = lib.mkIf (!config.me.buildingIso) {
+          hideMounts = true;
+          users.talexander = {
+            directories = [
+              {
+                directory = ".local/share/2ship";
+                user = "talexander";
+                group = "talexander";
+                mode = "0755";
+              }
+            ];
+          };
+        };
+      })
+    ]
+  );
+}
--- a/nix/configuration/roles/ansible/default.nix
+++ b/nix/configuration/roles/ansible/default.nix
@@ -32,10 +32,50 @@
                (prev.ansible.overridePythonAttrs {
                  propagatedBuildInputs = prev.ansible.propagatedBuildInputs ++ [ prev.python3Packages.jmespath ];
                })
+                pkgs.ansible-sshjail
              ];
              buildInputs = [ pkgs.makeWrapper ];
+
              postBuild = ''
-                wrapProgram $out/bin/ansible --prefix PATH : ${lib.makeBinPath [ ]}
+                ${lib.concatMapStringsSep "\n"
+                  (
+                    prog:
+                    (
+                      "wrapProgram $out/bin/${prog} ${
+                        lib.concatMapStringsSep " "
+                          (
+                            plugin_type:
+                            "--set ANSIBLE_${lib.toUpper plugin_type}_PLUGINS $out/share/ansible/plugins/${lib.toLower plugin_type}_plugins"
+                          )
+                          [
+                            "action"
+                            "cache"
+                            "callback"
+                            "connection"
+                            "filter"
+                            "inventory"
+                            "lookup"
+                            "shell"
+                            "strategy"
+                            "test"
+                            "vars"
+                          ]
+                      } --prefix PATH : ${lib.makeBinPath [ ]}"
+                    )
+                  )
+                  [
+                    "ansible"
+                    "ansible-config"
+                    "ansible-console"
+                    "ansible-doc"
+                    "ansible-galaxy"
+                    "ansible-inventory"
+                    "ansible-playbook"
+                    "ansible-pull"
+                    "ansible-test"
+                    "ansible-vault"
+                  ]
+                }
              '';
            };
          })
--- a/nix/configuration/roles/ares/default.nix
+++ b/nix/configuration/roles/ares/default.nix
@@ -24,6 +24,20 @@
        environment.systemPackages = with pkgs; [
          ares
        ];
+
+        environment.persistence."/persist" = lib.mkIf (!config.me.buildingIso) {
+          hideMounts = true;
+          users.talexander = {
+            directories = [
+              {
+                directory = ".local/share/ares";
+                user = "talexander";
+                group = "talexander";
+                mode = "0755";
+              }
+            ];
+          };
+        };
      })
    ]
  );
--- a/nix/configuration/roles/emacs/default.nix
+++ b/nix/configuration/roles/emacs/default.nix
@@ -84,7 +84,7 @@ in
          };
        };

-        environment.variables.EDITOR = "${pkgs.my_emacs}/bin/plainmacs";
+        environment.variables.EDITOR = "plainmacs";
      }
      (lib.mkIf (config.me.graphical) {
        nixpkgs.overlays = [
@@ -127,6 +127,8 @@ in
                    final.nixfmt-rfc-style # auto-formatting nix files through nixd
                    final.clang # To compile tree-sitter grammars
                    final.shellcheck
+                    final.cmake-language-server
+                    final.cmake # Used by cmake-language-server
                  ]
                }
              '';
--- a/nix/configuration/roles/emacs/files/emacs/elisp/lang-cmake.el
+++ b/nix/configuration/roles/emacs/files/emacs/elisp/lang-cmake.el
@@ -0,0 +1,18 @@
+(require 'common-lsp)
+
+(use-package cmake-mode
+  :commands cmake-mode
+  :hook (
+         (cmake-mode . (lambda ()
+                         (eglot-ensure)
+                         (defclass my/eglot-cmake (eglot-lsp-server) ()
+                           :documentation
+                           "Own eglot server class.")
+
+                         (add-to-list 'eglot-server-programs
+                                      '(cmake-mode . (my/eglot-cmake "cmake-language-server")))
+                         ))
+         )
+  )
+
+(provide 'lang-cmake)
--- a/nix/configuration/roles/emacs/files/emacs/init.el
+++ b/nix/configuration/roles/emacs/files/emacs/init.el
@@ -38,4 +38,6 @@

 (require 'lang-nix)

+(require 'lang-cmake)
+
 (load-directory autoload-directory)
--- a/nix/configuration/roles/git/default.nix
+++ b/nix/configuration/roles/git/default.nix
@@ -32,54 +32,54 @@
          };
        };
    })
-    (lib.mkIf (config.me.graphical) {
-      nixpkgs.overlays = [
-        (final: prev: {
-          git = pkgs.buildEnv {
-            name = prev.git.name;
-            paths = [
-              prev.git
-            ];
-            extraOutputsToInstall = [
-              "man"
-              "doc"
-              "info"
-            ];
-            buildInputs = [ final.makeWrapper ];
-            postBuild = ''
-              wrapProgram $out/bin/git --prefix PATH : ${
-                lib.makeBinPath [
-                  final.meld
-                ]
-              }
-            '';
-          };
-        })
-      ];
-    })
-    (lib.mkIf (!config.me.graphical) {
-      nixpkgs.overlays = [
-        (final: prev: {
-          git = pkgs.buildEnv {
-            name = prev.git.name;
-            paths = [
-              prev.git
-            ];
-            extraOutputsToInstall = [
-              "man"
-              "doc"
-              "info"
-            ];
-            buildInputs = [ final.makeWrapper ];
-            postBuild = ''
-              wrapProgram $out/bin/git --prefix PATH : ${
-                lib.makeBinPath [
-                ]
-              }
-            '';
-          };
-        })
-      ];
-    })
+    # (lib.mkIf (config.me.graphical) {
+    #   nixpkgs.overlays = [
+    #     (final: prev: {
+    #       git = pkgs.buildEnv {
+    #         name = prev.git.name;
+    #         paths = [
+    #           prev.git
+    #         ];
+    #         extraOutputsToInstall = [
+    #           "man"
+    #           "doc"
+    #           "info"
+    #         ];
+    #         buildInputs = [ final.makeWrapper ];
+    #         postBuild = ''
+    #           wrapProgram $out/bin/git --prefix PATH : ${
+    #             lib.makeBinPath [
+    #               final.meld
+    #             ]
+    #           }
+    #         '';
+    #       };
+    #     })
+    #   ];
+    # })
+    # (lib.mkIf (!config.me.graphical) {
+    #   nixpkgs.overlays = [
+    #     (final: prev: {
+    #       git = pkgs.buildEnv {
+    #         name = prev.git.name;
+    #         paths = [
+    #           prev.git
+    #         ];
+    #         extraOutputsToInstall = [
+    #           "man"
+    #           "doc"
+    #           "info"
+    #         ];
+    #         buildInputs = [ final.makeWrapper ];
+    #         postBuild = ''
+    #           wrapProgram $out/bin/git --prefix PATH : ${
+    #             lib.makeBinPath [
+    #             ]
+    #           }
+    #         '';
+    #       };
+    #     })
+    #   ];
+    # })
  ];
 }
--- a/nix/configuration/roles/gpg/default.nix
+++ b/nix/configuration/roles/gpg/default.nix
@@ -16,158 +16,93 @@ in
 {
  imports = [ ];

-  # Fetch public keys:
-  # gpg --locate-keys tom@fizz.buzz
-  #
-  # gpg -vvv --auto-key-locate local,wkd --locate-keys tom@fizz.buzz
-
-  hardware.gpgSmartcards.enable = true;
-  services.udev.packages = [
-    pkgs.yubikey-personalization
-    pkgs.libfido2
-    (pkgs.writeTextFile {
-      name = "my-rules";
-      text = ''
-        ACTION=="add", SUBSYSTEM=="usb", ENV{ID_VENDOR_ID}=="1050", ENV{ID_MODEL_ID}=="0406", MODE="660", GROUP="wheel"
-        KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1050", ATTRS{idProduct}=="0406", TAG+="uaccess", GROUP="wheel", MODE="0660"
-      '';
-      destination = "/etc/udev/rules.d/50-yubikey.rules";
-    })
-  ];
-  services.pcscd.enable = true;
-  # services.gnome.gnome-keyring.enable = true;
-
-  # services.dbus.packages = [ pkgs.gcr ];
-
-  # services.pcscd.plugins = lib.mkForce [ ];
-
-  #   programs.gpg.scdaemonSettings = {
-  #   disable-ccid = true;
-  # };
-
-  # .gnupg/scdaemon.conf
-  home-manager.users.talexander =
-    { pkgs, ... }:
-    {
-      home.file.".gnupg/scdaemon.conf" = {
-        source = ./files/scdaemon.conf;
-      };
-    };
-
-  # programs.gnupg.dirmngr.enable = true;
-  programs.gnupg.agent = {
-    enable = true;
-    enableSSHSupport = true;
-    pinentryPackage = pkgs.pinentry-qt;
-    # settings = {
-    #   disable-ccid = true;
-    # };
-  };
-
-  environment.persistence."/persist" = lib.mkIf (!config.me.buildingIso) {
-    hideMounts = true;
-    users.talexander = {
-      directories = [
-        {
-          directory = ".gnupg";
-          user = "talexander";
-          group = "talexander";
-          mode = "0700";
-        } # Local keyring
-      ];
+  options.me = {
+    gpg.enable = lib.mkOption {
+      type = lib.types.bool;
+      default = false;
+      example = true;
+      description = "Whether we want to install gpg.";
    };
  };

-  nixpkgs.overlays = [
-    (final: prev: {
-      # pcsclite = prev.pcsclite.overrideAttrs (old: {
-      #   postPatch = ''
-      #     substituteInPlace src/libredirect.c src/spy/libpcscspy.c \
-      #       --replace-fail "libpcsclite_real.so.1" "$lib/lib/libpcsclite_real.so.1"
-      #   '';
-      # });
+  config = lib.mkIf config.me.gpg.enable (
+    lib.mkMerge [
+      {
+        # Fetch public keys:
+        # gpg --locate-keys tom@fizz.buzz
+        #
+        # gpg -vvv --auto-key-locate local,wkd --locate-keys tom@fizz.buzz

-      # pcsclite = prev.pcsclite.overrideAttrs (old: {
-      #   postPatch =
-      #     old.postPatch
-      #     + (lib.optionalString
-      #       (!(lib.strings.hasInfix ''--replace-fail "libpcsclite_real.so.1"'' old.postPatch))
-      #       ''
-      #         substituteInPlace src/libredirect.c src/spy/libpcscspy.c \
-      #           --replace-fail "libpcsclite_real.so.1" "$lib/lib/libpcsclite_real.so.1"
-      #       ''
-      #     );
-      # });
+        hardware.gpgSmartcards.enable = true;
+        services.udev.packages = [
+          pkgs.yubikey-personalization
+          pkgs.libfido2
+          (pkgs.writeTextFile {
+            name = "my-rules";
+            text = ''
+              ACTION=="add", SUBSYSTEM=="usb", ENV{ID_VENDOR_ID}=="1050", ENV{ID_MODEL_ID}=="0406", MODE="660", GROUP="wheel"
+              KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1050", ATTRS{idProduct}=="0406", TAG+="uaccess", GROUP="wheel", MODE="0660"
+            '';
+            destination = "/etc/udev/rules.d/50-yubikey.rules";
+          })
+        ];
+        services.pcscd.enable = true;
+        # services.gnome.gnome-keyring.enable = true;

-      # pcsclite = prev.pcsclite.overrideAttrs (old: {
-      #   postPatch =
-      #     old.postPatch
-      #     + ''
-      #       substituteInPlace src/libredirect.c src/spy/libpcscspy.c \
-      #         --replace-fail "libpcsclite_real.so.1" "$lib/lib/libpcsclite_real.so.1"
-      #     '';
-      # });
+        # services.dbus.packages = [ pkgs.gcr ];

-      # gnupg = prev.gnupg.override {
-      #   pcsclite = pkgs.pcsclite.overrideAttrs (old: {
-      #     postPatch =
-      #       old.postPatch
-      #       + (lib.optionalString
-      #         (!(lib.strings.hasInfix ''--replace-fail "libpcsclite_real.so.1"'' old.postPatch))
-      #         ''
-      #           substituteInPlace src/libredirect.c src/spy/libpcscspy.c \
-      #             --replace-fail "libpcsclite_real.so.1" "$lib/lib/libpcsclite_real.so.1"
-      #         ''
-      #       );
-      #   });
-      # };
-    })
-  ];
+        # services.pcscd.plugins = lib.mkForce [ ];

-  # security.polkit.extraConfig = ''
-  #   polkit.addRule(function(action, subject) {
-  #     if (action.id == "org.debian.pcsc-lite.access_card") {
-  #       return polkit.Result.YES;
-  #     }
-  #   });
+        #   programs.gpg.scdaemonSettings = {
+        #   disable-ccid = true;
+        # };

-  #   polkit.addRule(function(action, subject) {
-  #     if (action.id == "org.debian.pcsc-lite.access_pcsc") {
-  #       return polkit.Result.YES;
-  #     }
-  #   });
-  # '';
+        # .gnupg/scdaemon.conf
+        home-manager.users.talexander =
+          { pkgs, ... }:
+          {
+            home.file.".gnupg/scdaemon.conf" = {
+              source = ./files/scdaemon.conf;
+            };
+          };

-  environment.systemPackages = with pkgs; [
-    pcsclite
-    pcsctools
-    yubikey-personalization
-    yubikey-manager
-    glibcLocales
-    ccid
-    libusb-compat-0_1
-    gpg_test_wkd
-  ];
+        # programs.gnupg.dirmngr.enable = true;
+        programs.gnupg.agent = {
+          enable = true;
+          enableSSHSupport = true;
+          pinentryPackage = pkgs.pinentry-qt;
+          # settings = {
+          #   disable-ccid = true;
+          # };
+        };

-  # nixpkgs.overlays = [
-  #   (final: prev: {
-  #     gnupg = pkgs-unstable.gnupg;
-  #     scdaemon = pkgs-unstable.scdaemon;
-  #     libgcrypt = pkgs-unstable.libgcrypt;
-  #   })
-  # ];
+        environment.persistence."/persist" = lib.mkIf (!config.me.buildingIso) {
+          hideMounts = true;
+          users.talexander = {
+            directories = [
+              {
+                directory = ".gnupg";
+                user = "talexander";
+                group = "talexander";
+                mode = "0700";
+              } # Local keyring
+            ];
+          };
+        };

-  # nixpkgs.overlays = [
-  #   (final: prev: {
-  #     gnupg = prev.gnupg.overrideAttrs (old: rec {
-  #       version = "2.4.7";
-  #       src = prev.fetchurl {
-  #         url = "https://www.gnupg.org/ftp/gcrypt/gnupg/gnupg-${version}.tar.bz2";
-  #         hash = "sha256-eyRwbk2n4OOwbKBoIxAnQB8jgQLEHJCWMTSdzDuF60Y=";
-  #       };
-  #     });
-  #   })
-  # ];
+        environment.systemPackages = with pkgs; [
+          pcsclite
+          pcsctools
+          yubikey-personalization
+          yubikey-manager
+          glibcLocales
+          ccid
+          libusb-compat-0_1
+          gpg_test_wkd
+        ];

-  programs.gnupg.agent.enableExtraSocket = true;
+        programs.gnupg.agent.enableExtraSocket = true;
+      }
+    ]
+  );
 }
--- a/nix/configuration/roles/gpg/files/scdaemon.conf
+++ b/nix/configuration/roles/gpg/files/scdaemon.conf
@@ -1,7 +1,7 @@
-reader-port Yubico Yubi
+#reader-port Yubico Yubi
 disable-ccid

-log-file /home/talexander/scd.log
-verbose
-debug cardio
-debug-level 5
+#log-file /home/talexander/scd.log
+#verbose
+#debug cardio
+#debug-level 5
--- a/nix/configuration/roles/launch_keyboard/default.nix
+++ b/nix/configuration/roles/launch_keyboard/default.nix
@@ -8,28 +8,41 @@
 {
  imports = [ ];

-  config = lib.mkIf config.me.graphical {
-    environment.systemPackages = with pkgs; [
-      system76-keyboard-configurator
-      dfu-programmer # For flashing keyboard https://support.system76.com/articles/launch_2-firmware-update/
-      avrdude # For flashing keyboard https://support.system76.com/articles/launch_2-firmware-update/
-      lxqt.lxqt-policykit # Need a polkit agent to launch the keyboard configurator
-    ];
-
-    systemd = {
-      user.services.lxqt-policykit-agent = {
-        description = "lxqt-policykit-agent";
-        wantedBy = [ "graphical-session.target" ];
-        wants = [ "graphical-session.target" ];
-        after = [ "graphical-session.target" ];
-        serviceConfig = {
-          Type = "simple";
-          ExecStart = "${pkgs.lxqt.lxqt-policykit}/bin/lxqt-policykit-agent";
-          Restart = "on-failure";
-          RestartSec = 1;
-          TimeoutStopSec = 10;
-        };
-      };
+  options.me = {
+    launch_keyboard.enable = lib.mkOption {
+      type = lib.types.bool;
+      default = false;
+      example = true;
+      description = "Whether we want to install launch_keyboard.";
    };
  };
+
+  config = lib.mkIf config.me.launch_keyboard.enable (
+    lib.mkMerge [
+      (lib.mkIf config.me.graphical {
+        environment.systemPackages = with pkgs; [
+          system76-keyboard-configurator
+          dfu-programmer # For flashing keyboard https://support.system76.com/articles/launch_2-firmware-update/
+          avrdude # For flashing keyboard https://support.system76.com/articles/launch_2-firmware-update/
+          lxqt.lxqt-policykit # Need a polkit agent to launch the keyboard configurator
+        ];
+
+        systemd = {
+          user.services.lxqt-policykit-agent = {
+            description = "lxqt-policykit-agent";
+            wantedBy = [ "graphical-session.target" ];
+            wants = [ "graphical-session.target" ];
+            after = [ "graphical-session.target" ];
+            serviceConfig = {
+              Type = "simple";
+              ExecStart = "${pkgs.lxqt.lxqt-policykit}/bin/lxqt-policykit-agent";
+              Restart = "on-failure";
+              RestartSec = 1;
+              TimeoutStopSec = 10;
+            };
+          };
+        };
+      })
+    ]
+  );
 }
--- a/nix/configuration/roles/lvfs/default.nix
+++ b/nix/configuration/roles/lvfs/default.nix
@@ -8,26 +8,36 @@
 {
  imports = [ ];

-  config = lib.mkMerge [
-    {
-      services.fwupd.enable = true;
+  options.me = {
+    lvfs.enable = lib.mkOption {
+      type = lib.types.bool;
+      default = false;
+      example = true;
+      description = "Whether we want to install lvfs.";
+    };
+  };

-      environment.persistence."/persist" = lib.mkIf (!config.me.buildingIso) {
-        hideMounts = true;
-        directories = [
-          {
-            directory = "/var/lib/fwupd";
-            user = "root";
-            group = "root";
-            mode = "0755";
-          }
+  config = lib.mkIf config.me.lvfs.enable (
+    lib.mkMerge [
+      {
+        services.fwupd.enable = true;
+        environment.persistence."/persist" = lib.mkIf (!config.me.buildingIso) {
+          hideMounts = true;
+          directories = [
+            {
+              directory = "/var/lib/fwupd";
+              user = "root";
+              group = "root";
+              mode = "0755";
+            }
+          ];
+        };
+      }
+      (lib.mkIf config.me.graphical {
+        environment.systemPackages = with pkgs; [
+          gnome-firmware
        ];
-      };
-    }
-    (lib.mkIf config.me.graphical {
-      environment.systemPackages = with pkgs; [
-        gnome-firmware
-      ];
-    })
-  ];
+      })
+    ]
+  );
 }
--- a/nix/configuration/roles/media/default.nix
+++ b/nix/configuration/roles/media/default.nix
@@ -21,20 +21,21 @@ in
 {
  imports = [ ];

-  config = (
+  options.me = {
+    media.enable = lib.mkOption {
+      type = lib.types.bool;
+      default = false;
+      example = true;
+      description = "Whether we want to install media.";
+    };
+  };
+
+  config = lib.mkIf config.me.media.enable (
    lib.mkMerge [
      {
        environment.systemPackages = with pkgs; [
          ffmpeg
        ];
-
-        home-manager.users.talexander =
-          { pkgs, ... }:
-          {
-            home.file.".config/mpv/mpv.conf" = {
-              source = ./files/mpv.conf;
-            };
-          };
      }
      (lib.mkIf config.me.graphical {
        environment.systemPackages = with pkgs; [
@@ -44,6 +45,14 @@ in
          # So far I prefer imv over swayimg because imv supports the 'p' hotkey to print the currently-viewed file to stdout (useful for pipelines) and afaik doesn't support the exec:// protocol which seems like a massive risk.
          imv
        ];
+
+        home-manager.users.talexander =
+          { pkgs, ... }:
+          {
+            home.file.".config/mpv/mpv.conf" = {
+              source = ./files/mpv.conf;
+            };
+          };
      })
      (lib.mkIf (config.me.graphics_card_type == "amd" || config.me.graphics_card_type == "intel") {
        environment.systemPackages = with pkgs; [
--- a/nix/configuration/roles/nix_index/default.nix
+++ b/nix/configuration/roles/nix_index/default.nix
@@ -0,0 +1,44 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+
+{
+  imports = [ ];
+
+  options.me = {
+    nix_index.enable = lib.mkOption {
+      type = lib.types.bool;
+      default = false;
+      example = true;
+      description = "Whether we want to install nix_index.";
+    };
+  };
+
+  config = lib.mkIf config.me.nix_index.enable (
+    lib.mkMerge [
+      {
+        environment.systemPackages = with pkgs; [
+          nix-index-unwrapped
+        ];
+
+        environment.persistence."/state" = lib.mkIf (!config.me.buildingIso) {
+          hideMounts = true;
+          users.talexander = {
+            directories = [
+              {
+                directory = ".cache/nix-index";
+                user = "talexander";
+                group = "talexander";
+                mode = "0755";
+              }
+            ];
+          };
+        };
+
+      }
+    ]
+  );
+}
--- a/nix/configuration/roles/python/default.nix
+++ b/nix/configuration/roles/python/default.nix
@@ -8,16 +8,31 @@
 {
  imports = [ ];

-  environment.systemPackages = with pkgs; [
-    (python3.withPackages (python-pkgs: [
-      python-pkgs.distro # For https://gitlab.freedesktop.org/drm/amd/-/blob/master/scripts/amd_s2idle.py
-      python-pkgs.pyudev # For https://gitlab.freedesktop.org/drm/amd/-/blob/master/scripts/amd_s2idle.py
-      python-pkgs.systemd # For https://gitlab.freedesktop.org/drm/amd/-/blob/master/scripts/amd_s2idle.py
-      python-pkgs.packaging # For https://gitlab.freedesktop.org/drm/amd/-/blob/master/scripts/amd_s2idle.py
-    ]))
-    poetry
-    pyright
-    isort
-    black
-  ];
+  options.me = {
+    python.enable = lib.mkOption {
+      type = lib.types.bool;
+      default = false;
+      example = true;
+      description = "Whether we want to install python.";
+    };
+  };
+
+  config = lib.mkIf config.me.python.enable (
+    lib.mkMerge [
+      {
+        environment.systemPackages = with pkgs; [
+          (python3.withPackages (python-pkgs: [
+            python-pkgs.distro # For https://gitlab.freedesktop.org/drm/amd/-/blob/master/scripts/amd_s2idle.py
+            python-pkgs.pyudev # For https://gitlab.freedesktop.org/drm/amd/-/blob/master/scripts/amd_s2idle.py
+            python-pkgs.systemd # For https://gitlab.freedesktop.org/drm/amd/-/blob/master/scripts/amd_s2idle.py
+            python-pkgs.packaging # For https://gitlab.freedesktop.org/drm/amd/-/blob/master/scripts/amd_s2idle.py
+          ]))
+          poetry
+          pyright
+          isort
+          black
+        ];
+      }
+    ]
+  );
 }
--- a/nix/configuration/roles/qemu/default.nix
+++ b/nix/configuration/roles/qemu/default.nix
@@ -8,7 +8,22 @@
 {
  imports = [ ];

-  environment.systemPackages = with pkgs; [
-    qemu
-  ];
+  options.me = {
+    qemu.enable = lib.mkOption {
+      type = lib.types.bool;
+      default = false;
+      example = true;
+      description = "Whether we want to install qemu.";
+    };
+  };
+
+  config = lib.mkIf config.me.qemu.enable (
+    lib.mkMerge [
+      {
+        environment.systemPackages = with pkgs; [
+          qemu
+        ];
+      }
+    ]
+  );
 }
--- a/nix/configuration/roles/reset/default.nix
+++ b/nix/configuration/roles/reset/default.nix
@@ -9,5 +9,8 @@
  imports = [ ];

  # Reset some defaults to start from a minimal more-arch-linux-like state. Think of this like a CSS reset sheet.
-
+  config = {
+    # Do not use default packages (nixos includes some defaults like nano)
+    environment.defaultPackages = lib.mkForce [ ];
+  };
 }
--- a/nix/configuration/roles/rust/default.nix
+++ b/nix/configuration/roles/rust/default.nix
@@ -8,31 +8,46 @@
 {
  imports = [ ];

-  environment.systemPackages = with pkgs; [
-    rustup
-    lldb # for lldb-vscode
-    musl # for building static binaries
-    rust-analyzer
-    cargo-semver-checks
-    # ? cargo-bloat
-    # ? cargo-outdated
-    # ? cargo-public-api
-  ];
-
-  home-manager.users.talexander =
-    { pkgs, ... }:
-    {
-      home.file = {
-        ".cargo/config.toml" = {
-          source = ./files/cargo_config.toml;
-        };
-        # # TODO: Figure out what to do with credentials.
-        # ".cargo/credentials.toml" = {
-        #   source = ./files/cargo_credentials.toml;
-        # };
-      };
+  options.me = {
+    rust.enable = lib.mkOption {
+      type = lib.types.bool;
+      default = false;
+      example = true;
+      description = "Whether we want to install rust.";
    };
+  };

+  config = lib.mkIf config.me.rust.enable (
+    lib.mkMerge [
+      {
+        environment.systemPackages = with pkgs; [
+          rustup
+          lldb # for lldb-vscode
+          musl # for building static binaries
+          rust-analyzer
+          cargo-semver-checks
+          # ? cargo-bloat
+          # ? cargo-outdated
+          # ? cargo-public-api
+        ];
+
+        home-manager.users.talexander =
+          { pkgs, ... }:
+          {
+            home.file = {
+              ".cargo/config.toml" = {
+                source = ./files/cargo_config.toml;
+              };
+              # # TODO: Figure out what to do with credentials.
+              # ".cargo/credentials.toml" = {
+              #   source = ./files/cargo_credentials.toml;
+              # };
+            };
+          };
+
+      }
+    ]
+  );
 }

 # TODO: Install clippy, cranelift, rust-src
--- a/nix/configuration/roles/shipwright/default.nix
+++ b/nix/configuration/roles/shipwright/default.nix
@@ -0,0 +1,48 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+
+{
+  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 {
+        environment.systemPackages = with pkgs; [
+          shipwright
+        ];
+
+        # TODO perhaps install ~/.local/share/soh/shipofharkinian.json
+
+        environment.persistence."/persist" = lib.mkIf (!config.me.buildingIso) {
+          hideMounts = true;
+          users.talexander = {
+            directories = [
+              {
+                directory = ".local/share/soh";
+                user = "talexander";
+                group = "talexander";
+                mode = "0755";
+              }
+            ];
+          };
+        };
+      })
+    ]
+  );
+}
--- a/nix/configuration/roles/sm64ex/default.nix
+++ b/nix/configuration/roles/sm64ex/default.nix
@@ -0,0 +1,55 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+
+{
+  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" ];
+
+        environment.systemPackages = with pkgs; [
+          sm64ex
+        ];
+
+        # nixpkgs.overlays = [
+        #   (final: prev: {
+        #     sm4ex = prev.sm64ex.override {
+        #       baseRom.name = "SuperMario64.z64";
+        #     };
+        #   })
+        # ];
+
+        # TODO perhaps install ~/.local/share/sm64ex/sm64config.txt
+
+        environment.persistence."/persist" = lib.mkIf (!config.me.buildingIso) {
+          hideMounts = true;
+          users.talexander = {
+            directories = [
+              {
+                directory = ".local/share/sm64ex";
+                user = "talexander";
+                group = "talexander";
+                mode = "0755";
+              }
+            ];
+          };
+        };
+      })
+    ]
+  );
+}
--- a/nix/configuration/roles/sound/default.nix
+++ b/nix/configuration/roles/sound/default.nix
@@ -8,69 +8,85 @@
 {
  imports = [ ];

-  environment.systemPackages = with pkgs; [
-    pavucontrol
-  ];
-
-  # rtkit is optional but recommended
-  security.rtkit.enable = true;
-  services.pipewire = {
-    enable = true;
-    alsa.enable = true;
-    alsa.support32Bit = true;
-    pulse.enable = true;
-    # If you want to use JACK applications, uncomment this
-    #jack.enable = true;
-
-    extraLv2Packages = [ pkgs.rnnoise-plugin ];
-    configPackages = [
-      (pkgs.writeTextDir "share/pipewire/pipewire.conf.d/99-input-denoising.conf" ''
-        context.modules = [
-        {   name = libpipewire-module-filter-chain
-            args = {
-                node.description = "Noise Canceling source"
-                media.name = "Noise Canceling source"
-                filter.graph = {
-                    nodes = [
-                        {
-                            type = ladspa
-                            name = rnnoise
-                            plugin = "${pkgs.rnnoise-plugin}/lib/ladspa/librnnoise_ladspa.so"
-                            label = noise_suppressor_mono
-                            control = {
-                                "VAD Threshold (%)" = 50.0
-                                "VAD Grace Period (ms)" = 200
-                                "Retroactive VAD Grace (ms)" = 0
-                            }
-                        }
-                    ]
-                }
-                capture.props = {
-                    node.name =  "capture.rnnoise_source"
-                    node.passive = true
-                    audio.rate = 48000
-                    # Optionally specify a specific input: (ID from `pactl list`)
-                    # target.object = "alsa_input.usb-Shure_Incorporated_Shure_Digital-00.analog-stereo"
-                }
-                playback.props = {
-                    node.name =  "rnnoise_source"
-                    media.class = Audio/Source
-                    audio.rate = 48000
-                }
-            }
-        }
-        ]
-      '')
-    ];
-  };
-
-  environment.persistence."/persist" = lib.mkIf (!config.me.buildingIso) {
-    hideMounts = true;
-    users.talexander = {
-      directories = [
-        ".local/state/wireplumber" # Sound settings
-      ];
+  options.me = {
+    sound.enable = lib.mkOption {
+      type = lib.types.bool;
+      default = false;
+      example = true;
+      description = "Whether we want to install sound.";
    };
  };

+  config = lib.mkIf config.me.sound.enable (
+    lib.mkMerge [
+      {
+        # rtkit is optional but recommended
+        security.rtkit.enable = true;
+        services.pipewire = {
+          enable = true;
+          alsa.enable = true;
+          alsa.support32Bit = true;
+          pulse.enable = true;
+          # If you want to use JACK applications, uncomment this
+          #jack.enable = true;
+
+          extraLv2Packages = [ pkgs.rnnoise-plugin ];
+          configPackages = [
+            (pkgs.writeTextDir "share/pipewire/pipewire.conf.d/99-input-denoising.conf" ''
+              context.modules = [
+              {   name = libpipewire-module-filter-chain
+                  args = {
+                      node.description = "Noise Canceling source"
+                      media.name = "Noise Canceling source"
+                      filter.graph = {
+                          nodes = [
+                              {
+                                  type = ladspa
+                                  name = rnnoise
+                                  plugin = "${pkgs.rnnoise-plugin}/lib/ladspa/librnnoise_ladspa.so"
+                                  label = noise_suppressor_mono
+                                  control = {
+                                      "VAD Threshold (%)" = 50.0
+                                      "VAD Grace Period (ms)" = 200
+                                      "Retroactive VAD Grace (ms)" = 0
+                                  }
+                              }
+                          ]
+                      }
+                      capture.props = {
+                          node.name =  "capture.rnnoise_source"
+                          node.passive = true
+                          audio.rate = 48000
+                          # Optionally specify a specific input: (ID from `pactl list`)
+                          # target.object = "alsa_input.usb-Shure_Incorporated_Shure_Digital-00.analog-stereo"
+                      }
+                      playback.props = {
+                          node.name =  "rnnoise_source"
+                          media.class = Audio/Source
+                          audio.rate = 48000
+                      }
+                  }
+              }
+              ]
+            '')
+          ];
+        };
+
+        environment.persistence."/persist" = lib.mkIf (!config.me.buildingIso) {
+          hideMounts = true;
+          users.talexander = {
+            directories = [
+              ".local/state/wireplumber" # Sound settings
+            ];
+          };
+        };
+      }
+      (lib.mkIf config.me.graphical {
+        environment.systemPackages = with pkgs; [
+          pavucontrol
+        ];
+
+      })
+    ]
+  );
 }
--- a/nix/configuration/roles/steam/default.nix
+++ b/nix/configuration/roles/steam/default.nix
@@ -8,16 +8,18 @@
 {
  imports = [ ];

-  options.me.games = lib.mkOption {
-    type = lib.types.bool;
-    default = config.me.graphical;
-    example = true;
-    description = "Whether we want to install games.";
+  options.me = {
+    steam.enable = lib.mkOption {
+      type = lib.types.bool;
+      default = false;
+      example = true;
+      description = "Whether we want to install steam.";
+    };
  };

-  config = (
+  config = lib.mkIf config.me.steam.enable (
    lib.mkMerge [
-      (lib.mkIf config.me.games {
+      (lib.mkIf config.me.graphical {
        allowedUnfree = [
          "steam"
          "steam-original"
@@ -45,5 +47,4 @@
      })
    ]
  );
-
 }
--- a/nix/configuration/roles/sway/default.nix
+++ b/nix/configuration/roles/sway/default.nix
@@ -294,6 +294,8 @@ in
      stop_screen_share
    ];

+    programs.sway.extraPackages = lib.mkForce [ ];
+
    me.swayIncludes = [
      base-hotkeys
      display-configs
--- a/nix/configuration/roles/terraform/default.nix
+++ b/nix/configuration/roles/terraform/default.nix
@@ -13,26 +13,41 @@ in
 {
  imports = [ ];

-  environment.systemPackages = with pkgs; [
-    terraform
-    alias_tf
-  ];
-
-  allowedUnfree = [
-    "terraform"
-  ];
-
-  environment.persistence."/persist" = lib.mkIf (!config.me.buildingIso) {
-    hideMounts = true;
-    users.talexander = {
-      directories = [
-        {
-          directory = ".terraform.d";
-          user = "talexander";
-          group = "talexander";
-          mode = "0755";
-        }
-      ];
+  options.me = {
+    terraform.enable = lib.mkOption {
+      type = lib.types.bool;
+      default = false;
+      example = true;
+      description = "Whether we want to install terraform.";
    };
  };
+
+  config = lib.mkIf config.me.terraform.enable (
+    lib.mkMerge [
+      {
+        environment.systemPackages = with pkgs; [
+          terraform
+          alias_tf
+        ];
+
+        allowedUnfree = [
+          "terraform"
+        ];
+
+        environment.persistence."/persist" = lib.mkIf (!config.me.buildingIso) {
+          hideMounts = true;
+          users.talexander = {
+            directories = [
+              {
+                directory = ".terraform.d";
+                user = "talexander";
+                group = "talexander";
+                mode = "0755";
+              }
+            ];
+          };
+        };
+      }
+    ]
+  );
 }
--- a/nix/configuration/roles/vnc_client/default.nix
+++ b/nix/configuration/roles/vnc_client/default.nix
@@ -8,9 +8,22 @@
 {
  imports = [ ];

-  config = lib.mkIf config.me.graphical {
-    environment.systemPackages = with pkgs; [
-      wlvncc
-    ];
+  options.me = {
+    vnc_client.enable = lib.mkOption {
+      type = lib.types.bool;
+      default = false;
+      example = true;
+      description = "Whether we want to install vnc_client.";
+    };
  };
+
+  config = lib.mkIf config.me.vnc_client.enable (
+    lib.mkMerge [
+      (lib.mkIf config.me.graphical {
+        environment.systemPackages = with pkgs; [
+          wlvncc
+        ];
+      })
+    ]
+  );
 }
--- a/nix/configuration/roles/vscode/default.nix
+++ b/nix/configuration/roles/vscode/default.nix
@@ -8,42 +8,55 @@
 {
  imports = [ ];

-  config = lib.mkIf config.me.graphical {
-    allowedUnfree = [
-      "vscode"
-      "vscode-with-extensions"
-      "vscode-extension-ms-vscode-remote-remote-ssh"
-    ];
-
-    environment.systemPackages = with pkgs; [
-      (vscode-with-extensions.override {
-        vscodeExtensions = with vscode-extensions; [
-          bbenoist.nix
-          ms-python.python
-          ms-azuretools.vscode-docker
-          ms-vscode-remote.remote-ssh
-        ]
-        # ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [
-        #   {
-        #     name = "remote-ssh-edit";
-        #     publisher = "ms-vscode-remote";
-        #     version = "0.47.2";
-        #     sha256 = "1hp6gjh4xp2m1xlm1jsdzxw9d8frkiidhph6nvl24d0h8z34w49g";
-        #   }
-        # ]
-        ;
-      })
-    ];
-
-    home-manager.users.talexander =
-      { pkgs, ... }:
-      {
-        home.file.".config/Code/User/settings.json" = {
-          source = ./files/settings.json;
-        };
-        home.file.".config/Code/User/keybindings.json" = {
-          source = ./files/keybindings.json;
-        };
-      };
+  options.me = {
+    vscode.enable = lib.mkOption {
+      type = lib.types.bool;
+      default = false;
+      example = true;
+      description = "Whether we want to install vscode.";
+    };
  };
+
+  config = lib.mkIf config.me.vscode.enable (
+    lib.mkMerge [
+      (lib.mkIf config.me.graphical {
+        allowedUnfree = [
+          "vscode"
+          "vscode-with-extensions"
+          "vscode-extension-ms-vscode-remote-remote-ssh"
+        ];
+
+        environment.systemPackages = with pkgs; [
+          (vscode-with-extensions.override {
+            vscodeExtensions = with vscode-extensions; [
+              bbenoist.nix
+              ms-python.python
+              ms-azuretools.vscode-docker
+              ms-vscode-remote.remote-ssh
+            ]
+            # ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [
+            #   {
+            #     name = "remote-ssh-edit";
+            #     publisher = "ms-vscode-remote";
+            #     version = "0.47.2";
+            #     sha256 = "1hp6gjh4xp2m1xlm1jsdzxw9d8frkiidhph6nvl24d0h8z34w49g";
+            #   }
+            # ]
+            ;
+          })
+        ];
+
+        home-manager.users.talexander =
+          { pkgs, ... }:
+          {
+            home.file.".config/Code/User/settings.json" = {
+              source = ./files/settings.json;
+            };
+            home.file.".config/Code/User/keybindings.json" = {
+              source = ./files/keybindings.json;
+            };
+          };
+      })
+    ]
+  );
 }
--- a/nix/configuration/roles/wasm/default.nix
+++ b/nix/configuration/roles/wasm/default.nix
@@ -8,9 +8,24 @@
 {
  imports = [ ];

-  environment.systemPackages = with pkgs; [
-    wabt
-    wasm-bindgen-cli
-    binaryen # for wasm-opt
-  ];
+  options.me = {
+    wasm.enable = lib.mkOption {
+      type = lib.types.bool;
+      default = false;
+      example = true;
+      description = "Whether we want to install wasm.";
+    };
+  };
+
+  config = lib.mkIf config.me.wasm.enable (
+    lib.mkMerge [
+      {
+        environment.systemPackages = with pkgs; [
+          wabt
+          wasm-bindgen-cli
+          binaryen # for wasm-opt
+        ];
+      }
+    ]
+  );
 }
--- a/nix/configuration/roles/waybar/default.nix
+++ b/nix/configuration/roles/waybar/default.nix
@@ -4,6 +4,7 @@
  pkgs,
  ...
 }:
+
 let
  waybar_sway_config = pkgs.writeTextFile {
    name = "waybar.conf";
@@ -79,38 +80,52 @@ in
 {
  imports = [ ];

-  environment.systemPackages = with pkgs; [
-    waybar
-    waybar_available_memory
-    waybar_battery
-    waybar_clock
-    waybar_night_mode
-    waybar_sound
-    waybar_temperature
-    python3 # for clock TODO python should not be in the system packages, maybe switch to a venv? ref https://nixos.wiki/wiki/Python
-    bc # for temperature and sound
-    jq # for memory, battery, sound, night mode, and temperature
-    upower # for battery
-    wlsunset # for night mode
-  ];
-
-  me.swayIncludes = [
-    waybar_sway_config
-  ];
-
-  services.upower.enable = true; # for battery
-
-  home-manager.users.talexander =
-    { pkgs, ... }:
-    {
-      home.file = {
-        ".config/waybar/config" = {
-          source = ./files/waybar_config.json;
-        };
-        ".config/waybar/style.css" = {
-          source = ./files/style.css;
-        };
-      };
+  options.me = {
+    waybar.enable = lib.mkOption {
+      type = lib.types.bool;
+      default = false;
+      example = true;
+      description = "Whether we want to install waybar.";
    };
+  };

+  config = lib.mkIf config.me.waybar.enable (
+    lib.mkMerge [
+      (lib.mkIf config.me.graphical {
+        environment.systemPackages = with pkgs; [
+          waybar
+          waybar_available_memory
+          waybar_battery
+          waybar_clock
+          waybar_night_mode
+          waybar_sound
+          waybar_temperature
+          python3 # for clock TODO python should not be in the system packages, maybe switch to a venv? ref https://nixos.wiki/wiki/Python
+          bc # for temperature and sound
+          jq # for memory, battery, sound, night mode, and temperature
+          upower # for battery
+          wlsunset # for night mode
+        ];
+
+        me.swayIncludes = [
+          waybar_sway_config
+        ];
+
+        services.upower.enable = true; # for battery
+
+        home-manager.users.talexander =
+          { pkgs, ... }:
+          {
+            home.file = {
+              ".config/waybar/config" = {
+                source = ./files/waybar_config.json;
+              };
+              ".config/waybar/style.css" = {
+                source = ./files/style.css;
+              };
+            };
+          };
+      })
+    ]
+  );
 }
--- a/nix/configuration/roles/wireguard/default.nix
+++ b/nix/configuration/roles/wireguard/default.nix
@@ -4,24 +4,16 @@
  pkgs,
  ...
 }:
-
 let
  activatedWg = name: {
    networking.wg-quick.interfaces."${name}".configFile = "/persist/manual/wireguard/${name}.conf";
    systemd.services."wg-quick-${name}" = {
      after = [
+        "network-online.target"
        "nss-lookup.target"
-        "systemd-resolved.service"
-        "multi-user.target"
      ];
-      preStart = "${pkgs.toybox}/bin/sleep 10";
+      preStart = "${pkgs.toybox}/bin/sleep 3";
    };
-    # systemd.services."wg-quick-${name}".after = [
-    #   "nss-lookup.target"
-    #   "systemd-resolved.service"
-    #   "multi-user.target"
-    # ];
-    # systemd.services."wg-quick-${name}".preStart = "${pkgs.toybox}/bin/sleep 10";
  };
  deactivatedWg = name: {
    networking.wg-quick.interfaces."${name}" = {
@@ -29,21 +21,36 @@ let
      autostart = false;
    };
  };
-  wgConfig = lib.attrsets.recursiveUpdate (lib.attrsets.recursiveUpdate (lib.attrsets.recursiveUpdate
-    (lib.attrsets.recursiveUpdate {
-      networking.firewall.allowedUDPPorts = [ 51821 ];
-      networking.wireguard.enable = true;
-    } (activatedWg "drmario"))
-    (activatedWg "wgh")
-  ) (activatedWg "colo")) (deactivatedWg "wgf");
+  wireguard_enable = (config.me.wireguard.activated != [ ] || config.me.wireguard.deactivated != [ ]);
 in
 {
  imports = [ ];

-  config = lib.mkIf (!config.me.buildingIso) wgConfig;
-
-  # environment.systemPackages = with pkgs; [
-  #   wireguard-tools
-  # ];
+  options.me = {
+    wireguard.activated = lib.mkOption {
+      type = lib.types.listOf lib.types.str;
+      default = false;
+      example = true;
+      description = "List of wireguard config names that should be activated at boot.";
+    };
+    wireguard.deactivated = lib.mkOption {
+      type = lib.types.listOf lib.types.str;
+      default = false;
+      example = true;
+      description = "List of wireguard config names that are not activated at boot but can be manually activated later.";
+    };
+  };

+  config = lib.mkIf wireguard_enable (
+    lib.mkMerge [
+      {
+        networking.firewall.allowedUDPPorts = [ 51821 ];
+        networking.wireguard.enable = true;
+      }
+      (activatedWg "drmario")
+      (activatedWg "wgh")
+      (activatedWg "colo")
+      (deactivatedWg "wgf")
+    ]
+  );
 }
--- a/nix/configuration/roles/zrepl/default.nix
+++ b/nix/configuration/roles/zrepl/default.nix
@@ -8,38 +8,53 @@
 {
  imports = [ ];

-  services.zrepl = {
-    enable = true;
-    settings = {
-      jobs = [
-        {
-          name = "snapjob";
-          type = "snap";
-          filesystems = {
-            "zroot/linux/nix/persist<" = true;
-            "zroot/bridge<" = true;
-          };
-          snapshotting = {
-            type = "periodic";
-            interval = "15m";
-            prefix = "zrepl_";
-          };
-          pruning = {
-            keep = [
+  options.me = {
+    zrepl.enable = lib.mkOption {
+      type = lib.types.bool;
+      default = false;
+      example = true;
+      description = "Whether we want to install zrepl.";
+    };
+  };
+
+  config = lib.mkIf config.me.zrepl.enable (
+    lib.mkMerge [
+      {
+        services.zrepl = {
+          enable = true;
+          settings = {
+            jobs = [
              {
-                type = "grid";
-                grid = "1x1h(keep=all) | 24x1h | 14x1d";
-                regex = "^zrepl_.*";
-              }
-              {
-                type = "regex";
-                negate = true;
-                regex = "^zrepl_.*";
+                name = "snapjob";
+                type = "snap";
+                filesystems = {
+                  "zroot/linux/nix/persist<" = true;
+                  "zroot/bridge<" = true;
+                };
+                snapshotting = {
+                  type = "periodic";
+                  interval = "15m";
+                  prefix = "zrepl_";
+                };
+                pruning = {
+                  keep = [
+                    {
+                      type = "grid";
+                      grid = "1x1h(keep=all) | 24x1h | 14x1d";
+                      regex = "^zrepl_.*";
+                    }
+                    {
+                      type = "regex";
+                      negate = true;
+                      regex = "^zrepl_.*";
+                    }
+                  ];
+                };
              }
            ];
          };
-        }
-      ];
-    };
-  };
+        };
+      }
+    ]
+  );
 }
--- a/nix/configuration/roles/zsh/default.nix
+++ b/nix/configuration/roles/zsh/default.nix
@@ -55,36 +55,51 @@ in
 {
  imports = [ ];

-  environment.systemPackages = with pkgs; [
-    zsh
-  ];
-
-  users.users.talexander.shell = pkgs.zsh;
-  environment.shells = with pkgs; [ zsh ];
-
-  programs.zsh = {
-    enable = true;
-  };
-
-  home-manager.users.talexander =
-    { pkgs, ... }:
-    {
-      home.file.".zshrc" = {
-        source = "${zshrc}";
-      };
-    };
-
-  environment.persistence."/persist" = lib.mkIf (!config.me.buildingIso) {
-    hideMounts = true;
-    users.talexander = {
-      directories = [
-        {
-          directory = ".histdb";
-          user = "talexander";
-          group = "talexander";
-          mode = "0700";
-        }
-      ];
+  options.me = {
+    zsh.enable = lib.mkOption {
+      type = lib.types.bool;
+      default = false;
+      example = true;
+      description = "Whether we want to install zsh.";
    };
  };
+
+  config = lib.mkIf config.me.zsh.enable (
+    lib.mkMerge [
+      {
+        environment.systemPackages = with pkgs; [
+          zsh
+        ];
+
+        users.users.talexander.shell = pkgs.zsh;
+        environment.shells = with pkgs; [ zsh ];
+
+        programs.zsh = {
+          enable = true;
+        };
+
+        home-manager.users.talexander =
+          { pkgs, ... }:
+          {
+            home.file.".zshrc" = {
+              source = "${zshrc}";
+            };
+          };
+
+        environment.persistence."/persist" = lib.mkIf (!config.me.buildingIso) {
+          hideMounts = true;
+          users.talexander = {
+            directories = [
+              {
+                directory = ".histdb";
+                user = "talexander";
+                group = "talexander";
+                mode = "0700";
+              }
+            ];
+          };
+        };
+      }
+    ]
+  );
 }
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
Tom Alexander	2f2d33296b	Persist ares data.	2025-01-26 19:04:17 -05:00
Tom Alexander	2c1cf54de0	Update packages.	2025-01-26 18:55:53 -05:00
Tom Alexander	65be133ffe	Update lanzaboote.	2025-01-26 16:57:18 -05:00
Tom Alexander	ee47c3cfa3	Enable debugging on ath12k.	2025-01-26 10:11:53 -05:00
Tom Alexander	ff8bb0653b	Enable bluetooth on odo.	2025-01-25 21:28:14 -05:00
Tom Alexander	ff98873b32	Persist save data for ship of harkinian and 2ship2harkinian.	2025-01-25 21:22:55 -05:00
Tom Alexander	67ad4e2dff	Persist sm64ex save data.	2025-01-25 20:47:48 -05:00
Tom Alexander	60452b0aeb	Persist the nix-index index.	2025-01-25 20:22:41 -05:00
Tom Alexander	e043320e5c	Clean up experiments in the gpg role.	2025-01-25 19:35:05 -05:00
Tom Alexander	2f8c4fbfe8	Disable verbose logging for gpg.	2025-01-25 19:10:48 -05:00
Tom Alexander	233bf4e967	Put the sleep back into wireguard.	2025-01-25 17:58:56 -05:00
Tom Alexander	f7adfaf54d	Update lockfile.	2025-01-25 16:28:53 -05:00
Tom Alexander	78c9dec4c4	Disable rom name override. The latest nixpkgs does not support overriding the name so I am removing it now for compatibility.	2025-01-25 16:22:04 -05:00
Tom Alexander	53c12a5b1e	Add sshjail as an ansible plugin.	2025-01-25 15:30:30 -05:00
Tom Alexander	7d94210d8f	Add cmake support to emacs.	2025-01-25 10:20:22 -05:00
Tom Alexander	1ebf31dc11	Remove sleep from wireguard service.	2025-01-25 10:20:22 -05:00
Tom Alexander	82c30bdb77	Add a role for 2ship2harkinian (Majora's Mask).	2025-01-24 21:25:41 -05:00
Tom Alexander	d5e7fdd097	Add bsdtar.	2025-01-24 20:58:03 -05:00
Tom Alexander	40fd7931d0	Add a persist folder for the talexander user.	2025-01-24 20:36:37 -05:00
Tom Alexander	835fd340a2	Add role for Ocarina of Time (shipwright).	2025-01-24 20:23:49 -05:00
Tom Alexander	94ef9ff3c8	Add role to build sm64ex.	2025-01-24 20:08:10 -05:00
Tom Alexander	62d3c010f5	Install nix-tree.	2025-01-24 19:01:51 -05:00
Tom Alexander	e9e792961c	Add a not-working snippet to show where system packages are imported.	2025-01-24 18:53:57 -05:00
Tom Alexander	281dffc9c0	Do not install foot.	2025-01-24 18:42:57 -05:00
Tom Alexander	5bd67bb02a	Move defaultPackages into the reset role.	2025-01-24 18:36:14 -05:00
Tom Alexander	4a76097a5e	Refactor the wireguard role to use lib.mkMerge.	2025-01-24 17:59:07 -05:00
Tom Alexander	facfd01661	Make zsh install conditional.	2025-01-23 21:55:22 -05:00
Tom Alexander	2ce4520cd6	Make zrepl a conditional install.	2025-01-23 21:52:50 -05:00
Tom Alexander	814769b3e9	Do not install waybar on neelix.	2025-01-23 21:43:08 -05:00
Tom Alexander	6424129da3	Do not install wasm role on neelix.	2025-01-23 21:41:08 -05:00
Tom Alexander	415edbad91	Do not install vscode on neelix.	2025-01-23 21:39:57 -05:00
Tom Alexander	a773f94593	Do not install vnc client on neelix.	2025-01-23 21:37:16 -05:00
Tom Alexander	226610c926	Do not install steam or terraform on neelix.	2025-01-23 21:37:15 -05:00
Tom Alexander	7c6afef2bb	Do not install pavucontrol on non-graphical installs.	2025-01-23 21:25:19 -05:00
Tom Alexander	55654fafb1	Do not install rust on neelix.	2025-01-23 21:21:37 -05:00
Tom Alexander	8946868fd6	Do not install qemu on neelix.	2025-01-23 21:18:57 -05:00
Tom Alexander	cd8e9002d0	Do not install python on neelix.	2025-01-23 21:15:48 -05:00
Tom Alexander	e1a274c88e	Do not install media role on neelix.	2025-01-23 21:06:11 -05:00
Tom Alexander	cdc4bdffb6	Git buildEnv is failing.	2025-01-23 20:59:39 -05:00
Tom Alexander	9b9a103e49	Do not install gnome-firmware on non-graphical installs.	2025-01-23 20:46:03 -05:00
Tom Alexander	ea7bf809fc	Do not install the launch keyboard configurator on neelix or non-graphical installs.	2025-01-23 20:42:22 -05:00