diff --git a/flake.lock b/flake.lock
index 79b7b19..21cbe6f 100644
--- a/flake.lock
+++ b/flake.lock
@@ -158,11 +158,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1706306660,
-        "narHash": "sha256-lZvgkHtVeduGByPb0Tz9LpAi4olfkEm8XPgv0o7GRsk=",
+        "lastModified": 1706473109,
+        "narHash": "sha256-iyuAvpKTsq2u23Cr07RcV5XlfKExrG8gRpF75hf1uVc=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "b2f56952074cb46e93902ecaabfb04dd93733434",
+        "rev": "d634c3abafa454551f2083b054cd95c3f287be61",
         "type": "github"
       },
       "original": {
@@ -173,11 +173,11 @@
     },
     "impermanence": {
       "locked": {
-        "lastModified": 1703656108,
-        "narHash": "sha256-hCSUqdFJKHHbER8Cenf5JRzjMlBjIdwdftGQsO0xoJs=",
+        "lastModified": 1706639736,
+        "narHash": "sha256-CaG4j9+UwBDfinxxvJMo6yOonSmSo0ZgnbD7aj2Put0=",
         "owner": "nix-community",
         "repo": "impermanence",
-        "rev": "033643a45a4a920660ef91caa391fbffb14da466",
+        "rev": "cd13c2917eaa68e4c49fea0ff9cada45440d7045",
         "type": "github"
       },
       "original": {
@@ -216,7 +216,9 @@
         "flake-parts": "flake-parts",
         "hercules-ci-effects": "hercules-ci-effects",
         "neovim-flake": "neovim-flake",
-        "nixpkgs": "nixpkgs"
+        "nixpkgs": [
+          "nixpkgs"
+        ]
       },
       "locked": {
         "lastModified": 1706141075,
@@ -241,22 +243,6 @@
         "rev": "b43bb235efeab5324c5e486882ef46749188eee2",
         "type": "github"
       },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1706191920,
-        "narHash": "sha256-eLihrZAPZX0R6RyM5fYAWeKVNuQPYjAkCUBr+JNvtdE=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "ae5c332cbb5827f6b1f02572496b141021de335f",
-        "type": "github"
-      },
       "original": {
         "id": "nixpkgs",
         "ref": "nixos-unstable",
@@ -271,7 +257,7 @@
         "home-manager": "home-manager",
         "impermanence": "impermanence",
         "neovim-nightly": "neovim-nightly",
-        "nixpkgs": "nixpkgs_2"
+        "nixpkgs": "nixpkgs"
       }
     },
     "systems": {
diff --git a/flake.nix b/flake.nix
index 0436e82..5370f65 100644
--- a/flake.nix
+++ b/flake.nix
@@ -8,7 +8,10 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
     impermanence.url = "github:nix-community/impermanence";
-    neovim-nightly.url = "github:nix-community/neovim-nightly-overlay";
+    neovim-nightly = {
+      url = "github:nix-community/neovim-nightly-overlay";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
     # nur.url = "github:nix-community/NUR";
     dwl-source = {
       # Use dwl's master.
@@ -41,7 +44,7 @@
 
     mkSystem = hostname: de: custom:
       nixpkgs.lib.nixosSystem {
-        specialArgs = inputs;
+        specialArgs = {inherit inputs;};
         modules =
           [
             impermanence.nixosModules.impermanence
diff --git a/modules/dwl/default.nix b/modules/dwl/default.nix
index 7b479e4..c24b2ce 100644
--- a/modules/dwl/default.nix
+++ b/modules/dwl/default.nix
@@ -1,4 +1,4 @@
-{pkgs, ags, ...}: {
+{pkgs, inputs, ...}: {
   services.xserver = {
     enable = true;
     displayManager = {
@@ -23,7 +23,7 @@
   environment.systemPackages = with pkgs; [
     dwl
     polkit_gnome
-    ags.packages.x86_64-linux.default
+    inputs.ags.packages.x86_64-linux.default
     wineWowPackages.stable
     wineWowPackages.waylandFull
     winetricks
diff --git a/modules/misc/impermanence.nix b/modules/misc/impermanence.nix
index d860097..369b25f 100644
--- a/modules/misc/impermanence.nix
+++ b/modules/misc/impermanence.nix
@@ -1,5 +1,13 @@
-{
+{lib, inputs, config,...}: {
   nix = {
+    # This will add each flake input as a registry
+    # To make nix3 commands consistent with your flake
+    registry = lib.mapAttrs (_: value: { flake = value; }) inputs;
+
+    # This will additionally add your inputs to the system's legacy channels
+    # Making legacy nix commands consistent as well, awesome!
+    nixPath = lib.mapAttrsToList (key: value: "${key}=${value.to.path}") config.nix.registry;
+
     settings = {
       auto-optimise-store = true;
       warn-dirty = false;
diff --git a/modules/misc/nvim/lua/plugins/lsp.lua b/modules/misc/nvim/lua/plugins/lsp.lua
index 24cb0b8..9a7ffa2 100644
--- a/modules/misc/nvim/lua/plugins/lsp.lua
+++ b/modules/misc/nvim/lua/plugins/lsp.lua
@@ -343,7 +343,7 @@ return {
 				css = { { "prettierd", "prettier" } },
 				html = { { "prettierd", "prettier" } },
 				sql = { "pg_format" },
-				-- cs = { "csharpier" },
+				cs = { "csharpier" },
 				["*"] = { "injected" }
 			},
 		},