diff --git a/_sources/generated.json b/_sources/generated.json
index ed5123b..9c6f9fb 100644
--- a/_sources/generated.json
+++ b/_sources/generated.json
@@ -20,21 +20,6 @@
     },
     "version": "ec991b80ba7d4dda7a962167b036efc5c2d79419"
   },
-  "fix-window-role": {
-    "cargoLocks": null,
-    "date": null,
-    "extract": null,
-    "name": "fix-window-role",
-    "passthru": null,
-    "pinned": false,
-    "src": {
-      "name": null,
-      "sha256": "sha256-H4Qj6n5uZsmsbdjjexGZctqhJk3gAXKiSnmnEO/LgTA=",
-      "type": "url",
-      "url": "https://raw.githubusercontent.com/d12frosted/homebrew-emacs-plus/master/patches/emacs-28/fix-window-role.patch"
-    },
-    "version": "latest"
-  },
   "git-abbr": {
     "cargoLocks": null,
     "date": "2023-06-19",
@@ -119,57 +104,6 @@
     },
     "version": "d2ecacd3fe7126e822ce8918389f3ad93b14c86c"
   },
-  "round-undecorated-frame": {
-    "cargoLocks": null,
-    "date": null,
-    "extract": null,
-    "name": "round-undecorated-frame",
-    "passthru": null,
-    "pinned": false,
-    "src": {
-      "name": null,
-      "sha256": "sha256-dFH4D1WYQOVOagUuVdEQB3irxV+Y8dDAOKJOJXc/KHQ=",
-      "type": "url",
-      "url": "https://raw.githubusercontent.com/d12frosted/homebrew-emacs-plus/master/patches/emacs-30/round-undecorated-frame.patch"
-    },
-    "version": "latest"
-  },
-  "sddm-theme-minesddm": {
-    "cargoLocks": null,
-    "date": "2025-03-08",
-    "extract": null,
-    "name": "sddm-theme-minesddm",
-    "passthru": null,
-    "pinned": false,
-    "src": {
-      "deepClone": false,
-      "fetchSubmodules": false,
-      "leaveDotGit": false,
-      "name": null,
-      "owner": "Davi-S",
-      "repo": "sddm-theme-minesddm",
-      "rev": "56be28834dfdb05d678156ebd1d00c83dadfa3f4",
-      "sha256": "sha256-X64m9fs+a6M0cgJKCNsk2kQU43DEcwEvD/1nQ755BGE=",
-      "sparseCheckout": [],
-      "type": "github"
-    },
-    "version": "56be28834dfdb05d678156ebd1d00c83dadfa3f4"
-  },
-  "system-appearance": {
-    "cargoLocks": null,
-    "date": null,
-    "extract": null,
-    "name": "system-appearance",
-    "passthru": null,
-    "pinned": false,
-    "src": {
-      "name": null,
-      "sha256": "sha256-nrPOgGQAJb/5brrrWJNDARY2jWNJ9OsMtO+LPVhHfbY=",
-      "type": "url",
-      "url": "https://raw.githubusercontent.com/d12frosted/homebrew-emacs-plus/master/patches/emacs-30/system-appearance.patch"
-    },
-    "version": "latest"
-  },
   "wttr": {
     "cargoLocks": null,
     "date": "2016-05-23",
diff --git a/_sources/generated.nix b/_sources/generated.nix
index 21b5e7f..dc519fd 100644
--- a/_sources/generated.nix
+++ b/_sources/generated.nix
@@ -1,6 +1,5 @@
 # This file was generated by nvfetcher, please do not modify it manually.
 {
-  fetchurl,
   fetchFromGitHub,
 }: {
   bang-bang = {
@@ -15,14 +14,6 @@
     };
     date = "2023-07-23";
   };
-  fix-window-role = {
-    pname = "fix-window-role";
-    version = "latest";
-    src = fetchurl {
-      url = "https://raw.githubusercontent.com/d12frosted/homebrew-emacs-plus/master/patches/emacs-28/fix-window-role.patch";
-      sha256 = "sha256-H4Qj6n5uZsmsbdjjexGZctqhJk3gAXKiSnmnEO/LgTA=";
-    };
-  };
   git-abbr = {
     pname = "git-abbr";
     version = "dc590a5b9d9d2095f95f7d90608b48e55bea0b0e";
@@ -71,34 +62,6 @@
     };
     date = "2024-07-01";
   };
