diff --git a/flake.lock b/flake.lock
index af444b3..f6f62ff 100644
--- a/flake.lock
+++ b/flake.lock
@@ -114,6 +114,43 @@
         "type": "github"
       }
     },
+    "devshell": {
+      "inputs": {
+        "nixpkgs": [
+          "nixvim",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1722113426,
+        "narHash": "sha256-Yo/3loq572A8Su6aY5GP56knpuKYRvM2a1meP9oJZCw=",
+        "owner": "numtide",
+        "repo": "devshell",
+        "rev": "67cce7359e4cd3c45296fb4aaf6a19e2a9c757ae",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "devshell",
+        "type": "github"
+      }
+    },
+    "flake-compat": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1673956053,
+        "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
     "flake-parts": {
       "inputs": {
         "nixpkgs-lib": [
@@ -203,11 +240,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1726745158,
-        "narHash": "sha256-D5AegvGoEjt4rkKedmxlSEmC+nNLMBPWFxvmYnVLhjk=",
+        "lastModified": 1727514110,
+        "narHash": "sha256-0YRcOxJG12VGDFH8iS8pJ0aYQQUAgo/r3ZAL+cSh9nk=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "4e743a6920eab45e8ba0fbe49dc459f1423a4b74",
+        "rev": "85f7a7177c678de68224af3402ab8ee1bcee25c8",
         "type": "github"
       },
       "original": {
@@ -328,10 +365,13 @@
     },
     "nixvim": {
       "inputs": {
-        "devshell": [],
-        "flake-compat": [],
+        "devshell": "devshell",
+        "flake-compat": [
+          "stylix",
+          "flake-compat"
+        ],
         "flake-parts": "flake-parts",
-        "git-hooks": [],
+        "git-hooks": "git-hooks",
         "home-manager": [
           "home-manager"
         ],
@@ -339,7 +379,7 @@
         "nixpkgs": [
           "unstable"
         ],
-        "nuschtosSearch": [],
+        "nuschtosSearch": "nuschtosSearch",
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
@@ -400,7 +440,7 @@
         "base16-kitty": "base16-kitty",
         "base16-tmux": "base16-tmux",
         "base16-vim": "base16-vim",
-        "flake-compat": [],
+        "flake-compat": "flake-compat",
         "gnome-shell": "gnome-shell",
         "home-manager": [
           "home-manager"
diff --git a/flake.nix b/flake.nix
index e82ed27..cb1fe26 100644
--- a/flake.nix
+++ b/flake.nix
@@ -24,21 +24,19 @@
       inputs = {
         nixpkgs.follows = "nixpkgs";
         home-manager.follows = "home-manager";
-        # disable optional inputs
-        flake-compat.follows = "";
       };
     };
     nixvim = {
       url = "github:nix-community/nixvim";
       inputs = {
         nixpkgs.follows = "unstable";
+        nix-darwin.follows = ""; # disable MacOS stuff
         home-manager.follows = "home-manager";
-        # disable optional inputs
-        flake-compat.follows = "";
-        nix-darwin.follows = "";
-        nuschtosSearch.follows = "";
-        devshell.follows = "";
-        git-hooks.follows = "";
+        flake-compat.follows = "stylix/flake-compat";
+        nuschtosSearch.inputs = {
+          flake-utils.follows = "lix-module/flake-utils";
+          nixpkgs.follows = "nixpkgs";
+        };
       };
     };
     # For deduplication
@@ -139,7 +137,6 @@
               gitoxide
               jujutsu
               neovim-unwrapped
-              ruff # nixpkgs stable version is improperly configured by nixvim
               # wezterm
               ;
           };