diff --git a/flake.lock b/flake.lock
index 2fbea0d..af07ec3 100644
--- a/flake.lock
+++ b/flake.lock
@@ -10,11 +10,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1762618334,
-        "narHash": "sha256-wyT7Pl6tMFbFrs8Lk/TlEs81N6L+VSybPfiIgzU8lbQ=",
+        "lastModified": 1770165109,
+        "narHash": "sha256-9VnK6Oqai65puVJ4WYtCTvlJeXxMzAp/69HhQuTdl/I=",
         "owner": "ryantm",
         "repo": "agenix",
-        "rev": "fcdea223397448d35d9b31f798479227e80183f6",
+        "rev": "b027ee29d959fda4b60b57566d64c98a202e0feb",
         "type": "github"
       },
       "original": {
@@ -30,11 +30,11 @@
         "nixpkgs": "nixpkgs_2"
       },
       "locked": {
-        "lastModified": 1767255233,
-        "narHash": "sha256-2cGs6+q0ZNej3qWnP69u/5Ax+S6RdVNFMppe0Y3eZic=",
+        "lastModified": 1777989496,
+        "narHash": "sha256-5U5olo7p570rILIYsuuU9G10UQ+kEgaDOCekFIJKXoI=",
         "owner": "crisidev",
         "repo": "bacon-ls",
-        "rev": "471541e5e06fa76846b71957b0fd4cde6e039066",
+        "rev": "d3b084cec8d567023787d6fb1e7deac6f3a0e320",
         "type": "github"
       },
       "original": {
@@ -87,11 +87,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1746728054,
-        "narHash": "sha256-eDoSOhxGEm2PykZFa/x9QG5eTH0MJdiJ9aR00VAofXE=",
+        "lastModified": 1768920986,
+        "narHash": "sha256-CNzzBsRhq7gg4BMBuTDObiWDH/rFYHEuDRVOwCcwXw4=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "ff442f5d1425feb86344c028298548024f21256d",
+        "rev": "de5708739256238fb912c62f03988815db89ec9a",
         "type": "github"
       },
       "original": {
@@ -107,11 +107,11 @@
         "nixpkgs": "nixpkgs_3"
       },
       "locked": {
-        "lastModified": 1767738258,
-        "narHash": "sha256-Sg1HnDByCyPhR0UY8muFYX3p/FEjyx6hMhQ1l2FX/nI=",
+        "lastModified": 1776651971,
+        "narHash": "sha256-yUp7P61fr7Q5VAtHdIJMM818opESP8Ldl6BujeXYap4=",
         "owner": "hanebox",
         "repo": "ekphos",
-        "rev": "f04e6cf15c0ed61fef8906652d4c949842311915",
+        "rev": "4250850df2b489faa5bf78648547c071457f69f9",
         "type": "github"
       },
       "original": {
@@ -120,6 +120,29 @@
         "type": "github"
       }
     },