-  round-undecorated-frame = {
-    pname = "round-undecorated-frame";
-    version = "latest";
-    src = fetchurl {
-      url = "https://raw.githubusercontent.com/d12frosted/homebrew-emacs-plus/master/patches/emacs-30/round-undecorated-frame.patch";
-      sha256 = "sha256-dFH4D1WYQOVOagUuVdEQB3irxV+Y8dDAOKJOJXc/KHQ=";
-    };
-  };
-  sddm-theme-minesddm = {
-    pname = "sddm-theme-minesddm";
-    version = "56be28834dfdb05d678156ebd1d00c83dadfa3f4";
-    src = fetchFromGitHub {
-      owner = "Davi-S";
-      repo = "sddm-theme-minesddm";
-      rev = "56be28834dfdb05d678156ebd1d00c83dadfa3f4";
-      fetchSubmodules = false;
-      sha256 = "sha256-X64m9fs+a6M0cgJKCNsk2kQU43DEcwEvD/1nQ755BGE=";
-    };
-    date = "2025-03-08";
-  };
-  system-appearance = {
-    pname = "system-appearance";
-    version = "latest";
-    src = fetchurl {
-      url = "https://raw.githubusercontent.com/d12frosted/homebrew-emacs-plus/master/patches/emacs-30/system-appearance.patch";
-      sha256 = "sha256-nrPOgGQAJb/5brrrWJNDARY2jWNJ9OsMtO+LPVhHfbY=";
-    };
-  };
   wttr = {
     pname = "wttr";
     version = "7500e382e6b29a463edc57598217ce0cfaf8c90c";
diff --git a/flake.in.nix b/flake.in.nix
index db7f2fb..a4523bc 100644
--- a/flake.in.nix
+++ b/flake.in.nix
@@ -1,6 +1,5 @@
 {
   inputs = let
-    mkCustomUrl = url: {inherit url;};
 
     mkInput = url: {url = "github:${url}";};
 
@@ -23,9 +22,6 @@
     agenix = mkInput "ryantm/agenix";
     catppuccin = mkInput "catppuccin/nix";
     chaotic = mkInput "chaotic-cx/nyx/nyxpkgs-unstable";
-    emacs = mkCustomUrl "git+https://git.pupbrained.xyz/pupbrained/nixmacs.git";
-    ghostty = mkInput "ghostty-org/ghostty";
-    hypr-dynamic-cursors = mkFollowing "VirtCode/hypr-dynamic-cursors" "hyprland";
     hyprland = mkWithSubmodules "https://github.com/hyprwm/Hyprland";
     hyprland-plugins = mkFollowing "hyprwm/hyprland-plugins" "hyprland";
     hyprpanel = mkInput "ThomasCarey4/HyprPanel-NixFix";
@@ -33,19 +29,15 @@
     hyprswitch = mkInput "h3rmt/hyprswitch/release";
     impermanence = mkInput "nix-community/impermanence";
     jovian = mkInput "Jovian-Experiments/Jovian-NixOS";
-    kirsch = mkCustomUrl "https://flakehub.com/f/molarmanful/kirsch/0.3.0";
     nix-colors = mkInput "Misterio77/nix-colors";
     nixos-apple-silicon = mkInput "tpwrules/nixos-apple-silicon";
     nixos-facter-modules = mkInput "numtide/nixos-facter-modules";
     nixpkgs = mkInput "NixOS/nixpkgs/nixos-unstable";
-    nixpkgs-jdk16 = mkInput "NixOS/nixpkgs/0e713aed46a8a43f6b6cc31c98c017a10dcf8810"; # last version to have temurin 16
     nixvim = mkInput "pupbrained/nvim-config";
     treefmt-nix = mkInput "numtide/treefmt-nix";
     wezterm = mkInput "wez/wezterm?dir=nix";
-    xmonad-contrib = mkInput "xmonad/xmonad-contrib";
-    zen-browser = mkInput "youwen5/zen-browser-flake";
+    zen-browser = mkInput "0xc000022070/zen-browser-flake";
 
-    cosmic = mkFollowingNixpkgs "lilyinstarlight/nixos-cosmic";
     darwin = mkFollowingNixpkgs "LnL7/nix-darwin/master";
     home-manager = mkFollowingNixpkgs "nix-community/home-manager";
     niri = mkFollowingNixpkgs "sodiboo/niri-flake";
@@ -72,17 +64,14 @@
           cudaSupport = true;
         };
 
-        systems.modules.nixos =
-          [
-            agenix.nixosModules.default
-            catppuccin.nixosModules.catppuccin
-            chaotic.nixosModules.default
-            cosmic.nixosModules.default
-            impermanence.nixosModules.impermanence
-            nixos-facter-modules.nixosModules.facter
-            jovian.nixosModules.default
-          ]
-          ++ xmonad-contrib.nixosModules;
+        systems.modules.nixos = [
+          agenix.nixosModules.default
+          catppuccin.nixosModules.catppuccin
+          chaotic.nixosModules.default
+          impermanence.nixosModules.impermanence
+          nixos-facter-modules.nixosModules.facter
+          jovian.nixosModules.default
+        ];
 
         systems.modules.darwin = [
           "${home-manager}/nix-darwin"
diff --git a/flake.lock b/flake.lock
index 916b13b..aaa80dc 100644
--- a/flake.lock
+++ b/flake.lock
@@ -8,11 +8,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1736955230,
-        "narHash": "sha256-uenf8fv2eG5bKM8C/UvFaiJMZ4IpUFaQxk9OH5t/1gA=",
+        "lastModified": 1745630506,
+        "narHash": "sha256-bHCFgGeu8XjWlVuaWzi3QONjDW3coZDqSHvnd4l7xus=",
         "owner": "ryantm",
         "repo": "agenix",
-        "rev": "e600439ec4c273cf11e06fe4d9d906fb98fa097c",
+        "rev": "96e078c646b711aee04b82ba01aefbff87004ded",
         "type": "github"
       },
       "original": {
@@ -24,7 +24,7 @@
     "ags": {
       "inputs": {
         "astal": "astal",
-        "nixpkgs": "nixpkgs_9"
+        "nixpkgs": "nixpkgs_5"
       },
       "locked": {
         "lastModified": 1734091628,
@@ -97,7 +97,7 @@
     },
     "astal_2": {
       "inputs": {
-        "nixpkgs": "nixpkgs_10"
+        "nixpkgs": "nixpkgs_6"
       },
       "locked": {
         "lastModified": 1734814417,
@@ -129,37 +129,16 @@
         "type": "github"
       }
     },
-    "bited-utils": {
-      "inputs": {
-        "devshell": "devshell",
-        "flake-parts": "flake-parts_2",
-        "nixpkgs": "nixpkgs_15",
-        "systems": "systems_8"
-      },
-      "locked": {
-        "lastModified": 1744118807,
-        "narHash": "sha256-cVSKdpVKyU/w11e+7wblPlUOg6k4EFUh6l7I+wY8OIY=",
-        "owner": "molarmanful",
-        "repo": "bited-utils",
-        "rev": "4f2e89e736b4ad376ee924abfb32f75123c8f85d",
-        "type": "github"
-      },
-      "original": {
-        "owner": "molarmanful",
-        "repo": "bited-utils",
-        "type": "github"
-      }
-    },
     "catppuccin": {
       "inputs": {
         "nixpkgs": "nixpkgs_2"
       },
       "locked": {
-        "lastModified": 1744447794,
-        "narHash": "sha256-z5uK5BDmFg0L/0EW2XYLGr39FbQeXyNVnIEhkZrG8+Q=",
+        "lastModified": 1745598511,
+        "narHash": "sha256-GWYB7PngGwTJrp7gr0w6E5nnvwiblPvN2kjRCQw3ZEg=",
         "owner": "catppuccin",
         "repo": "nix",
-        "rev": "c44fe73ed8e5d5809eded7cc6156ca9c40044e42",
+        "rev": "199cb288a85b15ed203089804c024ae5b3eacd7c",
         "type": "github"
       },
       "original": {
@@ -177,11 +156,11 @@
         "nixpkgs": "nixpkgs_3"
       },
       "locked": {
-        "lastModified": 1744633322,
-        "narHash": "sha256-kfHIxZ0vhGLwsl9srMnOldN2LfbpjYEpuA+c7T8tPHU=",
+        "lastModified": 1745852554,
+        "narHash": "sha256-LCVb3nSAaq+mTc9dUVwReuj+oFpvtVU+F7voASYdAkE=",
         "owner": "chaotic-cx",
         "repo": "nyx",
-        "rev": "f556e2849cc0aa506c4d38979c0718f64a4616ce",
+        "rev": "67acaa3f4a3d51cb8f5d00c7f1e7b385bc9a1ea0",
         "type": "github"
       },
       "original": {
@@ -193,15 +172,15 @@
     },
     "codeium": {
       "inputs": {
-        "flake-utils": "flake-utils_4",
-        "nixpkgs": "nixpkgs_20"
+        "flake-utils": "flake-utils",
+        "nixpkgs": "nixpkgs_12"
       },
       "locked": {
-        "lastModified": 1733165974,
-        "narHash": "sha256-ijRHGhvvfp7dfkb2/8iT5i2SsdZJzH/r1uh4GnoDz5Y=",
+        "lastModified": 1745521128,
+        "narHash": "sha256-TyPZZGDC2tG1VSTNcHHPLxEXMoyHPXCUCCJWEG0zHYw=",
         "owner": "jcdickinson",
         "repo": "codeium.nvim",
-        "rev": "27d2b1ce8c7ba14dbf6e4504bdea8e5548be5476",
+        "rev": "6e4a661a2d701ff615872ec5a30025a329419d5f",
         "type": "github"
       },
       "original": {
@@ -210,29 +189,6 @@
         "type": "github"
       }
     },
-    "cosmic": {
-      "inputs": {
-        "flake-compat": "flake-compat",
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "nixpkgs-stable": "nixpkgs-stable",
-        "rust-overlay": "rust-overlay"
-      },
-      "locked": {
-        "lastModified": 1744628957,
-        "narHash": "sha256-g1lGl2j5b6sjAdfLXHyIQh8gvKBKnDuwYTR4EMexdP0=",
-        "owner": "lilyinstarlight",
-        "repo": "nixos-cosmic",
-        "rev": "e9da1352e4b3ad6778ae3166fbe10c6a3a879c21",
-        "type": "github"
-      },
-      "original": {
-        "owner": "lilyinstarlight",
-        "repo": "nixos-cosmic",
-        "type": "github"
-      }
-    },
     "darwin": {
       "inputs": {
         "nixpkgs": [
@@ -241,11 +197,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1700795494,
-        "narHash": "sha256-gzGLZSiOhf155FW7262kdHo2YDeugp3VuIFb4/GGng0=",
+        "lastModified": 1744478979,
+        "narHash": "sha256-dyN+teG9G82G+m+PX/aSAagkC+vUv0SgUw3XkPhQodQ=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "4b9b83d5a92e8c1fbfd8eb27eda375908c11ec4d",
+        "rev": "43975d782b418ebf4969e9ccba82466728c2851b",
         "type": "github"
       },
       "original": {
@@ -262,11 +218,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1744478979,
-        "narHash": "sha256-dyN+teG9G82G+m+PX/aSAagkC+vUv0SgUw3XkPhQodQ=",
+        "lastModified": 1745816321,
+        "narHash": "sha256-Gyh/fkCDqVNGM0BWvk+4UAS17w2UI6iwnbQQCmc1TDI=",
         "owner": "LnL7",
         "repo": "nix-darwin",
-        "rev": "43975d782b418ebf4969e9ccba82466728c2851b",
+        "rev": "4515dacafb0ccd42e5395aacc49fd58a43027e01",
         "type": "github"
       },
       "original": {
@@ -276,105 +232,6 @@
         "type": "github"
       }
     },
-    "devshell": {
-      "inputs": {
-        "nixpkgs": "nixpkgs_14"
-      },
-      "locked": {
-        "lastModified": 1735644329,
-        "narHash": "sha256-tO3HrHriyLvipc4xr+Ewtdlo7wM1OjXNjlWRgmM7peY=",
-        "owner": "numtide",
-        "repo": "devshell",
-        "rev": "f7795ede5b02664b57035b3b757876703e2c3eac",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "devshell",
-        "type": "github"
-      }
-    },
-    "devshell_2": {
-      "inputs": {
-        "nixpkgs": "nixpkgs_16"
-      },
-      "locked": {
-        "lastModified": 1741473158,
-        "narHash": "sha256-kWNaq6wQUbUMlPgw8Y+9/9wP0F8SHkjy24/mN3UAppg=",
-        "owner": "numtide",
-        "repo": "devshell",
-        "rev": "7c9e793ebe66bcba8292989a68c0419b737a22a0",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "devshell",
-        "type": "github"
-      }
-    },
-    "devshell_3": {
-      "inputs": {
-        "nixpkgs": [
-          "nixvim",
-          "nixvim",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1728330715,
-        "narHash": "sha256-xRJ2nPOXb//u1jaBnDP56M7v5ldavjbtR6lfGqSvcKg=",
-        "owner": "numtide",
-        "repo": "devshell",
-        "rev": "dd6b80932022cea34a019e2bb32f6fa9e494dfef",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "devshell",
-        "type": "github"
-      }
-    },
-    "emacs": {
-      "inputs": {
-        "emacs-overlay": "emacs-overlay",
-        "flake-utils": "flake-utils_2",
-        "nixpkgs": "nixpkgs_5",
-        "treefmt-nix": "treefmt-nix"
-      },
-      "locked": {
-        "lastModified": 1727905604,
-        "narHash": "sha256-8yyapsIQLOfpSVc7ibHxbQAk8J2vlcOVIfv4PU6ovEk=",
-        "ref": "refs/heads/main",
-        "rev": "06ebe03fc23d38e4e18de82f8e13b1391590207f",
-        "revCount": 27,
-        "type": "git",
-        "url": "https://git.pupbrained.xyz/pupbrained/nixmacs.git"
-      },
-      "original": {
-        "type": "git",
-        "url": "https://git.pupbrained.xyz/pupbrained/nixmacs.git"
-      }
-    },
-    "emacs-overlay": {
-      "inputs": {
-        "flake-utils": "flake-utils",
-        "nixpkgs": "nixpkgs_4",
-        "nixpkgs-stable": "nixpkgs-stable_2"
-      },
-      "locked": {
-        "lastModified": 1723482913,
-        "narHash": "sha256-wzIUWp672DHcFYhfKBxzfs4nSlm6W34tOmTOlFwwETE=",
-        "owner": "nix-community",
-        "repo": "emacs-overlay",
-        "rev": "463ee3b4d1c63385c58d7742d33dbe6bdc8fd2a1",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "emacs-overlay",
-        "type": "github"
-      }
-    },
     "fenix": {
       "inputs": {
         "nixpkgs": [
@@ -384,11 +241,11 @@
         "rust-analyzer-src": "rust-analyzer-src"
       },
       "locked": {
-        "lastModified": 1744231114,
-        "narHash": "sha256-60gLl2rJFt6SRwqWimsTAeHgfsIE1iV0zChdJFOvx8w=",
+        "lastModified": 1745735608,
+        "narHash": "sha256-L0jzm815XBFfF2wCFmR+M1CF+beIEFj6SxlqVKF59Ec=",
         "owner": "nix-community",
         "repo": "fenix",
-        "rev": "0ccfe532b1433da8e5a23cd513ff6847e0f6a8c2",
+        "rev": "c39a78eba6ed2a022cc3218db90d485077101496",
         "type": "github"
       },
       "original": {
@@ -400,81 +257,35 @@
     "flake-compat": {
       "flake": false,
       "locked": {
-        "lastModified": 1717312683,
-        "narHash": "sha256-FrlieJH50AuvagamEvWMIE6D2OAnERuDboFDYAED/dE=",
-        "owner": "nix-community",
+        "lastModified": 1696426674,
+        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
+        "owner": "edolstra",
         "repo": "flake-compat",
-        "rev": "38fd3954cf65ce6faf3d0d45cd26059e059f07ea",
+        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
         "type": "github"
       },
       "original": {
-        "owner": "nix-community",
+        "owner": "edolstra",
         "repo": "flake-compat",
         "type": "github"
       }
     },
     "flake-compat_2": {
-      "flake": false,
       "locked": {
-        "lastModified": 1733328505,
-        "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
-        "owner": "edolstra",
+        "lastModified": 1688025799,
+        "narHash": "sha256-ktpB4dRtnksm9F5WawoIkEneh1nrEvuxb5lJFt1iOyw=",
+        "owner": "nix-community",
         "repo": "flake-compat",
-        "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
+        "rev": "8bf105319d44f6b9f0d764efa4fdef9f1cc9ba1c",
         "type": "github"
       },
       "original": {
-        "owner": "edolstra",
+        "owner": "nix-community",
         "repo": "flake-compat",
         "type": "github"
       }
     },
     "flake-compat_3": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1696426674,
-        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
-        "type": "github"
-      },
-      "original": {
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
-    "flake-compat_4": {
-      "locked": {
-        "lastModified": 1688025799,
-        "narHash": "sha256-ktpB4dRtnksm9F5WawoIkEneh1nrEvuxb5lJFt1iOyw=",
-        "owner": "nix-community",
-        "repo": "flake-compat",
-        "rev": "8bf105319d44f6b9f0d764efa4fdef9f1cc9ba1c",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
-    "flake-compat_5": {
-      "locked": {
-        "lastModified": 1696426674,
-        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
-        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
-        "revCount": 57,
-        "type": "tarball",
-        "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.0.1/018afb31-abd1-7bff-a5e4-cff7e18efb7a/source.tar.gz"
-      },
-      "original": {
-        "type": "tarball",
-        "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz"
-      }
-    },
-    "flake-compat_6": {
       "flake": false,
       "locked": {
         "lastModified": 1696426674,
@@ -491,7 +302,7 @@
         "type": "github"
       }
     },
-    "flake-compat_7": {
+    "flake-compat_4": {
       "flake": false,
       "locked": {
         "lastModified": 1650374568,
@@ -507,7 +318,7 @@
         "type": "github"
       }
     },
-    "flake-compat_8": {
+    "flake-compat_5": {
       "flake": false,
       "locked": {
         "lastModified": 1650374568,
@@ -542,42 +353,6 @@
       }
     },
     "flake-parts_2": {
-      "inputs": {
-        "nixpkgs-lib": "nixpkgs-lib_2"
-      },
-      "locked": {
-        "lastModified": 1738453229,
-        "narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=",
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "type": "github"
-      }
-    },
-    "flake-parts_3": {
-      "inputs": {
-        "nixpkgs-lib": "nixpkgs-lib_3"
-      },
-      "locked": {
-        "lastModified": 1743550720,
-        "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=",
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "rev": "c621e8422220273271f52058f618c94e405bb0f5",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "type": "github"
-      }
-    },
-    "flake-parts_4": {
       "inputs": {
         "nixpkgs-lib": [
           "nixvim",
@@ -586,11 +361,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1733312601,
-        "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=",
+        "lastModified": 1743550720,
+        "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9",
+        "rev": "c621e8422220273271f52058f618c94e405bb0f5",
         "type": "github"
       },
       "original": {
@@ -615,14 +390,14 @@
     },
     "flake-utils": {
       "inputs": {
-        "systems": "systems_2"
+        "systems": "systems_5"
       },
       "locked": {
-        "lastModified": 1710146030,
-        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
+        "lastModified": 1701680307,
+        "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
+        "rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
         "type": "github"
       },
       "original": {
@@ -633,7 +408,7 @@
     },
     "flake-utils-plus": {
       "inputs": {
-        "flake-utils": "flake-utils_7"
+        "flake-utils": "flake-utils_4"
       },
       "locked": {
         "lastModified": 1715533576,
@@ -652,7 +427,7 @@
     },
     "flake-utils-plus_2": {
       "inputs": {
-        "flake-utils": "flake-utils_8"
+        "flake-utils": "flake-utils_5"
       },
       "locked": {
         "lastModified": 1715533576,
@@ -669,52 +444,16 @@
         "type": "github"
       }
     },
-    "flake-utils_10": {
-      "inputs": {
-        "systems": "systems_15"
-      },
-      "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"
-      }
-    },
-    "flake-utils_11": {
-      "inputs": {
-        "systems": "systems_16"
-      },
-      "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"
-      }
-    },
     "flake-utils_2": {
       "inputs": {
-        "systems": "systems_3"
+        "systems": "systems_6"
       },
       "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": {
@@ -725,7 +464,7 @@
     },
     "flake-utils_3": {
       "inputs": {
-        "systems": "systems_5"
+        "systems": "systems_7"
       },
       "locked": {
         "lastModified": 1731533236,
@@ -742,60 +481,6 @@
       }
     },
     "flake-utils_4": {
-      "inputs": {
-        "systems": "systems_10"
-      },
-      "locked": {
-        "lastModified": 1701680307,
-        "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "flake-utils_5": {
-      "inputs": {
-        "systems": "systems_11"
-      },
-      "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"
-      }
-    },
-    "flake-utils_6": {
-      "inputs": {
-        "systems": "systems_12"
-      },
-      "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"
-      }
-    },
-    "flake-utils_7": {
       "locked": {
         "lastModified": 1644229661,
         "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=",
@@ -810,9 +495,9 @@
         "type": "github"
       }
     },
-    "flake-utils_8": {
+    "flake-utils_5": {
       "inputs": {
-        "systems": "systems_13"
+        "systems": "systems_8"
       },
       "locked": {
         "lastModified": 1694529238,
@@ -828,9 +513,9 @@
         "type": "github"
       }
     },
-    "flake-utils_9": {
+    "flake-utils_6": {
       "inputs": {
-        "systems": "systems_14"
+        "systems": "systems_9"
       },
       "locked": {
         "lastModified": 1731533236,
@@ -848,7 +533,7 @@
     },
     "flakegen": {
       "inputs": {
-        "systems": "systems_4"
+        "systems": "systems_2"
       },
       "locked": {
         "lastModified": 1707120544,
@@ -881,100 +566,6 @@
         "type": "github"
       }
     },
-    "ghostty": {
-      "inputs": {
-        "flake-compat": "flake-compat_2",
-        "flake-utils": "flake-utils_3",
-        "nixpkgs-stable": "nixpkgs-stable_3",
-        "nixpkgs-unstable": "nixpkgs-unstable",
-        "zig": "zig",
-        "zon2nix": "zon2nix"
-      },
-      "locked": {
-        "lastModified": 1744598233,
-        "narHash": "sha256-iJG46EoxQlyKDck0isEloW8rLsk4akCjCw5nxhsugN4=",
-        "owner": "ghostty-org",
-        "repo": "ghostty",
-        "rev": "9d9d781a0b7142ddc176167ef5e889618d295ef5",
-        "type": "github"
-      },
-      "original": {
-        "owner": "ghostty-org",
-        "repo": "ghostty",
-        "type": "github"
-      }
-    },
-    "git-hooks": {
-      "inputs": {
-        "flake-compat": [
-          "nixvim",
-          "nixvim",
-          "flake-compat"
-        ],
-        "gitignore": "gitignore_2",
-        "nixpkgs": [
-          "nixvim",
-          "nixvim",
-          "nixpkgs"
-        ],
-        "nixpkgs-stable": [
-          "nixvim",
-          "nixvim",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1734279981,
-        "narHash": "sha256-NdaCraHPp8iYMWzdXAt5Nv6sA3MUzlCiGiR586TCwo0=",
-        "owner": "cachix",
-        "repo": "git-hooks.nix",
-        "rev": "aa9f40c906904ebd83da78e7f328cd8aeaeae785",
-        "type": "github"
-      },
-      "original": {
-        "owner": "cachix",
-        "repo": "git-hooks.nix",
-        "type": "github"
-      }
-    },
-    "git-ignore-nix": {
-      "inputs": {
-        "nixpkgs": "nixpkgs_26"
-      },
-      "locked": {
-        "lastModified": 1709087332,
-        "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
-        "owner": "hercules-ci",
-        "repo": "gitignore.nix",
-        "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "ref": "master",
-        "repo": "gitignore.nix",
-        "type": "github"
-      }
-    },
-    "git-ignore-nix_2": {
-      "inputs": {
-        "nixpkgs": "nixpkgs_28"
-      },
-      "locked": {
-        "lastModified": 1709087332,
-        "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
-        "owner": "hercules-ci",
-        "repo": "gitignore.nix",
-        "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "ref": "master",
-        "repo": "gitignore.nix",
-        "type": "github"
-      }
-    },
     "gitignore": {
       "inputs": {
         "nixpkgs": [
@@ -997,29 +588,6 @@
         "type": "github"
       }
     },
-    "gitignore_2": {
-      "inputs": {
-        "nixpkgs": [
-          "nixvim",
-          "nixvim",
-          "git-hooks",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1709087332,
-        "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
-        "owner": "hercules-ci",
-        "repo": "gitignore.nix",
-        "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "gitignore.nix",
-        "type": "github"
-      }
-    },
     "harfbuzz": {
       "flake": false,
       "locked": {
@@ -1045,11 +613,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1703113217,
-        "narHash": "sha256-7ulcXOk63TIT2lVDSExj7XzFx09LpdSAPtvgtM7yQPE=",
+        "lastModified": 1745494811,
+        "narHash": "sha256-YZCh2o9Ua1n9uCvrvi5pRxtuVNml8X2a03qIFfRKpFs=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "3bfaacf46133c037bb356193bd2f1765d9dc82c1",
+        "rev": "abfad3d2958c9e6300a883bd443512c55dfeb1be",
         "type": "github"
       },
       "original": {
@@ -1066,11 +634,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1744400600,
-        "narHash": "sha256-qYhUgA98mhq1QK13r9qVY+sG1ri6FBgyp+GApX6wS20=",
+        "lastModified": 1745771770,
+        "narHash": "sha256-kC1yYNAO69i0Q9nnQFTxu5kdwcoHRE7x4jtJyIB5QSg=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "b74b22bb6167e8dff083ec6988c98798bf8954d3",
+        "rev": "0fbd8207e913b2d1660a7662f9ae80e5e639de65",
         "type": "github"
       },
       "original": {
@@ -1086,11 +654,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1744650422,
-        "narHash": "sha256-m3/FzlNbLzfbZ1F0PUm8oEHNjGgea+bXT5uvAodt4t4=",
+        "lastModified": 1745894335,
+        "narHash": "sha256-m47zhftaod/oHOwoVT25jstdcVLhkrVGyvEHKjbnFHI=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "273ad32fbb4769ac56e15caccdbdaad2c2e6b88a",
+        "rev": "1ad123239957d40e11ef66c203d0a7e272eb48aa",
         "type": "github"
       },
       "original": {
@@ -1102,17 +670,16 @@
     "home-manager_4": {
       "inputs": {
         "nixpkgs": [
-          "nixvim",
-          "nixvim",
+          "zen-browser",
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1734093295,
-        "narHash": "sha256-hSwgGpcZtdDsk1dnzA0xj5cNaHgN9A99hRF/mxMtwS4=",
+        "lastModified": 1743604125,
+        "narHash": "sha256-ZD61DNbsBt1mQbinAaaEqKaJk2RFo9R/j+eYWeGMx7A=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "66c5d8b62818ec4c1edb3e941f55ef78df8141a8",
+        "rev": "180fd43eea296e62ae68e079fcf56aba268b9a1a",
         "type": "github"
       },
       "original": {
@@ -1121,27 +688,6 @@
         "type": "github"
       }
     },
-    "hypr-dynamic-cursors": {
-      "inputs": {
-        "hyprland": [
-          "hyprland"
-        ],
-        "nixpkgs": "nixpkgs_7"
-      },
-      "locked": {
-        "lastModified": 1744109570,
-        "narHash": "sha256-wYBn/AETdeQH866IWvNgNt7YrUeLxjhUSWnJzl3+zLM=",
-        "owner": "VirtCode",
-        "repo": "hypr-dynamic-cursors",
-        "rev": "07a9ca62466edf58a251a3d9d1470f8d502ffee0",
-        "type": "github"
-      },
-      "original": {
-        "owner": "VirtCode",
-        "repo": "hypr-dynamic-cursors",
-        "type": "github"
-      }
-    },
     "hyprcursor": {
       "inputs": {
         "hyprlang": [
@@ -1187,11 +733,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1743953322,
-        "narHash": "sha256-prQ5JKopXtzCMX2eT3dXbaVvGmzjMRE2bXStQDdazpM=",
+        "lastModified": 1745015490,
+        "narHash": "sha256-apEJ9zoSzmslhJ2vOKFcXTMZLUFYzh1ghfB6Rbw3Low=",
         "owner": "hyprwm",
         "repo": "hyprgraphics",
-        "rev": "9d7f2687c84c729afbc3b13f7937655570f2978d",
+        "rev": "60754910946b4e2dc1377b967b7156cb989c5873",
         "type": "github"
       },
       "original": {
@@ -1210,17 +756,17 @@
         "hyprlang": "hyprlang",
         "hyprutils": "hyprutils",
         "hyprwayland-scanner": "hyprwayland-scanner",
-        "nixpkgs": "nixpkgs_8",
+        "nixpkgs": "nixpkgs_4",
         "pre-commit-hooks": "pre-commit-hooks",
-        "systems": "systems_6",
+        "systems": "systems_3",
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1744646317,
-        "narHash": "sha256-IHiF831GJNv+d+bAJ8Ys5+EaI222/T6QQA9BFcnlqTY=",
+        "lastModified": 1745871922,
+        "narHash": "sha256-tL17ZXWpzoAqMMT4amdO7shpkBP8dUuqAFIfcmsYSs4=",
         "ref": "refs/heads/main",
-        "rev": "8b7b169043de2a9d95f8505edb8b6576fac586fd",
-        "revCount": 5997,
+        "rev": "21184404885cf61f7c10d2eb749478ef6b035dd2",
+        "revCount": 6034,
         "submodules": true,
         "type": "git",
         "url": "https://github.com/hyprwm/Hyprland"
@@ -1248,11 +794,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1743950622,
-        "narHash": "sha256-8qjDapcQeDqxQUIm5gA0x6XZtowV/14bOs3K0tCSMoU=",
+        "lastModified": 1745610646,
+        "narHash": "sha256-R8rWH3oFV5/jwl87t7HyVoFgndrPw8QR/2pLwyKJLYM=",
         "owner": "hyprwm",
         "repo": "hyprland-plugins",
-        "rev": "be6b9875dd5c586fb401d294bb98c31973849651",
+        "rev": "61ab0385c8d9d456bf89539c76dd9e73becefde3",
         "type": "github"
       },
       "original": {
@@ -1387,7 +933,7 @@
       "inputs": {
         "ags": "ags",
         "astal": "astal_2",
-        "nixpkgs": "nixpkgs_11"
+        "nixpkgs": "nixpkgs_7"
       },
       "locked": {
         "lastModified": 1734851836,
@@ -1408,7 +954,7 @@
         "hyprland": [
           "hyprland"
         ],
-        "systems": "systems_7"
+        "systems": "systems_4"
       },
       "locked": {
         "lastModified": 1742767019,
@@ -1427,15 +973,15 @@
     "hyprswitch": {
       "inputs": {
         "flake-parts": "flake-parts",
-        "nixpkgs": "nixpkgs_12",
-        "rust-overlay": "rust-overlay_2"
+        "nixpkgs": "nixpkgs_8",
+        "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1741036724,
-        "narHash": "sha256-nCsqa5dXW1Qja+smRkVpNkGAHfYkBFJ6U3bVilY5pDo=",
+        "lastModified": 1745860672,
+        "narHash": "sha256-tJKLjWaOcJW4Ttu1noSY+lddlJvyX2eonTrgR5IycZo=",
         "owner": "h3rmt",
         "repo": "hyprswitch",
-        "rev": "3feeccf2f1d3d6c0fb7c79b965ccf382118651d2",
+        "rev": "313e7d5730af2e37ab73fe238b1bd3a2d3e5552f",
         "type": "github"
       },
       "original": {
@@ -1526,16 +1072,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1729958008,
-        "narHash": "sha256-EiOq8jF4Z/zQe0QYVc3+qSKxRK//CFHMB84aYrYGwEs=",
+        "lastModified": 1737371634,
+        "narHash": "sha256-fTVAWzT1UMm1lT+YxHuVPtH+DATrhYfea3B0MxG/cGw=",
         "owner": "NuschtOS",
         "repo": "ixx",
-        "rev": "9fd01aad037f345350eab2cd45e1946cc66da4eb",
+        "rev": "a1176e2a10ce745ff8f63e4af124ece8fe0b1648",
         "type": "github"
       },
       "original": {
         "owner": "NuschtOS",
-        "ref": "v0.0.6",
+        "ref": "v0.0.7",
         "repo": "ixx",
         "type": "github"
       }
@@ -1549,11 +1095,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1744270169,
-        "narHash": "sha256-yV6OhBUj3Ag1l9gdf7eObkAoli35SUxDtFvC8JbsVrk=",
+        "lastModified": 1745487384,
+        "narHash": "sha256-WvQ4XXi0vMtEpPqhfo8ztxjeaeHkbW5tfR4O5+w8r5U=",
         "owner": "Jovian-Experiments",
         "repo": "Jovian-NixOS",
-        "rev": "10d3614023e2fb15e5e7089235e9958b9aa71a6c",
+        "rev": "0168e4a65c9d43c22ac38ff27f5fa31c7d535148",
         "type": "github"
       },
       "original": {
@@ -1565,14 +1111,14 @@
     "jovian_2": {
       "inputs": {
         "nix-github-actions": "nix-github-actions_2",
-        "nixpkgs": "nixpkgs_13"
+        "nixpkgs": "nixpkgs_9"
       },
       "locked": {
-        "lastModified": 1744648917,
-        "narHash": "sha256-xtBc0YMCP/x3+3iqnfdd4d9qEHvxQsGHamhhlegsGFE=",
+        "lastModified": 1745487384,
+        "narHash": "sha256-WvQ4XXi0vMtEpPqhfo8ztxjeaeHkbW5tfR4O5+w8r5U=",
         "owner": "Jovian-Experiments",
         "repo": "Jovian-NixOS",
-        "rev": "66c4c9dccd26330ebb0e91aa6ba89ca8835dfdc5",
+        "rev": "0168e4a65c9d43c22ac38ff27f5fa31c7d535148",
         "type": "github"
       },
       "original": {
@@ -1581,27 +1127,6 @@
         "type": "github"
       }
     },
-    "kirsch": {
-      "inputs": {
-        "bited-utils": "bited-utils",
-        "devshell": "devshell_2",
-        "flake-parts": "flake-parts_3",
-        "nixpkgs": "nixpkgs_17",
-        "systems": "systems_9"
-      },
-      "locked": {
-        "lastModified": 1744338117,
-        "narHash": "sha256-0ZtlSkqShfhPZiM5cjzevDL+ie96l13STzBEl0v6FP0=",
-        "rev": "b78a2a04a8603b5ce6ffae4b22d294708a940963",
-        "revCount": 498,
-        "type": "tarball",
-        "url": "https://api.flakehub.com/f/pinned/molarmanful/kirsch/0.3.4/019622a7-f59e-79dc-8a4a-32ce88705e5a/source.tar.gz"
-      },
-      "original": {
-        "type": "tarball",
-        "url": "https://flakehub.com/f/molarmanful/kirsch/0.3.0"
-      }
-    },
     "libpng": {
       "flake": false,
       "locked": {
@@ -1626,16 +1151,16 @@
         "nixpkgs": [
           "nixpkgs"
         ],
-        "nixpkgs-stable": "nixpkgs-stable_4",
+        "nixpkgs-stable": "nixpkgs-stable",
         "xwayland-satellite-stable": "xwayland-satellite-stable",
         "xwayland-satellite-unstable": "xwayland-satellite-unstable"
       },
       "locked": {
-        "lastModified": 1744480072,
-        "narHash": "sha256-h9MGdfc1ddQLaZ5eXdxUOY4SGvRe0IzIuX/03yVRras=",
+        "lastModified": 1745904228,
+        "narHash": "sha256-r++jPL5jvN6B249xWtVWktaY4ERcqSiw0u6GAEIMqvw=",
         "owner": "sodiboo",
         "repo": "niri-flake",
-        "rev": "c845f42f0bf9a02350a1e561cb702911c61428a9",
+        "rev": "44de17db39be417e662dfb364de42973c06c4bea",
         "type": "github"
       },
       "original": {
@@ -1664,11 +1189,11 @@
     "niri-unstable": {
       "flake": false,
       "locked": {
-        "lastModified": 1744475937,
-        "narHash": "sha256-vJXhE2BCJO3AxGUGqL7GW7ReeAL+OKy80ErMYDuILjM=",
+        "lastModified": 1745831155,
+        "narHash": "sha256-HFsUns8w56Ew7xZBtm2RJ2pS7LL95/xbfNqQRDCT/uI=",
         "owner": "YaLTeR",
         "repo": "niri",
-        "rev": "95eafba346a17104a9af71021011fcdc9e13776b",
+        "rev": "9bb292ec82682c901b29e1da8e3dd0c19c5b75bb",
         "type": "github"
       },
       "original": {
@@ -1680,7 +1205,7 @@
     "nix-colors": {
       "inputs": {
         "base16-schemes": "base16-schemes",
-        "nixpkgs-lib": "nixpkgs-lib_4"
+        "nixpkgs-lib": "nixpkgs-lib_2"
       },
       "locked": {
         "lastModified": 1707825078,
@@ -1696,28 +1221,6 @@
         "type": "github"
       }
     },
-    "nix-darwin": {
-      "inputs": {
-        "nixpkgs": [
-          "nixvim",
-          "nixvim",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1733570843,
-        "narHash": "sha256-sQJAxY1TYWD1UyibN/FnN97paTFuwBw3Vp3DNCyKsMk=",
-        "owner": "lnl7",
-        "repo": "nix-darwin",
-        "rev": "a35b08d09efda83625bef267eb24347b446c80b8",
-        "type": "github"
-      },
-      "original": {
-        "owner": "lnl7",
-        "repo": "nix-darwin",
-        "type": "github"
-      }
-    },
     "nix-github-actions": {
       "inputs": {
         "nixpkgs": [
@@ -1770,11 +1273,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1744518957,
-        "narHash": "sha256-RLBSWQfTL0v+7uyskC5kP6slLK1jvIuhaAh8QvB75m4=",
+        "lastModified": 1745725746,
+        "narHash": "sha256-iR+idGZJ191cY6NBXyVjh9QH8GVWTkvZw/w+1Igy45A=",
         "owner": "nix-community",
         "repo": "nix-index-database",
-        "rev": "4fc9ea78c962904f4ea11046f3db37c62e8a02fd",
+        "rev": "187524713d0d9b2d2c6f688b81835114d4c2a7c6",
         "type": "github"
       },
       "original": {
@@ -1785,16 +1288,16 @@
     },
     "nixos-apple-silicon": {
       "inputs": {
-        "flake-compat": "flake-compat_4",
-        "nixpkgs": "nixpkgs_18",
-        "rust-overlay": "rust-overlay_3"
+        "flake-compat": "flake-compat_2",
+        "nixpkgs": "nixpkgs_10",
+        "rust-overlay": "rust-overlay_2"
       },
       "locked": {
-        "lastModified": 1742098834,
-        "narHash": "sha256-l98XVpNXW6hr0AsxCeQZbdf6EGT8OpHdkWBi7sdel4s=",
+        "lastModified": 1745776248,
+        "narHash": "sha256-QrTarwIUlK/7iPnCeVF+LiCIzwd8UI5F8ZY5e+ZRtyY=",
         "owner": "tpwrules",
         "repo": "nixos-apple-silicon",
-        "rev": "8457960249bcfd34c22838e20eaa7d8261428688",
+        "rev": "a2d847358bc7eebe8bd13c89028b3efbd52325bf",
         "type": "github"
       },
       "original": {
@@ -1820,11 +1323,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1703013332,
-        "narHash": "sha256-+tFNwMvlXLbJZXiMHqYq77z/RfmpfpiI3yjL6o/Zo9M=",
+        "lastModified": 1745391562,
+        "narHash": "sha256-sPwcCYuiEopaafePqlG826tBhctuJsLx/mhKKM5Fmjo=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "54aac082a4d9bb5bbc5c4e899603abfb76a3f6d6",
+        "rev": "8a2f738d9d1f1d986b5a4cd2fd2061a7127237d7",
         "type": "github"
       },
       "original": {
@@ -1834,22 +1337,6 @@
         "type": "github"
       }
     },
-    "nixpkgs-jdk16": {
-      "locked": {
-        "lastModified": 1722515366,
-        "narHash": "sha256-1b8rIevHcxxf+9DZ9GYY4NMqj7Bs0fWyJ7ScLlZ5xhI=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "0e713aed46a8a43f6b6cc31c98c017a10dcf8810",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "0e713aed46a8a43f6b6cc31c98c017a10dcf8810",
-        "type": "github"
-      }
-    },
     "nixpkgs-lib": {
       "locked": {
         "lastModified": 1735774519,
@@ -1863,33 +1350,6 @@
       }
     },
     "nixpkgs-lib_2": {
-      "locked": {
-        "lastModified": 1738452942,
-        "narHash": "sha256-vJzFZGaCpnmo7I6i416HaBLpC+hvcURh/BQwROcGIp8=",
-        "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/072a6db25e947df2f31aab9eccd0ab75d5b2da11.tar.gz"
-      },
-      "original": {
-        "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/072a6db25e947df2f31aab9eccd0ab75d5b2da11.tar.gz"
-      }
-    },
-    "nixpkgs-lib_3": {
-      "locked": {
-        "lastModified": 1743296961,
-        "narHash": "sha256-b1EdN3cULCqtorQ4QeWgLMrd5ZGOjLSLemfa00heasc=",
-        "owner": "nix-community",
-        "repo": "nixpkgs.lib",
-        "rev": "e4822aea2a6d1cdd36653c134cacfd64c97ff4fa",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "nixpkgs.lib",
-        "type": "github"
-      }
-    },
-    "nixpkgs-lib_4": {
       "locked": {
         "lastModified": 1697935651,
         "narHash": "sha256-qOfWjQ2JQSQL15KLh6D7xQhx0qgZlYZTYlcEiRuAMMw=",
@@ -1906,11 +1366,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1744440957,
-        "narHash": "sha256-FHlSkNqFmPxPJvy+6fNLaNeWnF1lZSgqVCl/eWaJRc4=",
+        "lastModified": 1745742390,
+        "narHash": "sha256-1rqa/XPSJqJg21BKWjzJZC7yU0l/YTVtjRi0RJmipus=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "26d499fc9f1d567283d5d56fcf367edd815dba1d",
+        "rev": "26245db0cb552047418cfcef9a25da91b222d6c7",
         "type": "github"
       },
       "original": {
@@ -1920,77 +1380,13 @@
         "type": "github"
       }
     },
-    "nixpkgs-stable_2": {
-      "locked": {
-        "lastModified": 1723282977,
-        "narHash": "sha256-oTK91aOlA/4IsjNAZGMEBz7Sq1zBS0Ltu4/nIQdYDOg=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "a781ff33ae258bbcfd4ed6e673860c3e923bf2cc",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-24.05",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs-stable_3": {
-      "locked": {
-        "lastModified": 1741992157,
-        "narHash": "sha256-nlIfTsTrMSksEJc1f7YexXiPVuzD1gOfeN1ggwZyUoc=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "da4b122f63095ca1199bd4d526f9e26426697689",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "release-24.11",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs-stable_4": {
-      "locked": {
-        "lastModified": 1744309437,
-        "narHash": "sha256-QZnNHM823am8apCqKSPdtnzPGTy2ZB4zIXOVoBp5+W0=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "f9ebe33a928b5d529c895202263a5ce46bdf12f7",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-24.11",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs-unstable": {
-      "locked": {
-        "lastModified": 1741865919,
-        "narHash": "sha256-4thdbnP6dlbdq+qZWTsm4ffAwoS8Tiq1YResB+RP6WE=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "573c650e8a14b2faa0041645ab18aed7e60f0c9a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "nixpkgs_10": {
       "locked": {
-        "lastModified": 1734424634,
-        "narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=",
+        "lastModified": 1745526057,
+        "narHash": "sha256-ITSpPDwvLBZBnPRS2bUcHY3gZSwis/uTe255QgMtTLA=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33",
+        "rev": "f771eb401a46846c1aebd20552521b233dd7e18b",
         "type": "github"
       },
       "original": {
@@ -2002,162 +1398,21 @@
     },
     "nixpkgs_11": {
       "locked": {
-        "lastModified": 1734649271,
-        "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=",
-        "owner": "nixos",
+        "lastModified": 1745794561,
+        "narHash": "sha256-T36rUZHUART00h3dW4sV5tv4MrXKT7aWjNfHiZz7OHg=",
+        "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507",
+        "rev": "5461b7fa65f3ca74cef60be837fd559a8918eaa0",
         "type": "github"
       },
       "original": {
-        "owner": "nixos",
+        "owner": "NixOS",
         "ref": "nixos-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
     "nixpkgs_12": {
-      "locked": {
-        "lastModified": 1735831304,
-        "narHash": "sha256-92A/Zr8UzZzlFYmkgO3HAgX/Cr53eodgNyvJA+Ibkz0=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "0725951bfc4bbc2efff3a537837ca13159b4aec9",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_13": {
-      "locked": {
-        "lastModified": 1743583204,
-        "narHash": "sha256-F7n4+KOIfWrwoQjXrL2wD9RhFYLs2/GGe/MQY1sSdlE=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "2c8d3f48d33929642c1c12cd243df4cc7d2ce434",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_14": {
-      "locked": {
-        "lastModified": 1722073938,
-        "narHash": "sha256-OpX0StkL8vpXyWOGUD6G+MA26wAXK6SpT94kLJXo6B4=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "e36e9f57337d0ff0cf77aceb58af4c805472bfae",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_15": {
-      "locked": {
-        "lastModified": 1736344531,
-        "narHash": "sha256-8YVQ9ZbSfuUk2bUf2KRj60NRraLPKPS0Q4QFTbc+c2c=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "bffc22eb12172e6db3c5dde9e3e5628f8e3e7912",
-        "type": "github"
-      },
-      "original": {
-        "id": "nixpkgs",
-        "ref": "nixos-unstable",
-        "type": "indirect"
-      }
-    },
-    "nixpkgs_16": {
-      "locked": {
-        "lastModified": 1722073938,
-        "narHash": "sha256-OpX0StkL8vpXyWOGUD6G+MA26wAXK6SpT94kLJXo6B4=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "e36e9f57337d0ff0cf77aceb58af4c805472bfae",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_17": {
-      "locked": {
-        "lastModified": 1744032190,
-        "narHash": "sha256-KSlfrncSkcu1YE+uuJ/PTURsSlThoGkRqiGDVdbiE/k=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "b0b4b5f8f621bfe213b8b21694bab52ecfcbf30b",
-        "type": "github"
-      },
-      "original": {
-        "id": "nixpkgs",
-        "ref": "nixpkgs-unstable",
-        "type": "indirect"
-      }
-    },
-    "nixpkgs_18": {
-      "locked": {
-        "lastModified": 1741851582,
-        "narHash": "sha256-cPfs8qMccim2RBgtKGF+x9IBCduRvd/N5F4nYpU0TVE=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "6607cf789e541e7873d40d3a8f7815ea92204f32",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_19": {
-      "locked": {
-        "lastModified": 1744463964,
-        "narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1744098102,
-        "narHash": "sha256-tzCdyIJj9AjysC3OuKA+tMD/kDEDAF9mICPDU7ix0JA=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "c8cd81426f45942bb2906d5ed2fe21d2f19d95b7",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_20": {
       "locked": {
         "lastModified": 1702346276,
         "narHash": "sha256-eAQgwIWApFQ40ipeOjVSoK4TEHVd6nbSd9fApiHIw5A=",
@@ -2173,13 +1428,13 @@
         "type": "github"
       }
     },
-    "nixpkgs_21": {
+    "nixpkgs_13": {
       "locked": {
-        "lastModified": 1734474063,
-        "narHash": "sha256-Yk7+G3aWZpl9dnPBbZievN3htxiONcLXcxwdE9n0mX4=",
+        "lastModified": 1745908493,
+        "narHash": "sha256-0TaOFE2jZUZR9/bBj82bZ9hLFVkfkdYO133Oq69EMmI=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "86dd3715b283806e773b3cde008baf18dd8a5bf8",
+        "rev": "8068b83e286f005b27d10f1293df06926af04278",
         "type": "github"
       },
       "original": {
@@ -2188,29 +1443,29 @@
         "type": "github"
       }
     },
-    "nixpkgs_22": {
+    "nixpkgs_14": {
       "locked": {
-        "lastModified": 1734119587,
-        "narHash": "sha256-AKU6qqskl0yf2+JdRdD0cfxX4b9x3KKV5RqA6wijmPM=",
+        "lastModified": 1745377448,
+        "narHash": "sha256-jhZDfXVKdD7TSEGgzFJQvEEZ2K65UMiqW5YJ2aIqxMA=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "3566ab7246670a43abd2ffa913cc62dad9cdf7d5",
+        "rev": "507b63021ada5fee621b6ca371c4fca9ca46f52c",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-unstable",
+        "ref": "nixpkgs-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
-    "nixpkgs_23": {
+    "nixpkgs_15": {
       "locked": {
-        "lastModified": 1733097829,
-        "narHash": "sha256-9hbb1rqGelllb4kVUCZ307G2k3/UhmA8PPGBoyuWaSw=",
+        "lastModified": 1745377448,
+        "narHash": "sha256-jhZDfXVKdD7TSEGgzFJQvEEZ2K65UMiqW5YJ2aIqxMA=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "2c15aa59df0017ca140d9ba302412298ab4bf22a",
+        "rev": "507b63021ada5fee621b6ca371c4fca9ca46f52c",
         "type": "github"
       },
       "original": {
@@ -2220,13 +1475,13 @@
         "type": "github"
       }
     },
-    "nixpkgs_24": {
+    "nixpkgs_16": {
       "locked": {
-        "lastModified": 1735554305,
-        "narHash": "sha256-zExSA1i/b+1NMRhGGLtNfFGXgLtgo+dcuzHzaWA6w3Q=",
+        "lastModified": 1745377448,
+        "narHash": "sha256-jhZDfXVKdD7TSEGgzFJQvEEZ2K65UMiqW5YJ2aIqxMA=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "0e82ab234249d8eee3e8c91437802b32c74bb3fd",
+        "rev": "507b63021ada5fee621b6ca371c4fca9ca46f52c",
         "type": "github"
       },
       "original": {
@@ -2236,7 +1491,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_25": {
+    "nixpkgs_17": {
       "locked": {
         "lastModified": 1735821806,
         "narHash": "sha256-cuNapx/uQeCgeuhUhdck3JKbgpsml259sjUQnWM7zW8=",
@@ -2252,59 +1507,23 @@
         "type": "github"
       }
     },
-    "nixpkgs_26": {
+    "nixpkgs_18": {
       "locked": {
-        "lastModified": 1666603677,
-        "narHash": "sha256-apAEIj+z1iwMaMJ4tB21r/VTetfGDLDzuhXRHJknIAU=",
-        "owner": "NixOS",
+        "lastModified": 1743448293,
+        "narHash": "sha256-bmEPmSjJakAp/JojZRrUvNcDX2R5/nuX6bm+seVaGhs=",
+        "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "074da18a72269cc5a6cf444dce42daea5649b2fe",
+        "rev": "77b584d61ff80b4cef9245829a6f1dfad5afdfa3",
         "type": "github"
       },
       "original": {
-        "id": "nixpkgs",
-        "type": "indirect"
-      }
-    },
-    "nixpkgs_27": {
-      "locked": {
-        "lastModified": 0,
-        "narHash": "sha256-tzCdyIJj9AjysC3OuKA+tMD/kDEDAF9mICPDU7ix0JA=",
-        "path": "/nix/store/m7y9g8z15va6sd0h12zc3iw0acxn7463-source",
-        "type": "path"
-      },
-      "original": {
-        "id": "nixpkgs",
-        "type": "indirect"
-      }
-    },
-    "nixpkgs_28": {
-      "locked": {
-        "lastModified": 1666603677,
-        "narHash": "sha256-apAEIj+z1iwMaMJ4tB21r/VTetfGDLDzuhXRHJknIAU=",
-        "owner": "NixOS",
+        "owner": "nixos",
+        "ref": "nixos-unstable",
         "repo": "nixpkgs",
-        "rev": "074da18a72269cc5a6cf444dce42daea5649b2fe",
         "type": "github"
-      },
-      "original": {
-        "id": "nixpkgs",
-        "type": "indirect"
       }
     },
-    "nixpkgs_29": {
-      "locked": {
-        "lastModified": 0,
-        "narHash": "sha256-tzCdyIJj9AjysC3OuKA+tMD/kDEDAF9mICPDU7ix0JA=",
-        "path": "/nix/store/m7y9g8z15va6sd0h12zc3iw0acxn7463-source",
-        "type": "path"
-      },
-      "original": {
-        "id": "nixpkgs",
-        "type": "indirect"
-      }
-    },
-    "nixpkgs_3": {
+    "nixpkgs_2": {
       "locked": {
         "lastModified": 1744463964,
         "narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=",
@@ -2320,17 +1539,17 @@
         "type": "github"
       }
     },
-    "nixpkgs_30": {
+    "nixpkgs_3": {
       "locked": {
-        "lastModified": 1744232761,
-        "narHash": "sha256-gbl9hE39nQRpZaLjhWKmEu5ejtQsgI5TWYrIVVJn30U=",
-        "owner": "nixos",
+        "lastModified": 1745526057,
+        "narHash": "sha256-ITSpPDwvLBZBnPRS2bUcHY3gZSwis/uTe255QgMtTLA=",
+        "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "f675531bc7e6657c10a18b565cfebd8aa9e24c14",
+        "rev": "f771eb401a46846c1aebd20552521b233dd7e18b",
         "type": "github"
       },
       "original": {
-        "owner": "nixos",
+        "owner": "NixOS",
         "ref": "nixos-unstable",
         "repo": "nixpkgs",
         "type": "github"
@@ -2338,11 +1557,11 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1723175592,
-        "narHash": "sha256-M0xJ3FbDUc4fRZ84dPGx5VvgFsOzds77KiBMW/mMTnI=",
+        "lastModified": 1744932701,
+        "narHash": "sha256-fusHbZCyv126cyArUwwKrLdCkgVAIaa/fQJYFlCEqiU=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "5e0ca22929f3342b19569b21b2f3462f053e497b",
+        "rev": "b024ced1aac25639f8ca8fdfc2f8c4fbd66c48ef",
         "type": "github"
       },
       "original": {
@@ -2353,70 +1572,6 @@
       }
     },
     "nixpkgs_5": {
-      "locked": {
-        "lastModified": 1723175592,
-        "narHash": "sha256-M0xJ3FbDUc4fRZ84dPGx5VvgFsOzds77KiBMW/mMTnI=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "5e0ca22929f3342b19569b21b2f3462f053e497b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_6": {
-      "locked": {
-        "lastModified": 1720957393,
-        "narHash": "sha256-oedh2RwpjEa+TNxhg5Je9Ch6d3W1NKi7DbRO1ziHemA=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "693bc46d169f5af9c992095736e82c3488bf7dbb",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_7": {
-      "locked": {
-        "lastModified": 1737469691,
-        "narHash": "sha256-nmKOgAU48S41dTPIXAq0AHZSehWUn6ZPrUKijHAMmIk=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "9e4d5190a9482a1fb9d18adf0bdb83c6e506eaab",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_8": {
-      "locked": {
-        "lastModified": 1744463964,
-        "narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_9": {
       "locked": {
         "lastModified": 1733581040,
         "narHash": "sha256-Qn3nPMSopRQJgmvHzVqPcE3I03zJyl8cSbgnnltfFDY=",
@@ -2432,20 +1587,83 @@
         "type": "github"
       }
     },
+    "nixpkgs_6": {
+      "locked": {
+        "lastModified": 1734424634,
+        "narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_7": {
+      "locked": {
+        "lastModified": 1734649271,
+        "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_8": {
+      "locked": {
+        "lastModified": 1735831304,
+        "narHash": "sha256-92A/Zr8UzZzlFYmkgO3HAgX/Cr53eodgNyvJA+Ibkz0=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "0725951bfc4bbc2efff3a537837ca13159b4aec9",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_9": {
+      "locked": {
+        "lastModified": 1744932701,
+        "narHash": "sha256-fusHbZCyv126cyArUwwKrLdCkgVAIaa/fQJYFlCEqiU=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "b024ced1aac25639f8ca8fdfc2f8c4fbd66c48ef",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "nixvim": {
       "inputs": {
         "codeium": "codeium",
-        "flake-utils": "flake-utils_5",
-        "nixpkgs": "nixpkgs_21",
+        "flake-utils": "flake-utils_2",
+        "nixpkgs": "nixpkgs_13",
         "nixvim": "nixvim_2",
-        "treefmt-nix": "treefmt-nix_3"
+        "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1734505002,
-        "narHash": "sha256-oH0HhXrLmDb4Q+twZOSgduU9ABzdfcEzVaSePHw4lTk=",
+        "lastModified": 1745909689,
+        "narHash": "sha256-3Zzebt6wP3ZfH9KwO97QV/52+qMpyR+S/8ZszzMS2pc=",
         "owner": "pupbrained",
         "repo": "nvim-config",
-        "rev": "d4ece42d394b92ec5fbea5e6a80c2a81a2091a63",
+        "rev": "260e612547bff516c5651536a37b6c63c19ab597",
         "type": "github"
       },
       "original": {
@@ -2456,22 +1674,16 @@
     },
     "nixvim_2": {
       "inputs": {
-        "devshell": "devshell_3",
-        "flake-compat": "flake-compat_5",
-        "flake-parts": "flake-parts_4",
-        "git-hooks": "git-hooks",
-        "home-manager": "home-manager_4",
-        "nix-darwin": "nix-darwin",
-        "nixpkgs": "nixpkgs_22",
-        "nuschtosSearch": "nuschtosSearch",
-        "treefmt-nix": "treefmt-nix_2"
+        "flake-parts": "flake-parts_2",
+        "nixpkgs": "nixpkgs_14",
+        "nuschtosSearch": "nuschtosSearch"
       },
       "locked": {
-        "lastModified": 1734472356,
-        "narHash": "sha256-RIoG3zXarfuHfzM/z/NPjoHHxl3sqYrtEatSLA1/bIk=",
+        "lastModified": 1745878358,
+        "narHash": "sha256-YImreQ+dij3mLeqcjuIZZvT13Yscj7O1dxOC/+TZdJM=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "4f1fe403b18c45614d6b81423038a34cff371244",
+        "rev": "7a6c5b48031059ace82ce90b9a279ec243999554",
         "type": "github"
       },
       "original": {
@@ -2482,7 +1694,7 @@
     },
     "nuschtosSearch": {
       "inputs": {
-        "flake-utils": "flake-utils_6",
+        "flake-utils": "flake-utils_3",
         "ixx": "ixx",
         "nixpkgs": [
           "nixvim",
@@ -2491,11 +1703,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1733773348,
-        "narHash": "sha256-Y47y+LesOCkJaLvj+dI/Oa6FAKj/T9sKVKDXLNsViPw=",
+        "lastModified": 1745046075,
+        "narHash": "sha256-8v4y6k16Ra/fiecb4DxhsoOGtzLKgKlS+9/XJ9z0T2I=",
         "owner": "NuschtOS",
         "repo": "search",
-        "rev": "3051be7f403bff1d1d380e4612f0c70675b44fc9",
+        "rev": "066afe8643274470f4a294442aadd988356a478f",
         "type": "github"
       },
       "original": {
@@ -2506,7 +1718,7 @@
     },
     "pre-commit-hooks": {
       "inputs": {
-        "flake-compat": "flake-compat_3",
+        "flake-compat": "flake-compat",
         "gitignore": "gitignore",
         "nixpkgs": [
           "hyprland",
@@ -2532,13 +1744,9 @@
         "agenix": "agenix",
         "catppuccin": "catppuccin",
         "chaotic": "chaotic",
-        "cosmic": "cosmic",
         "darwin": "darwin_2",
-        "emacs": "emacs",
         "flakegen": "flakegen",
-        "ghostty": "ghostty",
         "home-manager": "home-manager_3",
-        "hypr-dynamic-cursors": "hypr-dynamic-cursors",
         "hyprland": "hyprland",
         "hyprland-plugins": "hyprland-plugins",
         "hyprpanel": "hyprpanel",
@@ -2546,31 +1754,28 @@
         "hyprswitch": "hyprswitch",
         "impermanence": "impermanence",
         "jovian": "jovian_2",
-        "kirsch": "kirsch",
         "niri": "niri",
         "nix-colors": "nix-colors",
         "nix-index-database": "nix-index-database",
         "nixos-apple-silicon": "nixos-apple-silicon",
         "nixos-facter-modules": "nixos-facter-modules",
-        "nixpkgs": "nixpkgs_19",
-        "nixpkgs-jdk16": "nixpkgs-jdk16",
+        "nixpkgs": "nixpkgs_11",
         "nixvim": "nixvim",
         "snowfall-flake": "snowfall-flake",
         "snowfall-lib": "snowfall-lib_2",
-        "treefmt-nix": "treefmt-nix_4",
+        "treefmt-nix": "treefmt-nix_2",
         "wezterm": "wezterm",
-        "xmonad-contrib": "xmonad-contrib",
         "zen-browser": "zen-browser"
       }
     },
     "rust-analyzer-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1742296961,
-        "narHash": "sha256-gCpvEQOrugHWLimD1wTFOJHagnSEP6VYBDspq96Idu0=",
+        "lastModified": 1745694049,
+        "narHash": "sha256-fxvRYH/tS7hGQeg9zCVh5RBcSWT+JGJet7RA8Ss+rC0=",
         "owner": "rust-lang",
         "repo": "rust-analyzer",
-        "rev": "15d87419f1a123d8f888d608129c3ce3ff8f13d4",
+        "rev": "d8887c0758bbd2d5f752d5bd405d4491e90e7ed6",
         "type": "github"
       },
       "original": {
@@ -2581,27 +1786,6 @@
       }
     },
     "rust-overlay": {
-      "inputs": {
-        "nixpkgs": [
-          "cosmic",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1744599145,
-        "narHash": "sha256-yzaDPkJwZdUtRj/dzdOeB74yryWzpngYaD7BedqFKk8=",
-        "owner": "oxalica",
-        "repo": "rust-overlay",
-        "rev": "fd6795d3d28f956de01a0458b6fa7baae5c793b4",
-        "type": "github"
-      },
-      "original": {
-        "owner": "oxalica",
-        "repo": "rust-overlay",
-        "type": "github"
-      }
-    },
-    "rust-overlay_2": {
       "inputs": {
         "nixpkgs": [
           "hyprswitch",
@@ -2622,7 +1806,7 @@
         "type": "github"
       }
     },
-    "rust-overlay_3": {
+    "rust-overlay_2": {
       "flake": false,
       "locked": {
         "lastModified": 1686795910,
@@ -2638,7 +1822,7 @@
         "type": "github"
       }
     },
-    "rust-overlay_4": {
+    "rust-overlay_3": {
       "inputs": {
         "nixpkgs": [
           "wezterm",
@@ -2661,7 +1845,7 @@
     },
     "snowfall-flake": {
       "inputs": {
-        "flake-compat": "flake-compat_6",
+        "flake-compat": "flake-compat_3",
         "nixpkgs": [
           "nixpkgs"
         ],
@@ -2683,7 +1867,7 @@
     },
     "snowfall-lib": {
       "inputs": {
-        "flake-compat": "flake-compat_7",
+        "flake-compat": "flake-compat_4",
         "flake-utils-plus": "flake-utils-plus",
         "nixpkgs": [
           "snowfall-flake",
@@ -2707,7 +1891,7 @@
     },
     "snowfall-lib_2": {
       "inputs": {
-        "flake-compat": "flake-compat_8",
+        "flake-compat": "flake-compat_5",
         "flake-utils-plus": "flake-utils-plus_2",
         "nixpkgs": [
           "nixpkgs"
@@ -2743,111 +1927,6 @@
         "type": "github"
       }
     },
-    "systems_10": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
-    "systems_11": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
-    "systems_12": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
-    "systems_13": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
-    "systems_14": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
-    "systems_15": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
-    "systems_16": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
     "systems_2": {
       "locked": {
         "lastModified": 1681028828,
@@ -2865,31 +1944,31 @@
     },
     "systems_3": {
       "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "lastModified": 1689347949,
+        "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
         "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "repo": "default-linux",
+        "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
         "type": "github"
       },
       "original": {
         "owner": "nix-systems",
-        "repo": "default",
+        "repo": "default-linux",
         "type": "github"
       }
     },
     "systems_4": {
       "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "lastModified": 1689347949,
+        "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
         "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "repo": "default-linux",
+        "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
         "type": "github"
       },
       "original": {
         "owner": "nix-systems",
-        "repo": "default",
+        "repo": "default-linux",
         "type": "github"
       }
     },
@@ -2910,31 +1989,31 @@
     },
     "systems_6": {
       "locked": {
-        "lastModified": 1689347949,
-        "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
         "owner": "nix-systems",
-        "repo": "default-linux",
-        "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
         "type": "github"
       },
       "original": {
         "owner": "nix-systems",
-        "repo": "default-linux",
+        "repo": "default",
         "type": "github"
       }
     },
     "systems_7": {
       "locked": {
-        "lastModified": 1689347949,
-        "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
         "owner": "nix-systems",
-        "repo": "default-linux",
-        "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
         "type": "github"
       },
       "original": {
         "owner": "nix-systems",
-        "repo": "default-linux",
+        "repo": "default",
         "type": "github"
       }
     },
@@ -2948,8 +2027,9 @@
         "type": "github"
       },
       "original": {
-        "id": "systems",
-        "type": "indirect"
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
       }
     },
     "systems_9": {
@@ -2962,20 +2042,21 @@
         "type": "github"
       },
       "original": {
-        "id": "systems",
-        "type": "indirect"
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
       }
     },
     "treefmt-nix": {
       "inputs": {
-        "nixpkgs": "nixpkgs_6"
+        "nixpkgs": "nixpkgs_15"
       },
       "locked": {
-        "lastModified": 1723454642,
-        "narHash": "sha256-S0Gvsenh0II7EAaoc9158ZB4vYyuycvMGKGxIbERNAM=",
+        "lastModified": 1745848521,
+        "narHash": "sha256-gNrTO3pEjmu3WiuYrUHJrTGCFw9v+qZXCFmX/Vjf5WI=",
         "owner": "numtide",
         "repo": "treefmt-nix",
-        "rev": "349de7bc435bdff37785c2466f054ed1766173be",
+        "rev": "763f1ce0dd12fe44ce6a5c6ea3f159d438571874",
         "type": "github"
       },
       "original": {
@@ -2986,18 +2067,14 @@
     },
     "treefmt-nix_2": {
       "inputs": {
-        "nixpkgs": [
-          "nixvim",
-          "nixvim",
-          "nixpkgs"
-        ]
+        "nixpkgs": "nixpkgs_16"
       },
       "locked": {
-        "lastModified": 1733761991,
-        "narHash": "sha256-s4DalCDepD22jtKL5Nw6f4LP5UwoMcPzPZgHWjAfqbQ=",
+        "lastModified": 1745848521,
+        "narHash": "sha256-gNrTO3pEjmu3WiuYrUHJrTGCFw9v+qZXCFmX/Vjf5WI=",
         "owner": "numtide",
         "repo": "treefmt-nix",
-        "rev": "0ce9d149d99bc383d1f2d85f31f6ebd146e46085",
+        "rev": "763f1ce0dd12fe44ce6a5c6ea3f159d438571874",
         "type": "github"
       },
       "original": {
@@ -3006,75 +2083,23 @@
         "type": "github"
       }
     },
-    "treefmt-nix_3": {
-      "inputs": {
-        "nixpkgs": "nixpkgs_23"
-      },
-      "locked": {
-        "lastModified": 1733761991,
-        "narHash": "sha256-s4DalCDepD22jtKL5Nw6f4LP5UwoMcPzPZgHWjAfqbQ=",
-        "owner": "numtide",
-        "repo": "treefmt-nix",
-        "rev": "0ce9d149d99bc383d1f2d85f31f6ebd146e46085",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "treefmt-nix",
-        "type": "github"
-      }
-    },
-    "treefmt-nix_4": {
-      "inputs": {
-        "nixpkgs": "nixpkgs_24"
-      },
-      "locked": {
-        "lastModified": 1743748085,
-        "narHash": "sha256-uhjnlaVTWo5iD3LXics1rp9gaKgDRQj6660+gbUU3cE=",
-        "owner": "numtide",
-        "repo": "treefmt-nix",
-        "rev": "815e4121d6a5d504c0f96e5be2dd7f871e4fd99d",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "treefmt-nix",
-        "type": "github"
-      }
-    },
-    "unstable": {
-      "locked": {
-        "lastModified": 1744463964,
-        "narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "wezterm": {
       "inputs": {
-        "flake-utils": "flake-utils_9",
+        "flake-utils": "flake-utils_6",
         "freetype2": "freetype2",
         "harfbuzz": "harfbuzz",
         "libpng": "libpng",
-        "nixpkgs": "nixpkgs_25",
-        "rust-overlay": "rust-overlay_4",
+        "nixpkgs": "nixpkgs_17",
+        "rust-overlay": "rust-overlay_3",
         "zlib": "zlib"
       },
       "locked": {
         "dir": "nix",
-        "lastModified": 1744552454,
-        "narHash": "sha256-w4Y0re7P/MREahMzVVxBaGnIE/Jjtwd2RU0aunKkC7U=",
+        "lastModified": 1745557788,
+        "narHash": "sha256-qvdqjJ0WPX0EtXIh2f6WXb+PJb73lpQBJqbVz5Zctr4=",
         "owner": "wez",
         "repo": "wezterm",
-        "rev": "d2df5b755f9ed3f017472bbe66ff1eb762c36e18",
+        "rev": "1439661dc9a8b565a8d9d23aee27d43a9864f676",
         "type": "github"
       },
       "original": {
@@ -3125,48 +2150,6 @@
         "type": "github"
       }
     },
-    "xmonad": {
-      "inputs": {
-        "flake-utils": "flake-utils_11",
-        "git-ignore-nix": "git-ignore-nix_2",
-        "nixpkgs": "nixpkgs_29",
-        "unstable": "unstable"
-      },
-      "locked": {
-        "lastModified": 1744559834,
-        "narHash": "sha256-4AeqylaTW3B+iIab7/JobZruTOU1AgDZ8s+wYaZKQos=",
-        "owner": "xmonad",
-        "repo": "xmonad",
-        "rev": "ebf265a84c6295d4fe15c4a5cf88cb08746f2145",
-        "type": "github"
-      },
-      "original": {
-        "owner": "xmonad",
-        "repo": "xmonad",
-        "type": "github"
-      }
-    },
-    "xmonad-contrib": {
-      "inputs": {
-        "flake-utils": "flake-utils_10",
-        "git-ignore-nix": "git-ignore-nix",
-        "nixpkgs": "nixpkgs_27",
-        "xmonad": "xmonad"
-      },
-      "locked": {
-        "lastModified": 1744559846,
-        "narHash": "sha256-Cq2N2Gokz+TLz+D1TFNtc34z5OxBAuY9qmz2m6hhKpg=",
-        "owner": "xmonad",
-        "repo": "xmonad-contrib",
-        "rev": "4b866210512b90bc532b4cd46dc5171542d0fac8",
-        "type": "github"
-      },
-      "original": {
-        "owner": "xmonad",
-        "repo": "xmonad-contrib",
-        "type": "github"
-      }
-    },
     "xwayland-satellite-stable": {
       "flake": false,
       "locked": {
@@ -3187,11 +2170,11 @@
     "xwayland-satellite-unstable": {
       "flake": false,
       "locked": {
-        "lastModified": 1743346993,
-        "narHash": "sha256-i7rWd/5BcqLgQEtB5L/6gKN5R5GUJcmm34F+iBivH60=",
+        "lastModified": 1745730655,
+        "narHash": "sha256-Tdsw5lD/XM8i1GnQr7ombqnEaCpt/voPs2AbjuYBbjI=",
         "owner": "Supreeeme",
         "repo": "xwayland-satellite",
-        "rev": "45c055696437a08e3989d9b91d9c617b84cc2bc3",
+        "rev": "56a681bfecc5831f41f8eb0ec8c7e96c6b277153",
         "type": "github"
       },
       "original": {
@@ -3202,50 +2185,23 @@
     },
     "zen-browser": {
       "inputs": {
-        "nixpkgs": "nixpkgs_30"
+        "home-manager": "home-manager_4",
+        "nixpkgs": "nixpkgs_18"
       },
       "locked": {
-        "lastModified": 1744430744,
-        "narHash": "sha256-7/iXNbDckcDMRYhaRcI9KhVzgvHXx2SXx5c8Q/DN+v4=",
-        "owner": "youwen5",
+        "lastModified": 1745895947,
+        "narHash": "sha256-dgE+N+ieTuAERL3gwSAqnlnjN2xij7boSdyE+nl+5nY=",
+        "owner": "0xc000022070",
         "repo": "zen-browser-flake",
-        "rev": "d4bfded0b15963d1e3d86f97272b6d2837d05bde",
+        "rev": "24fe35f47d811ceeeeeef2c7849cadd512b4ebd6",
         "type": "github"
       },
       "original": {
-        "owner": "youwen5",
+        "owner": "0xc000022070",
         "repo": "zen-browser-flake",
         "type": "github"
       }
     },
-    "zig": {
-      "inputs": {
-        "flake-compat": [
-          "ghostty"
-        ],
-        "flake-utils": [
-          "ghostty",
-          "flake-utils"
-        ],
-        "nixpkgs": [
-          "ghostty",
-          "nixpkgs-stable"
-        ]
-      },
-      "locked": {
-        "lastModified": 1741825901,
-        "narHash": "sha256-aeopo+aXg5I2IksOPFN79usw7AeimH1+tjfuMzJHFdk=",
-        "owner": "mitchellh",
-        "repo": "zig-overlay",
-        "rev": "0b14285e283f5a747f372fb2931835dd937c4383",
-        "type": "github"
-      },
-      "original": {
-        "owner": "mitchellh",
-        "repo": "zig-overlay",
-        "type": "github"
-      }
-    },
     "zlib": {
       "flake": false,
       "locked": {
@@ -3262,32 +2218,6 @@
         "repo": "zlib",
         "type": "github"
       }
-    },
-    "zon2nix": {
-      "inputs": {
-        "flake-utils": [
-          "ghostty",
-          "flake-utils"
-        ],
-        "nixpkgs": [
-          "ghostty",
-          "nixpkgs-unstable"
-        ]
-      },
-      "locked": {
-        "lastModified": 1742104771,
-        "narHash": "sha256-LhidlyEA9MP8jGe1rEnyjGFCzLLgCdDpYeWggibayr0=",
-        "owner": "jcollie",
-        "repo": "zon2nix",
-        "rev": "56c159be489cc6c0e73c3930bd908ddc6fe89613",
-        "type": "github"
-      },
-      "original": {
-        "owner": "jcollie",
-        "ref": "56c159be489cc6c0e73c3930bd908ddc6fe89613",
-        "repo": "zon2nix",
-        "type": "github"
-      }
     }
   },
   "root": "root",
diff --git a/flake.nix b/flake.nix
index f621e8a..2f167ef 100644
--- a/flake.nix
+++ b/flake.nix
@@ -4,25 +4,15 @@
     agenix.url = "github:ryantm/agenix";
     catppuccin.url = "github:catppuccin/nix";
     chaotic.url = "github:chaotic-cx/nyx/nyxpkgs-unstable";
-    cosmic = {
-      inputs.nixpkgs.follows = "nixpkgs";
-      url = "github:lilyinstarlight/nixos-cosmic";
-    };
     darwin = {
       inputs.nixpkgs.follows = "nixpkgs";
       url = "github:LnL7/nix-darwin/master";
     };
-    emacs.url = "git+https://git.pupbrained.xyz/pupbrained/nixmacs.git";
     flakegen.url = "github:jorsn/flakegen";
-    ghostty.url = "github:ghostty-org/ghostty";
     home-manager = {
       inputs.nixpkgs.follows = "nixpkgs";
       url = "github:nix-community/home-manager";
     };
-    hypr-dynamic-cursors = {
-      inputs.hyprland.follows = "hyprland";
-      url = "github:VirtCode/hypr-dynamic-cursors";
-    };
     hyprland = {
       submodules = true;
       type = "git";
@@ -40,7 +30,6 @@
     hyprswitch.url = "github:h3rmt/hyprswitch/release";
     impermanence.url = "github:nix-community/impermanence";
     jovian.url = "github:Jovian-Experiments/Jovian-NixOS";
-    kirsch.url = "https://flakehub.com/f/molarmanful/kirsch/0.3.0";
     niri = {
       inputs.nixpkgs.follows = "nixpkgs";
       url = "github:sodiboo/niri-flake";
@@ -53,7 +42,6 @@
     nixos-apple-silicon.url = "github:tpwrules/nixos-apple-silicon";
     nixos-facter-modules.url = "github:numtide/nixos-facter-modules";
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
-    nixpkgs-jdk16.url = "github:NixOS/nixpkgs/0e713aed46a8a43f6b6cc31c98c017a10dcf8810";
     nixvim.url = "github:pupbrained/nvim-config";
     snowfall-flake = {
       inputs.nixpkgs.follows = "nixpkgs";
@@ -65,8 +53,7 @@
     };
     treefmt-nix.url = "github:numtide/treefmt-nix";
     wezterm.url = "github:wez/wezterm?dir=nix";
-    xmonad-contrib.url = "github:xmonad/xmonad-contrib";
-    zen-browser.url = "github:youwen5/zen-browser-flake";
+    zen-browser.url = "github:0xc000022070/zen-browser-flake";
   };
   outputs = inputs: inputs.flakegen ./flake.in.nix inputs;
 }
diff --git a/homes/x86_64-linux/marshall@navis/default.nix b/homes/x86_64-linux/marshall@navis/default.nix
index f41f947..13f7033 100644
--- a/homes/x86_64-linux/marshall@navis/default.nix
+++ b/homes/x86_64-linux/marshall@navis/default.nix
@@ -1,24 +1,12 @@
 {
-  lib,
   pkgs,
   inputs,
   ...
 }: let
-  nixpkgs-jdk16 = import inputs.nixpkgs-jdk16 {
-    inherit (pkgs) system;
-
-    config = {
-      permittedInsecurePackages = [
-        "temurin-bin-16.0.2"
-      ];
-    };
-  };
-
   additionalJDKs = with pkgs; [
     temurin-bin-23
     temurin-bin-21
     temurin-bin-17
-    nixpkgs-jdk16.temurin-bin-16
     temurin-bin-8
   ];
 in {
@@ -28,6 +16,7 @@ in {
     hyprland.homeManagerModules.default
     nix-colors.homeManagerModules.default
     nix-index-database.hmModules.nix-index
+    zen-browser.homeModules.twilight
 
     ./hyprland
   ];
@@ -55,43 +44,20 @@ in {
 
     packages = with pkgs;
       [
-        alacritty
-        fuzzel
         alejandra
-        beeper
         bitwarden-desktop
-        (discord.override {withVencord = true;})
         duf
-        eternal-terminal
-        ((pkgs.emacsPackagesFor pkgs.emacs30-pgtk).emacsWithPackages (epkgs:
-          builtins.attrValues {
-            inherit (epkgs.treesit-grammars) with-all-grammars;
-          }))
-        emacs-lsp-booster
         equibop
-        firefox
         glow
         grc
         killall
         libnotify
         lm_sensors
         loupe
-        #mullvad-vpn
         nodejs
         playerctl
         prismlauncher
         ryujinx-greemdev
-        (python312.withPackages
-          (p:
-            with p; [
-              epc
-              orjson
-              sexpdata
-              six
-              setuptools
-              paramiko
-              rapidfuzz
-            ]))
         telegram-desktop
       ]
       ++ (with jetbrains; [
@@ -101,9 +67,7 @@ in {
       ++ (with inputs; [
         chaotic.packages.${pkgs.system}.distrobox_git
         chaotic.packages.${pkgs.system}.zed-editor_git
-        ghostty.packages.${pkgs.system}.default
         nixvim.packages.${pkgs.system}.default
-        zen-browser.packages.${pkgs.system}.default
       ]);
 
     stateVersion = "24.05";
@@ -120,9 +84,18 @@ in {
 
   catppuccin = {
     enable = true;
-    pointerCursor.enable = true;
     flavor = "mocha";
     accent = "green";
+
+    bat.enable = true;
+    btop.enable = true;
+    cursors.enable = true;
+    fzf.enable = true;
+    kvantum.enable = true;
+    mpv.enable = true;
+    rio.enable = true;
+    rofi.enable = true;
+    starship.enable = true;
   };
 
   gtk = let
@@ -171,15 +144,9 @@ in {
     enable = true;
     platformTheme.name = "kvantum";
     style.name = "kvantum";
-    style.catppuccin.enable = true;
   };
 
   programs = {
-    rio = {
-      enable = true;
-
-      catppuccin.enable = true;
-    };
     xmobar.enable = true;
 
     wezterm.extraConfig = builtins.readFile ./wezterm.lua;
@@ -197,54 +164,16 @@ in {
     mpv = {
       enable = true;
       scripts = [pkgs.mpvScripts.uosc];
-      catppuccin.enable = true;
-    };
-  };
-
-  services = {
-    picom = {
-      enable = false;
-      backend = "glx";
-      fadeDelta = 5;
-      fade = true;
-      shadow = true;
-      vSync = true;
-
-      shadowExclude = [
-        "class_g = 'firefox' && argb"
-        "class_g *?= 'slop'"
-      ];
-
-      settings = {
-        corner-radius = 10;
-
-        blur-background-exclude = [
-          "class_g = 'slop'"
-        ];
-
-        rounded-corners-exclude = [
-          "window_type = 'dock'"
-          "window_type = 'desktop'"
-        ];
-
-        blur = {
-          method = "gaussian";
-          size = 10;
-          deviation = 5.0;
-        };
-      };
     };
 
-    dunst = {
-      enable = false;
-      settings.global = {
-        corner_radius = 10;
-        offset = "18x53";
-        frame_width = 2;
-        font = "SN Pro 12";
-        frame_color = lib.mkForce "#a6e3a1";
+    zen-browser = {
+      enable = true;
+      nativeMessagingHosts = [pkgs.firefoxpwa];
+
+      policies = {
+        DisableAppUpdate = true;
+        DisableTelemetry = true;
       };
-      catppuccin.enable = true;
     };
   };
 
diff --git a/homes/x86_64-linux/marshall@navis/hyprland/rofi.nix b/homes/x86_64-linux/marshall@navis/hyprland/rofi.nix
index 7d86723..8c03434 100644
--- a/homes/x86_64-linux/marshall@navis/hyprland/rofi.nix
+++ b/homes/x86_64-linux/marshall@navis/hyprland/rofi.nix
@@ -1,7 +1,6 @@
 {pkgs, ...}: {
   programs.rofi = {
     enable = true;
-    catppuccin.enable = true;
     package = pkgs.rofi-wayland;
 
     extraConfig = {
diff --git a/modules/home/shell/default.nix b/modules/home/shell/default.nix
index dd40e57..e1b750d 100644
--- a/modules/home/shell/default.nix
+++ b/modules/home/shell/default.nix
@@ -7,6 +7,8 @@
   ];
 
   programs = {
+    bat.enable = true;
+    btop.enable = true;
     fd.enable = true;
     git-cliff.enable = true;
     jq.enable = true;
@@ -23,16 +25,6 @@
       };
     };
 
-    bat = {
-      enable = true;
-      catppuccin.enable = true;
-    };
-
-    btop = {
-      enable = true;
-      catppuccin.enable = true;
-    };
-
     direnv = {
       enable = true;
       nix-direnv.enable = true;
@@ -46,7 +38,6 @@
 
     fzf = {
       enable = true;
-      catppuccin.enable = true;
       colors = with lib; {
         bg = mkForce "-1";
         "bg+" = mkForce "-1";
diff --git a/modules/home/shell/fish.nix b/modules/home/shell/fish.nix
index 487bc50..cf71a59 100644
--- a/modules/home/shell/fish.nix
+++ b/modules/home/shell/fish.nix
@@ -1,13 +1,15 @@
 {pkgs, ...}:
 with pkgs; {
   programs = {
+    starship.enable = true;
+
     fish = let
       mkFishPlugin = sources: {
         inherit (sources) src;
         name = sources.pname;
       };
 
-      sources = import ../../../_sources/generated.nix {inherit (pkgs) fetchurl fetchFromGitHub;};
+      sources = import ../../../_sources/generated.nix {inherit (pkgs) fetchFromGitHub;};
 
       extraPlugins = lib.attrsets.mapAttrsToList (_: value: mkFishPlugin value) sources;
 
@@ -41,10 +43,5 @@ with pkgs; {
         fish_add_path /Users/marshall/.nix-profile/bin
       '';
     };
-
-    starship = {
-      enable = true;
-      catppuccin.enable = true;
-    };
   };
 }
diff --git a/modules/home/vscode/default.nix b/modules/home/vscode/default.nix
index b19f7fc..8a7e0d3 100644
--- a/modules/home/vscode/default.nix
+++ b/modules/home/vscode/default.nix
@@ -6,53 +6,54 @@
       then pkgs.vscode
       else pkgs.vscode.fhsWithPackages (ps: with ps; [rustup zlib openssl.dev pkg-config]);
 
-    extensions = with pkgs.vscode-extensions; [
-      bbenoist.nix
-      llvm-vs-code-extensions.vscode-clangd
-      kamadorueda.alejandra
-      mkhl.direnv
-      usernamehw.errorlens
-      #vadimcn.vscode-lldb
-      vscodevim.vim
-    ];
-
-    userSettings = {
-      "files.autoSave" = "afterDelay";
-
-      "editor.fontFamily" = "Maple Mono NF";
-      "editor.fontLigatures" = true;
-      "editor.fontSize" = 14;
-      "editor.formatOnSave" = true;
-      "editor.minimap.enabled" = false;
-
-      "git.autofetch" = true;
-      "git.confirmSync" = false;
-      "git.enableSmartCommit" = true;
-
-      "vim.camelCaseMotion.enable" = true;
-      "vim.smartRelativeLine" = false;
-      "vim.sneak" = true;
-      "vim.useSystemClipboard" = true;
-      "vim.normalModeKeyBindingsNonRecursive" = [
-        {
-          before = ["K"];
-          commands = ["editor.action.showHover"];
-          silent = true;
-        }
+    profiles.default = {
+      extensions = with pkgs.vscode-extensions; [
+        bbenoist.nix
+        llvm-vs-code-extensions.vscode-clangd
+        kamadorueda.alejandra
+        mkhl.direnv
+        usernamehw.errorlens
+        vscodevim.vim
       ];
 
-      "mesonbuild.downloadLanguageServer" = true;
+      userSettings = {
+        "files.autoSave" = "afterDelay";
 
-      "terminal.integrated.fontSize" =
-        if pkgs.hostPlatform.isDarwin
-        then 14
-        else 16;
+        "editor.fontFamily" = "Maple Mono NF";
+        "editor.fontLigatures" = true;
+        "editor.fontSize" = 14;
+        "editor.formatOnSave" = true;
+        "editor.minimap.enabled" = false;
 
-      "workbench.colorTheme" = "Catppuccin Mocha";
-      "workbench.iconTheme" = "catppuccin-mocha";
+        "git.autofetch" = true;
+        "git.confirmSync" = false;
+        "git.enableSmartCommit" = true;
 
-      "window.menuBarVisibility" = "toggle";
-      "window.titleBarStyle" = "custom";
+        "vim.camelCaseMotion.enable" = true;
+        "vim.smartRelativeLine" = false;
+        "vim.sneak" = true;
+        "vim.useSystemClipboard" = true;
+        "vim.normalModeKeyBindingsNonRecursive" = [
+          {
+            before = ["K"];
+            commands = ["editor.action.showHover"];
+            silent = true;
+          }
+        ];
+
+        "mesonbuild.downloadLanguageServer" = true;
+
+        "terminal.integrated.fontSize" =
+          if pkgs.hostPlatform.isDarwin
+          then 14
+          else 16;
+
+        "workbench.colorTheme" = "Catppuccin Mocha";
+        "workbench.iconTheme" = "catppuccin-mocha";
+
+        "window.menuBarVisibility" = "toggle";
+        "window.titleBarStyle" = "custom";
+      };
     };
   };
 }
diff --git a/nvfetcher.toml b/nvfetcher.toml
index 824e3a4..168b9c6 100644
--- a/nvfetcher.toml
+++ b/nvfetcher.toml
@@ -21,19 +21,3 @@ fetch.github = "oh-my-fish/plugin-gityaw"
 [bang-bang]
 src.git = "https://github.com/oh-my-fish/plugin-bang-bang"
 fetch.github = "oh-my-fish/plugin-bang-bang"
-
-[fix-window-role]
-src.manual = "latest"
-fetch.url = "https://raw.githubusercontent.com/d12frosted/homebrew-emacs-plus/master/patches/emacs-28/fix-window-role.patch"
-
-[round-undecorated-frame]
-src.manual = "latest"
-fetch.url = "https://raw.githubusercontent.com/d12frosted/homebrew-emacs-plus/master/patches/emacs-30/round-undecorated-frame.patch"
-
-[system-appearance]
-src.manual = "latest"
-fetch.url = "https://raw.githubusercontent.com/d12frosted/homebrew-emacs-plus/master/patches/emacs-30/system-appearance.patch"
-
-[sddm-theme-minesddm]
-src.git = "https://github.com/Davi-S/sddm-theme-minesddm"
-fetch.github = "Davi-S/sddm-theme-minesddm"
diff --git a/systems/aarch64-darwin/canis/default.nix b/systems/aarch64-darwin/canis/default.nix
index 2b4a511..60f9a9d 100644
--- a/systems/aarch64-darwin/canis/default.nix
+++ b/systems/aarch64-darwin/canis/default.nix
@@ -4,7 +4,7 @@
   lib,
   ...
 }: {
-  environment.variables.FLAKE = "/Users/marshall/nix-config";
+  environment.variables.NH_FLAKE = "/Users/marshall/nix-config";
 
   fonts.packages = with pkgs; ([
       font-awesome
diff --git a/systems/x86_64-linux/navis/default.nix b/systems/x86_64-linux/navis/default.nix
index 7a30baa..fbb97e6 100644
--- a/systems/x86_64-linux/navis/default.nix
+++ b/systems/x86_64-linux/navis/default.nix
@@ -5,6 +5,8 @@
   lib,
   ...
 }: {
+  catppuccin.tty.enable = true;
+
   facter.reportPath = ./facter.json;
 
   fileSystems = {
@@ -119,116 +121,29 @@
 
   fonts = {
     packages = with pkgs;
-      [
-        ibm-plex
-        inputs.kirsch.packages.${system}.kirsch-nerd
-        recursive
-      ]
+      [maple-mono.NF]
       ++ (with nerd-fonts; [
-        _0xproto
-        _3270
-        agave
-        anonymice
-        arimo
-        aurulent-sans-mono
-        bigblue-terminal
-        bitstream-vera-sans-mono
-        blex-mono
-        caskaydia-cove
-        caskaydia-mono
-        code-new-roman
         comic-shanns-mono
-        commit-mono
-        cousine
-        d2coding
-        daddy-time-mono
-        dejavu-sans-mono
-        departure-mono
-        droid-sans-mono
-        envy-code-r
-        fantasque-sans-mono
         fira-code
-        fira-mono
-        geist-mono
-        go-mono
-        gohufont
-        hack
-        hasklug
-        heavy-data
-        hurmit
-        im-writing
-        inconsolata
-        inconsolata-go
-        inconsolata-lgc
-        intone-mono
         iosevka
-        iosevka-term
-        iosevka-term-slab
         jetbrains-mono
-        lekton
-        liberation
-        lilex
-        martian-mono
-        meslo-lg
-        monaspace
-        monofur
-        monoid
-        mononoki
-        mplus
-        noto
-        open-dyslexic
-        overpass
-        profont
-        proggy-clean-tt
         recursive-mono
-        roboto-mono
-        sauce-code-pro
-        shure-tech-mono
-        space-mono
         symbols-only
-        terminess-ttf
-        tinos
-        ubuntu
         ubuntu-mono
-        ubuntu-sans
-        victor-mono
         zed-mono
-      ])
-      ++ (with iosevka-comfy; [
-        comfy
-        comfy-duo
-        comfy-fixed
-        comfy-motion
-        comfy-motion-duo
-        comfy-motion-fixed
-        comfy-wide
-        comfy-wide-duo
-        comfy-wide-fixed
-        comfy-wide-motion
-        comfy-wide-motion-duo
-        comfy-wide-motion-fixed
       ]);
-
-    fontconfig = {
-      hinting.enable = true;
-      subpixel.lcdfilter = "none";
-    };
   };
 
-  console.catppuccin.enable = true;
-
   systemd = {
     tpm2.enable = true;
 
-    user.extraConfig = let
-      path = lib.concatStringsSep ":" [
+    user.extraConfig = ''
+      DefaultEnvironment="PATH=${lib.concatStringsSep ":" [
         "/run/wrappers/bin"
         "/etc/profiles/per-user/%u/bin"
         "/nix/var/nix/profiles/default/bin"
         "/run/current-system/sw/bin"
-      ];
-    in ''
-      DefaultEnvironment="PATH=${path}"
+      ]}"
     '';
   };
 
@@ -239,7 +154,6 @@
 
   virtualisation = {
     spiceUSBRedirection.enable = true;
-    waydroid.enable = true;
 
     podman = {
       enable = true;
@@ -250,33 +164,25 @@
 
   environment = {
     sessionVariables = {
-      COSMIC_DATA_CONTROL_ENABLED = 1;
       BROWSER = "zen";
+      COSMIC_DATA_CONTROL_ENABLED = 1;
       DIRENV_WARN_TIMEOUT = "100s";
       EDITOR = "nvim";
+      NH_FLAKE = "/home/marshall/nix-config";
       NIXOS_OZONE_WL = 1;
       TERMINAL = "wezterm";
     };
 
     systemPackages = with pkgs; [
+      config.boot.kernelPackages.perf
       ddccontrol-db
       inputs.agenix.packages.${system}.default
-      looking-glass-client
-      nautilus
-      qemu
-      snowfallorg.flake
-      sound-theme-freedesktop
-      uutils-coreutils-noprefix
-      tpm2-tss
-      virtio-win
-      (warp-terminal.override {waylandSupport = true;})
-      winetricks
-      wineWowPackages.staging
-      xclip
-      yt-dlp
       inputs.hyprswitch.packages.${system}.hyprswitch
-
-      (callPackage ./pkgs/sddm-theme-minesddm.nix {})
+      nautilus
+      sound-theme-freedesktop
+      tpm2-tss
+      uutils-coreutils-noprefix
+      xclip
     ];
 
     persistence."/persist" = {
@@ -296,21 +202,22 @@
   };
 
   boot = {
+    kernelPackages = pkgs.linuxPackages_cachyos;
+    tmp.useTmpfs = true;
+
     blacklistedKernelModules = [
       "nouveau"
       "i915"
     ];
-    kernelPackages = pkgs.linuxPackages_cachyos;
+
     supportedFilesystems = [
       "btrfs"
       "ntfs"
     ];
-    tmp.useTmpfs = true;
 
     initrd = {
       availableKernelModules = ["tpm_tis"];
 
-      # Encrypted device
       luks.devices."enc" = {
         device = "/dev/disk/by-uuid/9952fcd1-46eb-4c9c-ab7d-361d31fdb9a2";
         crypttabExtraOpts = ["tpm2-device=auto" "tpm2-measure-pcr=yes"];
@@ -319,12 +226,12 @@
       systemd = {
         enable = true;
         emergencyAccess = true;
-        enableTpm2 = true;
+        tpm2.enable = true;
 
         services.wipe-root = {
           description = "Rollback BTRFS root subvolume to a pristine state";
           wantedBy = ["initrd.target"];
-          after = ["dev-mapper-enc.device"]; # LUKS process
+          after = ["dev-mapper-enc.device"];
           requires = ["dev-mapper-enc.device"];
           before = ["sysroot.mount"];
           unitConfig.DefaultDependencies = "no";
@@ -408,8 +315,14 @@
       keep-going = true;
       log-lines = 30;
       max-jobs = "auto";
+      max-free = "${toString (10 * 1024 * 1024 * 1024)}";
+      min-free = "${toString (5 * 1024 * 1024 * 1024)}";
       sandbox-fallback = false;
       sandbox = true;
+      use-cgroups = true;
+      use-xdg-base-directories = true;
+      warn-dirty = false;
+
       system-features = [
         "nixos-test"
         "kvm"
@@ -417,24 +330,19 @@
         "big-parallel"
         "gccarch-x86-64-v4"
       ];
-      use-cgroups = true;
-      use-xdg-base-directories = true;
-      warn-dirty = false;
 
       allowed-users = [
         "root"
         "@wheel"
         "nix-builder"
       ];
+
       trusted-users = [
         "root"
         "@wheel"
         "nix-builder"
       ];
 
-      min-free = "${toString (5 * 1024 * 1024 * 1024)}";
-      max-free = "${toString (10 * 1024 * 1024 * 1024)}";
-
       extra-experimental-features = [
         "flakes" # flakes
         "nix-command" # experimental nix commands
@@ -446,16 +354,12 @@
 
       substituters = [
         "https://cache.nixos.org?priority=100"
-        #"https://cosmic.cachix.org/"
-        #"https://cuda-maintainers.cachix.org"
         "https://hyprland.cachix.org"
         "https://nix-community.cachix.org"
       ];
 
       trusted-public-keys = [
         "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
-        #"cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE="
-        # "cuda-maintainers.cachix.org-1:0dq3bujKpuEPMCX6U4WylrUDZ9JyUG0VpVZa7CNfq5E="
         "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
         "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
       ];
@@ -485,9 +389,7 @@
 
     nix-ld = {
       enable = true;
-      libraries = with pkgs; [
-        libGL
-      ];
+      libraries = [pkgs.libGL];
     };
 
     obs-studio = {
@@ -497,9 +399,7 @@
 
     steam = {
       enable = true;
-      extraCompatPackages = with inputs; [
-        chaotic.packages.${pkgs.system}.proton-ge-custom
-      ];
+      extraCompatPackages = [inputs.chaotic.packages.${pkgs.system}.proton-ge-custom];
     };
   };
 
@@ -524,7 +424,6 @@
     flatpak.enable = true;
     getty.autologinUser = "marshall";
     gnome.gnome-keyring.enable = true;
-    #mullvad-vpn.enable = true;
     openssh.enable = true;
     spice-vdagentd.enable = true;
     udisks2.enable = true;
@@ -534,16 +433,6 @@
       fileSystems = ["/dev/mapper/enc"];
     };
 
-    displayManager.sddm = {
-      enable = false;
-      wayland.enable = true;
-      wayland.compositor = "kwin";
-      theme = "minesddm";
-    };
-
-    displayManager.cosmic-greeter.enable = false;
-    desktopManager.cosmic.enable = false;
-
     libinput = {
       enable = true;
       touchpad.naturalScrolling = true;
@@ -552,16 +441,6 @@
     xserver = {
       enable = true;
       videoDrivers = ["nvidia"];
-
-      windowManager.xmonad = {
-        enable = false;
-        enableContribAndExtras = true;
-        enableConfiguredRecompile = true;
-        flake = {
-          enable = true;
-          compiler = "ghc982";
-        };
-      };
     };
 
     pipewire = {
@@ -601,6 +480,7 @@
   hardware = {
     bluetooth.enable = true;
     i2c.enable = true;
+    nvidia-container-toolkit.enable = true;
 
     graphics = {
       enable = true;
@@ -611,8 +491,6 @@
       ];
     };
 
-    nvidia-container-toolkit.enable = true;
-
     nvidia = {
       package = config.boot.kernelPackages.nvidiaPackages.beta;
       modesetting.enable = true;
@@ -624,7 +502,6 @@
   xdg.portal = {
     enable = true;
     xdgOpenUsePortal = true;
-
     config.common.default = "*";
 
     extraPortals = [
diff --git a/systems/x86_64-linux/navis/facter.json b/systems/x86_64-linux/navis/facter.json
index 61ea643..fb7a9c6 100644
--- a/systems/x86_64-linux/navis/facter.json
+++ b/systems/x86_64-linux/navis/facter.json
@@ -23,8 +23,8 @@
     },
     "bluetooth": [
       {
-        "index": 53,
-        "attached_to": 52,
+        "index": 54,
+        "attached_to": 53,
         "class_list": [
           "usb",
           "bluetooth"
@@ -102,8 +102,8 @@
         "module_alias": "usb:v8087p0032d0000dcE0dsc01dp01icE0isc01ip01in00"
       },
       {
-        "index": 67,
-        "attached_to": 52,
+        "index": 68,
+        "attached_to": 53,
         "class_list": [
           "usb",
           "bluetooth"
@@ -691,8 +691,8 @@
     ],
     "camera": [
       {
-        "index": 47,
-        "attached_to": 52,
+        "index": 49,
+        "attached_to": 53,
         "class_list": [
           "camera",
           "usb"
@@ -792,8 +792,8 @@
         "module_alias": "usb:v322Ep202Cd0103dcEFdsc02dp01ic0Eisc01ip00in00"
       },
       {
-        "index": 59,
-        "attached_to": 52,
+        "index": 60,
+        "attached_to": 53,
         "class_list": [
           "camera",
           "usb"
@@ -897,6 +897,7 @@
       {
         "architecture": "x86_64",
         "vendor_name": "GenuineIntel",
+        "model_name": "11th Gen Intel(R) Core(TM) i5-11260H @ 2.60GHz",
         "family": 6,
         "model": 141,
         "stepping": 1,
@@ -1057,115 +1058,30 @@
           "gds",
           "bhi"
         ],
+        "power_management": [
+          ""
+        ],
         "bogo": 5222.4,
         "cache": 12288,
         "units": 16,
         "physical_id": 0,
         "siblings": 12,
         "cores": 6,
-        "fpu": true,
-        "fpu_exception": true,
+        "fpu": false,
+        "fpu_exception": false,
         "cpuid_level": 27,
         "write_protect": false,
         "clflush_size": 64,
         "cache_alignment": 64,
         "address_sizes": {
-          "physical": 39,
-          "virtual": 48
+          "physical": "0x27",
+          "virtual": "0x30"
         }
       }
     ],
     "disk": [
       {
         "index": 42,
-        "attached_to": 21,
-        "class_list": [
-          "disk",
-          "block_device",
-          "nvme"
-        ],
-        "bus_type": {
-          "hex": "0096",
-          "name": "NVME",
-          "value": 150
-        },
-        "slot": {
-          "bus": 0,
-          "number": 0
-        },
-        "base_class": {
-          "hex": "0106",
-          "name": "Mass Storage Device",
-          "value": 262
-        },
-        "sub_class": {
-          "hex": "0000",
-          "name": "Disk",
-          "value": 0
-        },
-        "vendor": {
-          "hex": "1c5c",
-          "value": 7260
-        },
-        "sub_vendor": {
-          "hex": "1c5c",
-          "value": 7260
-        },
-        "device": {
-          "hex": "174a",
-          "name": "HFM512GD3JX013N",
-          "value": 5962
-        },
-        "sub_device": {
-          "hex": "174a",
-          "value": 5962
-        },
-        "serial": "FYA7N020713207841",
-        "model": "HFM512GD3JX013N",
-        "sysfs_id": "/class/block/nvme0n1",
-        "sysfs_bus_id": "nvme0",
-        "sysfs_device_link": "/devices/pci0000:00/0000:00:06.0/0000:02:00.0/nvme/nvme0",
-        "unix_device_name": "/dev/nvme0n1",
-        "unix_device_number": {
-          "type": 98,
-          "major": 259,
-          "minor": 5,
-          "range": 0
-        },
-        "unix_device_names": [
-          "/dev/disk/by-id/nvme-HFM512GD3JX013N_FYA7N020713207841",
-          "/dev/disk/by-id/nvme-HFM512GD3JX013N_FYA7N020713207841_1",
-          "/dev/disk/by-id/nvme-nvme.1c5c-465941374e303230373133323037383431-48464d3531324744334a583031334e-00000001",
-          "/dev/disk/by-path/pci-0000:02:00.0-nvme-1",
-          "/dev/nvme0n1"
-        ],
-        "resources": [
-          {
-            "type": "disk_geo",
-            "cylinders": 488386,
-            "heads": 64,
-            "sectors": 32,
-            "size": 0,
-            "geo_type": "logical"
-          },
-          {
-            "type": "size",
-            "unit": "sectors",
-            "value_1": 1000215216,
-            "value_2": 512
-          }
-        ],
-        "driver": "nvme",
-        "driver_module": "nvme",
-        "drivers": [
-          "nvme"
-        ],
-        "driver_modules": [
-          "nvme"
-        ]
-      },
-      {
-        "index": 43,
         "attached_to": 16,
         "class_list": [
           "disk",
@@ -1179,7 +1095,7 @@
         },
         "slot": {
           "bus": 0,
-          "number": 1
+          "number": 0
         },
         "base_class": {
           "hex": "0106",
@@ -1210,10 +1126,10 @@
         },
         "serial": "S6S1NG0RA02239Z",
         "model": "Samsung SSD 970 EVO Plus 1TB",
-        "sysfs_id": "/class/block/nvme1n1",
-        "sysfs_bus_id": "nvme1",
-        "sysfs_device_link": "/devices/pci0000:00/0000:00:1b.0/0000:03:00.0/nvme/nvme1",
-        "unix_device_name": "/dev/nvme1n1",
+        "sysfs_id": "/class/block/nvme0n1",
+        "sysfs_bus_id": "nvme0",
+        "sysfs_device_link": "/devices/pci0000:00/0000:00:1b.0/0000:03:00.0/nvme/nvme0",
+        "unix_device_name": "/dev/nvme0n1",
         "unix_device_number": {
           "type": 98,
           "major": 259,
@@ -1227,7 +1143,7 @@
           "/dev/disk/by-label/zroot",
           "/dev/disk/by-path/pci-0000:03:00.0-nvme-1",
           "/dev/disk/by-uuid/386691993166713955",
-          "/dev/nvme1n1"
+          "/dev/nvme0n1"
         ],
         "resources": [
           {
@@ -1235,7 +1151,7 @@
             "cylinders": 953869,
             "heads": 64,
             "sectors": 32,
-            "size": 0,
+            "size": "0x0",
             "geo_type": "logical"
           },
           {
@@ -1254,8 +1170,199 @@
           "nvme"
         ]
       },
+      {
+        "index": 43,
+        "attached_to": 21,
+        "class_list": [
+          "disk",
+          "block_device",
+          "nvme"
+        ],
+        "bus_type": {
+          "hex": "0096",
+          "name": "NVME",
+          "value": 150
+        },
+        "slot": {
+          "bus": 0,
+          "number": 1
+        },
+        "base_class": {
+          "hex": "0106",
+          "name": "Mass Storage Device",
+          "value": 262
+        },
+        "sub_class": {
+          "hex": "0000",
+          "name": "Disk",
+          "value": 0
+        },
+        "vendor": {
+          "hex": "1c5c",
+          "value": 7260
+        },
+        "sub_vendor": {
+          "hex": "1c5c",
+          "value": 7260
+        },
+        "device": {
+          "hex": "174a",
+          "name": "HFM512GD3JX013N",
+          "value": 5962
+        },
+        "sub_device": {
+          "hex": "174a",
+          "value": 5962
+        },
+        "serial": "FYA7N020713207841",
+        "model": "HFM512GD3JX013N",
+        "sysfs_id": "/class/block/nvme1n1",
+        "sysfs_bus_id": "nvme1",
+        "sysfs_device_link": "/devices/pci0000:00/0000:00:06.0/0000:02:00.0/nvme/nvme1",
+        "unix_device_name": "/dev/nvme1n1",
+        "unix_device_number": {
+          "type": 98,
+          "major": 259,
+          "minor": 4,
+          "range": 0
+        },
+        "unix_device_names": [
+          "/dev/disk/by-id/nvme-HFM512GD3JX013N_FYA7N020713207841",
+          "/dev/disk/by-id/nvme-HFM512GD3JX013N_FYA7N020713207841_1",
+          "/dev/disk/by-id/nvme-nvme.1c5c-465941374e303230373133323037383431-48464d3531324744334a583031334e-00000001",
+          "/dev/disk/by-path/pci-0000:02:00.0-nvme-1",
+          "/dev/nvme1n1"
+        ],
+        "resources": [
+          {
+            "type": "disk_geo",
+            "cylinders": 488386,
+            "heads": 64,
+            "sectors": 32,
+            "size": "0x0",
+            "geo_type": "logical"
+          },
+          {
+            "type": "size",
+            "unit": "sectors",
+            "value_1": 1000215216,
+            "value_2": 512
+          }
+        ],
+        "driver": "nvme",
+        "driver_module": "nvme",
+        "drivers": [
+          "nvme"
+        ],
+        "driver_modules": [
+          "nvme"
+        ]
+      },
       {
         "index": 44,
+        "attached_to": 38,
+        "class_list": [
+          "disk",
+          "usb",
+          "scsi",
+          "block_device"
+        ],
+        "bus_type": {
+          "hex": "0084",
+          "name": "SCSI",
+          "value": 132
+        },
+        "slot": {
+          "bus": 0,
+          "number": 0
+        },
+        "base_class": {
+          "hex": "0106",
+          "name": "Mass Storage Device",
+          "value": 262
+        },
+        "sub_class": {
+          "hex": "0000",
+          "name": "Disk",
+          "value": 0
+        },
+        "vendor": {
+          "hex": "0781",
+          "name": "SanDisk",
+          "value": 1921
+        },
+        "device": {
+          "hex": "5567",
+          "name": "Cruzer Blade",
+          "value": 21863
+        },
+        "revision": {
+          "hex": "0000",
+          "name": "1.00",
+          "value": 0
+        },
+        "serial": "200517381109CB505BA2",
+        "model": "SanDisk Cruzer Blade",
+        "sysfs_id": "/class/block/sda",
+        "sysfs_bus_id": "0:0:0:0",
+        "sysfs_device_link": "/devices/pci0000:00/0000:00:14.0/usb3/3-3/3-3.4/3-3.4:1.0/host0/target0:0:0/0:0:0:0",
+        "unix_device_name": "/dev/sda",
+        "unix_device_number": {
+          "type": 98,
+          "major": 8,
+          "minor": 0,
+          "range": 16
+        },
+        "unix_device_names": [
+          "/dev/disk/by-id/usb-SanDisk_Cruzer_Blade_200517381109CB505BA2-0:0",
+          "/dev/disk/by-path/pci-0000:00:14.0-usb-0:3.4:1.0-scsi-0:0:0:0",
+          "/dev/disk/by-path/pci-0000:00:14.0-usbv2-0:3.4:1.0-scsi-0:0:0:0",
+          "/dev/sda"
+        ],
+        "unix_device_name2": "/dev/sg0",
+        "unix_device_number2": {
+          "type": 99,
+          "major": 21,
+          "minor": 0,
+          "range": 1
+        },
+        "resources": [
+          {
+            "type": "baud",
+            "speed": 480000000,
+            "bits": 0,
+            "stop_bits": 0,
+            "parity": 0,
+            "handshake": 0
+          },
+          {
+            "type": "disk_geo",
+            "cylinders": 30024,
+            "heads": 64,
+            "sectors": 32,
+            "size": "0x0",
+            "geo_type": "logical"
+          },
+          {
+            "type": "size",
+            "unit": "sectors",
+            "value_1": 61489152,
+            "value_2": 512
+          }
+        ],
+        "driver": "usb-storage",
+        "driver_module": "usb_storage",
+        "drivers": [
+          "sd",
+          "usb-storage"
+        ],
+        "driver_modules": [
+          "usb_storage"
+        ],
+        "module_alias": "usb:v0781p5567d0100dc00dsc00dp00ic08isc06ip50in00"
+      },
+      {
+        "index": 45,
         "attached_to": 0,
         "class_list": [
           "disk",
@@ -1282,7 +1389,7 @@
         },
         "unix_device_names": [
           "/dev/disk/by-label/zram0",
-          "/dev/disk/by-uuid/eb21fee5-5b3d-4abc-b3a3-31ee35527094",
+          "/dev/disk/by-uuid/6cdf4234-54a4-41f9-b79d-0cac8a068954",
           "/dev/zram0"
         ],
         "resources": [
@@ -1526,8 +1633,8 @@
     ],
     "hub": [
       {
-        "index": 46,
-        "attached_to": 52,
+        "index": 48,
+        "attached_to": 53,
         "class_list": [
           "usb",
           "hub"
@@ -1607,7 +1714,7 @@
         "module_alias": "usb:v214Bp7250d0100dc09dsc00dp01ic09isc00ip00in00"
       },
       {
-        "index": 52,
+        "index": 53,
         "attached_to": 38,
         "class_list": [
           "usb",
@@ -1629,7 +1736,7 @@
         },
         "vendor": {
           "hex": "1d6b",
-          "name": "Linux 6.14.0-cachyos xhci-hcd",
+          "name": "Linux 6.14.3-cachyos xhci-hcd",
           "value": 7531
         },
         "device": {
@@ -1643,7 +1750,7 @@
           "value": 0
         },
         "serial": "0000:00:14.0",
-        "model": "Linux 6.14.0-cachyos xhci-hcd xHCI Host Controller",
+        "model": "Linux 6.14.3-cachyos xhci-hcd xHCI Host Controller",
         "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb3/3-0:1.0",
         "sysfs_bus_id": "3-0:1.0",
         "resources": [
@@ -1690,8 +1797,8 @@
         "module_alias": "usb:v1D6Bp0002d0614dc09dsc00dp01ic09isc00ip00in00"
       },
       {
-        "index": 54,
-        "attached_to": 46,
+        "index": 55,
+        "attached_to": 48,
         "class_list": [
           "usb",
           "hub"
@@ -1771,7 +1878,7 @@
         "module_alias": "usb:v214Bp7250d0100dc09dsc00dp01ic09isc00ip00in00"
       },
       {
-        "index": 60,
+        "index": 61,
         "attached_to": 38,
         "class_list": [
           "usb",
@@ -1793,7 +1900,7 @@
         },
         "vendor": {
           "hex": "1d6b",
-          "name": "Linux 6.14.0-cachyos xhci-hcd",
+          "name": "Linux 6.14.3-cachyos xhci-hcd",
           "value": 7531
         },
         "device": {
@@ -1807,7 +1914,7 @@
           "value": 0
         },
         "serial": "0000:00:14.0",
-        "model": "Linux 6.14.0-cachyos xhci-hcd xHCI Host Controller",
+        "model": "Linux 6.14.3-cachyos xhci-hcd xHCI Host Controller",
         "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb4/4-0:1.0",
         "sysfs_bus_id": "4-0:1.0",
         "detail": {
@@ -1844,7 +1951,7 @@
         "module_alias": "usb:v1D6Bp0003d0614dc09dsc00dp03ic09isc00ip00in00"
       },
       {
-        "index": 65,
+        "index": 66,
         "attached_to": 19,
         "class_list": [
           "usb",
@@ -1866,7 +1973,7 @@
         },
         "vendor": {
           "hex": "1d6b",
-          "name": "Linux 6.14.0-cachyos xhci-hcd",
+          "name": "Linux 6.14.3-cachyos xhci-hcd",
           "value": 7531
         },
         "device": {
@@ -1880,7 +1987,7 @@
           "value": 0
         },
         "serial": "0000:00:0d.0",
-        "model": "Linux 6.14.0-cachyos xhci-hcd xHCI Host Controller",
+        "model": "Linux 6.14.3-cachyos xhci-hcd xHCI Host Controller",
         "sysfs_id": "/devices/pci0000:00/0000:00:0d.0/usb1/1-0:1.0",
         "sysfs_bus_id": "1-0:1.0",
         "resources": [
@@ -1927,7 +2034,7 @@
         "module_alias": "usb:v1D6Bp0002d0614dc09dsc00dp01ic09isc00ip00in00"
       },
       {
-        "index": 71,
+        "index": 73,
         "attached_to": 19,
         "class_list": [
           "usb",
@@ -1949,7 +2056,7 @@
         },
         "vendor": {
           "hex": "1d6b",
-          "name": "Linux 6.14.0-cachyos xhci-hcd",
+          "name": "Linux 6.14.3-cachyos xhci-hcd",
           "value": 7531
         },
         "device": {
@@ -1963,7 +2070,7 @@
           "value": 0
         },
         "serial": "0000:00:0d.0",
-        "model": "Linux 6.14.0-cachyos xhci-hcd xHCI Host Controller",
+        "model": "Linux 6.14.3-cachyos xhci-hcd xHCI Host Controller",
         "sysfs_id": "/devices/pci0000:00/0000:00:0d.0/usb2/2-0:1.0",
         "sysfs_bus_id": "2-0:1.0",
         "detail": {
@@ -2002,8 +2109,8 @@
     ],
     "keyboard": [
       {
-        "index": 50,
-        "attached_to": 54,
+        "index": 52,
+        "attached_to": 55,
         "class_list": [
           "keyboard",
           "usb"
@@ -2111,8 +2218,8 @@
         "module_alias": "usb:v046DpC547d0402dc00dsc00dp00ic03isc01ip01in01"
       },
       {
-        "index": 58,
-        "attached_to": 52,
+        "index": 59,
+        "attached_to": 53,
         "class_list": [
           "keyboard",
           "usb"
@@ -2246,7 +2353,7 @@
           {
             "type": "mem",
             "base": 0,
-            "range": 67128045568,
+            "range": 67128029184,
             "enabled": true,
             "access": "read_write",
             "prefetch": "unknown"
@@ -2402,8 +2509,8 @@
     ],
     "mouse": [
       {
-        "index": 66,
-        "attached_to": 54,
+        "index": 67,
+        "attached_to": 55,
         "class_list": [
           "mouse",
           "usb"
@@ -2523,7 +2630,7 @@
         "module_alias": "usb:v046DpC547d0402dc00dsc00dp00ic03isc01ip02in00"
       },
       {
-        "index": 77,
+        "index": 79,
         "attached_to": 0,
         "bus_type": {
           "hex": "0081",
@@ -2548,7 +2655,7 @@
           "hex": "307a",
           "value": 12410
         },
-        "sysfs_id": "/devices/pci0000:00/0000:00:15.0/i2c_designware.0/i2c-1/i2c-ELAN1203:00/0018:04F3:307A.0008/input/input21",
+        "sysfs_id": "/devices/pci0000:00/0000:00:15.0/i2c_designware.0/i2c-0/i2c-ELAN1203:00/0018:04F3:307A.0008/input/input21",
         "unix_device_names": [
           "/dev/input/event18",
           "/dev/input/ + handler"
@@ -2852,30 +2959,7 @@
     ],
     "network_interface": [
       {
-        "index": 74,
-        "attached_to": 0,
-        "class_list": [
-          "network_interface"
-        ],
-        "base_class": {
-          "hex": "0107",
-          "name": "Network Interface",
-          "value": 263
-        },
-        "sub_class": {
-          "hex": "0000",
-          "name": "Loopback",
-          "value": 0
-        },
-        "model": "Loopback network interface",
-        "sysfs_id": "/class/net/lo",
-        "unix_device_name": "lo",
-        "unix_device_names": [
-          "lo"
-        ]
-      },
-      {
-        "index": 75,
+        "index": 76,
         "attached_to": 32,
         "class_list": [
           "network_interface"
@@ -2917,7 +3001,30 @@
         ]
       },
       {
-        "index": 76,
+        "index": 77,
+        "attached_to": 0,
+        "class_list": [
+          "network_interface"
+        ],
+        "base_class": {
+          "hex": "0107",
+          "name": "Network Interface",
+          "value": 263
+        },
+        "sub_class": {
+          "hex": "0000",
+          "name": "Loopback",
+          "value": 0
+        },
+        "model": "Loopback network interface",
+        "sysfs_id": "/class/net/lo",
+        "unix_device_name": "lo",
+        "unix_device_names": [
+          "lo"
+        ]
+      },
+      {
+        "index": 78,
         "attached_to": 36,
         "class_list": [
           "network_interface"
@@ -3787,8 +3894,8 @@
         "module_alias": "pci:v000010DEd00002291sv00001043sd000013FCbc04sc03i00"
       },
       {
-        "index": 45,
-        "attached_to": 54,
+        "index": 47,
+        "attached_to": 55,
         "class_list": [
           "sound",
           "usb"
@@ -3877,8 +3984,8 @@
         "module_alias": "usb:v3142pA008d0100dc00dsc00dp00ic01isc01ip00in00"
       },
       {
-        "index": 48,
-        "attached_to": 46,
+        "index": 50,
+        "attached_to": 48,
         "class_list": [
           "sound",
           "usb"
@@ -3968,8 +4075,8 @@
         "module_alias": "usb:v1038p12ADd0119dc00dsc00dp00ic01isc02ip00in01"
       },
       {
-        "index": 56,
-        "attached_to": 46,
+        "index": 57,
+        "attached_to": 48,
         "class_list": [
           "sound",
           "usb"
@@ -4045,7 +4152,7 @@
           },
           "interface_protocol": 0,
           "interface_number": 4,
-          "interface_alternate_setting": 0
+          "interface_alternate_setting": 2
         },
         "hotplug": "usb",
         "driver": "snd-usb-audio",
@@ -4059,8 +4166,8 @@
         "module_alias": "usb:v1038p12ADd0119dc00dsc00dp00ic01isc02ip00in04"
       },
       {
-        "index": 57,
-        "attached_to": 54,
+        "index": 58,
+        "attached_to": 55,
         "class_list": [
           "sound",
           "usb"
@@ -4149,8 +4256,8 @@
         "module_alias": "usb:v3142pA008d0100dc00dsc00dp00ic01isc02ip00in01"
       },
       {
-        "index": 61,
-        "attached_to": 46,
+        "index": 62,
+        "attached_to": 48,
         "class_list": [
           "sound",
           "usb"
@@ -4240,8 +4347,8 @@
         "module_alias": "usb:v1038p12ADd0119dc00dsc00dp00ic01isc02ip00in02"
       },
       {
-        "index": 62,
-        "attached_to": 46,
+        "index": 64,
+        "attached_to": 48,
         "class_list": [
           "sound",
           "usb"
@@ -4331,8 +4438,8 @@
         "module_alias": "usb:v1038p12ADd0119dc00dsc00dp00ic01isc01ip00in00"
       },
       {
-        "index": 69,
-        "attached_to": 54,
+        "index": 71,
+        "attached_to": 55,
         "class_list": [
           "sound",
           "usb"
@@ -4421,8 +4528,8 @@
         "module_alias": "usb:v3142pA008d0100dc00dsc00dp00ic01isc02ip00in02"
       },
       {
-        "index": 72,
-        "attached_to": 46,
+        "index": 74,
+        "attached_to": 48,
         "class_list": [
           "sound",
           "usb"
@@ -4701,8 +4808,8 @@
     },
     "usb": [
       {
-        "index": 49,
-        "attached_to": 54,
+        "index": 46,
+        "attached_to": 48,
         "class_list": [
           "usb",
           "unknown"
@@ -4743,8 +4850,8 @@
         },
         "serial": "3039565836353439313237313235",
         "model": "Microsoft Controller",
-        "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb3/3-3/3-3.2/3-3.2.1/3-3.2.1:1.2",
-        "sysfs_bus_id": "3-3.2.1:1.2",
+        "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb3/3-3/3-3.1/3-3.1:1.2",
+        "sysfs_bus_id": "3-3.1:1.2",
         "resources": [
           {
             "type": "baud",
@@ -4786,7 +4893,7 @@
       },
       {
         "index": 51,
-        "attached_to": 54,
+        "attached_to": 48,
         "class_list": [
           "usb",
           "unknown"
@@ -4827,8 +4934,8 @@
         },
         "serial": "3039565836353439313237313235",
         "model": "Microsoft Controller",
-        "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb3/3-3/3-3.2/3-3.2.1/3-3.2.1:1.0",
-        "sysfs_bus_id": "3-3.2.1:1.0",
+        "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb3/3-3/3-3.1/3-3.1:1.0",
+        "sysfs_bus_id": "3-3.1:1.0",
         "unix_device_name": "/dev/input/event15",
         "unix_device_number": {
           "type": 99,
@@ -4838,8 +4945,8 @@
         },
         "unix_device_names": [
           "/dev/input/by-id/usb-Microsoft_Controller_3039565836353439313237313235-event-joystick",
-          "/dev/input/by-path/pci-0000:00:14.0-usb-0:3.2.1:1.0-event-joystick",
-          "/dev/input/by-path/pci-0000:00:14.0-usbv2-0:3.2.1:1.0-event-joystick",
+          "/dev/input/by-path/pci-0000:00:14.0-usb-0:3.1:1.0-event-joystick",
+          "/dev/input/by-path/pci-0000:00:14.0-usbv2-0:3.1:1.0-event-joystick",
           "/dev/input/event15"
         ],
         "resources": [
@@ -4890,8 +4997,8 @@
         "module_alias": "usb:v045Ep0B12d050DdcFFdsc47dpD0icFFisc47ipD0in00"
       },
       {
-        "index": 55,
-        "attached_to": 54,
+        "index": 56,
+        "attached_to": 55,
         "class_list": [
           "usb",
           "unknown"
@@ -4994,7 +5101,91 @@
       },
       {
         "index": 63,
-        "attached_to": 54,
+        "attached_to": 48,
+        "class_list": [
+          "usb",
+          "unknown"
+        ],
+        "bus_type": {
+          "hex": "0086",
+          "name": "USB",
+          "value": 134
+        },
+        "slot": {
+          "bus": 0,
+          "number": 0
+        },
+        "base_class": {
+          "hex": "0000",
+          "name": "Unclassified device",
+          "value": 0
+        },
+        "sub_class": {
+          "hex": "0000",
+          "name": "Unclassified device",
+          "value": 0
+        },
+        "vendor": {
+          "hex": "045e",
+          "name": "Microsoft",
+          "value": 1118
+        },
+        "device": {
+          "hex": "0b12",
+          "name": "Controller",
+          "value": 2834
+        },
+        "revision": {
+          "hex": "0000",
+          "name": "5.0d",
+          "value": 0
+        },
+        "serial": "3039565836353439313237313235",
+        "model": "Microsoft Controller",
+        "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb3/3-3/3-3.1/3-3.1:1.1",
+        "sysfs_bus_id": "3-3.1:1.1",
+        "resources": [
+          {
+            "type": "baud",
+            "speed": 12000000,
+            "bits": 0,
+            "stop_bits": 0,
+            "parity": 0,
+            "handshake": 0
+          }
+        ],
+        "detail": {
+          "device_class": {
+            "hex": "00ff",
+            "name": "vendor_spec",
+            "value": 255
+          },
+          "device_subclass": {
+            "hex": "0047",
+            "name": "UsbClass(71)",
+            "value": 71
+          },
+          "device_protocol": 208,
+          "interface_class": {
+            "hex": "00ff",
+            "name": "vendor_spec",
+            "value": 255
+          },
+          "interface_subclass": {
+            "hex": "0047",
+            "name": "UsbClass(71)",
+            "value": 71
+          },
+          "interface_protocol": 208,
+          "interface_number": 1,
+          "interface_alternate_setting": 0
+        },
+        "hotplug": "usb",
+        "module_alias": "usb:v045Ep0B12d050DdcFFdsc47dpD0icFFisc47ipD0in01"
+      },
+      {
+        "index": 65,
+        "attached_to": 55,
         "class_list": [
           "usb",
           "unknown"
@@ -5084,92 +5275,8 @@
         "module_alias": "usb:v046DpC547d0402dc00dsc00dp00ic03isc00ip00in02"
       },
       {
-        "index": 64,
-        "attached_to": 54,
-        "class_list": [
-          "usb",
-          "unknown"
-        ],
-        "bus_type": {
-          "hex": "0086",
-          "name": "USB",
-          "value": 134
-        },
-        "slot": {
-          "bus": 0,
-          "number": 0
-        },
-        "base_class": {
-          "hex": "0000",
-          "name": "Unclassified device",
-          "value": 0
-        },
-        "sub_class": {
-          "hex": "0000",
-          "name": "Unclassified device",
-          "value": 0
-        },
-        "vendor": {
-          "hex": "045e",
-          "name": "Microsoft",
-          "value": 1118
-        },
-        "device": {
-          "hex": "0b12",
-          "name": "Controller",
-          "value": 2834
-        },
-        "revision": {
-          "hex": "0000",
-          "name": "5.0d",
-          "value": 0
-        },
-        "serial": "3039565836353439313237313235",
-        "model": "Microsoft Controller",
-        "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb3/3-3/3-3.2/3-3.2.1/3-3.2.1:1.1",
-        "sysfs_bus_id": "3-3.2.1:1.1",
-        "resources": [
-          {
-            "type": "baud",
-            "speed": 12000000,
-            "bits": 0,
-            "stop_bits": 0,
-            "parity": 0,
-            "handshake": 0
-          }
-        ],
-        "detail": {
-          "device_class": {
-            "hex": "00ff",
-            "name": "vendor_spec",
-            "value": 255
-          },
-          "device_subclass": {
-            "hex": "0047",
-            "name": "UsbClass(71)",
-            "value": 71
-          },
-          "device_protocol": 208,
-          "interface_class": {
-            "hex": "00ff",
-            "name": "vendor_spec",
-            "value": 255
-          },
-          "interface_subclass": {
-            "hex": "0047",
-            "name": "UsbClass(71)",
-            "value": 71
-          },
-          "interface_protocol": 208,
-          "interface_number": 1,
-          "interface_alternate_setting": 0
-        },
-        "hotplug": "usb",
-        "module_alias": "usb:v045Ep0B12d050DdcFFdsc47dpD0icFFisc47ipD0in01"
-      },
-      {
-        "index": 68,
-        "attached_to": 46,
+        "index": 70,
+        "attached_to": 48,
         "class_list": [
           "usb",
           "unknown"
@@ -5272,8 +5379,8 @@
         "module_alias": "usb:v1038p12ADd0119dc00dsc00dp00ic03isc00ip00in05"
       },
       {
-        "index": 70,
-        "attached_to": 52,
+        "index": 72,
+        "attached_to": 53,
         "class_list": [
           "usb",
           "unknown"
@@ -5363,8 +5470,8 @@
         "module_alias": "usb:v3434p0B10d0120dc00dsc00dp00ic03isc00ip00in01"
       },
       {
-        "index": 73,
-        "attached_to": 52,
+        "index": 75,
+        "attached_to": 53,
         "class_list": [
           "usb",
           "unknown"
@@ -5886,7 +5993,7 @@
           304942678086,
           309237645383,
           438086664264,
-          4488240824422
+          4471060955238
         ]
       }
     ],
@@ -5922,7 +6029,7 @@
           "name": "None",
           "value": 3
         },
-        "max_size": 134217728,
+        "max_size": "0x8000000",
         "error_handle": 65534,
         "slots": 4
       }
@@ -5931,8 +6038,8 @@
       {
         "handle": 63,
         "array_handle": 58,
-        "start_address": 0,
-        "end_address": 68719476736,
+        "start_address": "0x0",
+        "end_address": "0x1000000000",
         "part_width": 2
       }
     ],
@@ -6047,8 +6154,8 @@
         "handle": 66,
         "memory_device_handle": 64,
         "array_map_handle": 63,
-        "start_address": 0,
-        "end_address": 34359738368,
+        "start_address": "0x0",
+        "end_address": "0x800000000",
         "row_position": 255,
         "interleave_position": 1,
         "interleave_depth": 2
@@ -6057,8 +6164,8 @@
         "handle": 67,
         "memory_device_handle": 65,
         "array_map_handle": 63,
-        "start_address": 34359738368,
-        "end_address": 68719476736,
+        "start_address": "0x800000000",
+        "end_address": "0x1000000000",
         "row_position": 255,
         "interleave_position": 2,
         "interleave_depth": 2
diff --git a/systems/x86_64-linux/navis/pkgs/sddm-theme-minesddm.nix b/systems/x86_64-linux/navis/pkgs/sddm-theme-minesddm.nix
deleted file mode 100644
index 2c30265..0000000
--- a/systems/x86_64-linux/navis/pkgs/sddm-theme-minesddm.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{pkgs, ...}: let
-  sources = import ../../../../_sources/generated.nix {inherit (pkgs) fetchurl fetchFromGitHub;};
-in
-  pkgs.stdenv.mkDerivation {
-    inherit (sources.sddm-theme-minesddm) src pname version;
-    dontBuild = true;
-    installPhase = ''
-      mkdir -p $out/share/sddm/themes
-      cp -aR $src/minesddm $out/share/sddm/themes
-    '';
-  }
diff --git a/systems/x86_64-linux/polaris-nix/default.nix b/systems/x86_64-linux/polaris-nix/default.nix
index f3aea08..ced57ed 100644
--- a/systems/x86_64-linux/polaris-nix/default.nix
+++ b/systems/x86_64-linux/polaris-nix/default.nix
@@ -72,7 +72,7 @@
   environment = {
     localBinInPath = true;
 
-    sessionVariables.FLAKE = "/home/marshall/nix-config";
+    sessionVariables.NH_FLAKE = "/home/marshall/nix-config";
 
     systemPackages = [
       pkgs.miniupnpc