+    "fenix": {
+      "inputs": {
+        "nixpkgs": [
+          "bacon-ls",
+          "naersk",
+          "nixpkgs"
+        ],
+        "rust-analyzer-src": "rust-analyzer-src"
+      },
+      "locked": {
+        "lastModified": 1752475459,
+        "narHash": "sha256-z6QEu4ZFuHiqdOPbYss4/Q8B0BFhacR8ts6jO/F/aOU=",
+        "owner": "nix-community",
+        "repo": "fenix",
+        "rev": "bf0d6f70f4c9a9cf8845f992105652173f4b617f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "fenix",
+        "type": "github"
+      }
+    },
     "flake-compat": {
       "flake": false,
       "locked": {
@@ -340,14 +363,15 @@
     },
     "naersk": {
       "inputs": {
+        "fenix": "fenix",
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1743800763,
-        "narHash": "sha256-YFKV+fxEpMgP5VsUcM6Il28lI0NlpM7+oB1XxbBAYCw=",
+        "lastModified": 1777031541,
+        "narHash": "sha256-KZ4s1kolHXFQrRGlnB503gDcTrVQMhiczO+LvvwKEPg=",
         "owner": "nix-community",
         "repo": "naersk",
-        "rev": "ed0232117731a4c19d3ee93aa0c382a8fe754b01",
+        "rev": "5e73301621274c44798bf6c6211ed27fc2ced201",
         "type": "github"
       },
       "original": {
@@ -453,11 +477,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1764234087,
-        "narHash": "sha256-NHF7QWa0ZPT8hsJrvijREW3+nifmF2rTXgS2v0tpcEA=",
+        "lastModified": 1769813415,
+        "narHash": "sha256-nnVmNNKBi1YiBNPhKclNYDORoHkuKipoz7EtVnXO50A=",
         "owner": "nix-community",
         "repo": "nixos-generators",
-        "rev": "032a1878682fafe829edfcf5fdfad635a2efe748",
+        "rev": "8946737ff703382fda7623b9fab071d037e897d5",
         "type": "github"
       },
       "original": {
@@ -468,11 +492,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1745377448,
-        "narHash": "sha256-jhZDfXVKdD7TSEGgzFJQvEEZ2K65UMiqW5YJ2aIqxMA=",
+        "lastModified": 1752077645,
+        "narHash": "sha256-HM791ZQtXV93xtCY+ZxG1REzhQenSQO020cu6rHtAPk=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "507b63021ada5fee621b6ca371c4fca9ca46f52c",
+        "rev": "be9e214982e20b8310878ac2baa063a961c1bdf6",
         "type": "github"
       },
       "original": {
@@ -484,11 +508,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1764138170,
-        "narHash": "sha256-2bCmfCUZyi2yj9FFXYKwsDiaZmizN75cLhI/eWmf3tk=",
+        "lastModified": 1776949667,
+        "narHash": "sha256-GMSVw35Q+294GlrTUKlx087E31z7KurReQ1YHSKp5iw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "bb813de6d2241bcb1b5af2d3059f560c66329967",
+        "rev": "01fbdeef22b76df85ea168fbfe1bfd9e63681b30",
         "type": "github"
       },
       "original": {
@@ -587,6 +611,23 @@
         "tokyo": "tokyo"
       }
     },
+    "rust-analyzer-src": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1752428706,
+        "narHash": "sha256-EJcdxw3aXfP8Ex1Nm3s0awyH9egQvB2Gu+QEnJn2Sfg=",
+        "owner": "rust-lang",
+        "repo": "rust-analyzer",
+        "rev": "591e3b7624be97e4443ea7b5542c191311aa141d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "rust-lang",
+        "ref": "nightly",
+        "repo": "rust-analyzer",
+        "type": "github"
+      }
+    },
     "rust-overlay": {
       "inputs": {
         "nixpkgs": [
@@ -691,11 +732,11 @@
     "tokyo": {
       "flake": false,
       "locked": {
-        "lastModified": 1762332530,
-        "narHash": "sha256-4zfkv3egdWJ/GCWUehV0MAIXxsrGT82Wd1Qqj1SCGOk=",
+        "lastModified": 1774363414,
+        "narHash": "sha256-a9iRWue7DB7s/wNdxqqB51Jya5P9X6sDftqhdmKggU0=",
         "owner": "folke",
         "repo": "tokyonight.nvim",
-        "rev": "5da1b76e64daf4c5d410f06bcb6b9cb640da7dfd",
+        "rev": "cdc07ac78467a233fd62c493de29a17e0cf2b2b6",
         "type": "github"
       },
       "original": {
diff --git a/home-manager/home.nix b/home-manager/home.nix
index 3c26511..df0d233 100644
--- a/home-manager/home.nix
+++ b/home-manager/home.nix
@@ -3,6 +3,7 @@
   inputs,
   outputs,
   pkgs,
+  config,
   ...
 }: {
   # You can import other home-manager modules here
@@ -85,6 +86,10 @@
     zoxide
   ];
 
+  # Add ~/.local/bin to path for non-NixOS machines
+  # TODO: make this a configurable option
+  home.sessionPath = ["${config.home.homeDirectory}/.local/bin"];
+
   # Enable home-manager
   programs.home-manager.enable = true;
 
diff --git a/hosts/common/ldd.nix b/hosts/common/ldd.nix
index 49c9246..4dc756e 100644
--- a/hosts/common/ldd.nix
+++ b/hosts/common/ldd.nix
@@ -23,12 +23,12 @@
       xorg.libXtst
       xorg.libXrandr
       xorg.libXext
-      xorg.libX11
+      libX11
       xorg.libXfixes
       libGL
       libva
       pipewire
-      xorg.libxcb
+      libxcb
       xorg.libXdamage
       xorg.libxshmfence
       xorg.libXxf86vm
diff --git a/modules/home-manager/desktop/zathura/default.nix b/modules/home-manager/desktop/zathura/default.nix
new file mode 100644
index 0000000..6429af4
--- /dev/null
+++ b/modules/home-manager/desktop/zathura/default.nix
@@ -0,0 +1,46 @@
+{
+  config,
+  pkgs,
+  inputs,
+  ...
+}: {
+  programs.zathura = {
+    enable = true;
+    options = {
+      # Tokyonight color theme
+      # As far as I can tell, there's no easy way to convert the theme in the git repo to nix
+      notification-error-bg = "#f7768e";
+      notification-error-fg = "#c0caf5";
+      notification-warning-bg = "#e0af68";
+      notification-warning-fg = "#414868";
+      notification-bg = "#1a1b26";
+      notification-fg = "#c0caf5";
+      completion-bg = "#1a1b26";
+      completion-fg = "#a9b1d6";
+      completion-group-bg = "#1a1b26";
+      completion-group-fg = "#a9b1d6";
+      completion-highlight-bg = "#414868";
+      completion-highlight-fg = "#c0caf5";
+      index-bg = "#1a1b26";
+      index-fg = "#c0caf5";
+      index-active-bg = "#414868";
+      index-active-fg = "#c0caf5";
+      inputbar-bg = "#1a1b26";
+      inputbar-fg = "#c0caf5";
+      statusbar-bg = "#1a1b26";
+      statusbar-fg = "#c0caf5";
+      highlight-color = "#e0af68";
+      highlight-active-color = "#9ece6a";
+      default-bg = "#1a1b26";
+      default-fg = "#c0caf5";
+      render-loading = true;
+      render-loading-fg = "#1a1b26";
+      render-loading-bg = "#c0caf5";
+
+      # Recolor mode settings
+      # <C-r> to switch modes
+      recolor-lightcolor = "#1a1b26";
+      recolor-darkcolor = "#c0caf5";
+    };
+  };
+}