feat!: remove neovim as input, depend only on config.neovim.package

willruggiano · Feb 3, 2024 · 3384f3c · 3384f3c
1 parent 3fdda17
commit 3384f3c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 74 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -6,7 +6,6 @@
     flake-parts.url = "github:hercules-ci/flake-parts";
     lazy-nvim.url = "github:folke/lazy.nvim";
     lazy-nvim.flake = false;
-    neovim.url = "github:neovim/neovim?dir=contrib";
     pre-commit-nix.url = "github:cachix/pre-commit-hooks.nix";
 
     # FIXME: This would be nice, and also a test of sorts
@@ -42,21 +41,10 @@
       perSystem = {
         config,
         inputs',
+        pkgs,
         system,
         ...
-      }: let
-        pkgs = import inputs.nixpkgs {
-          inherit system;
-          overlays = [
-            (final: prev: {
-              neovim = inputs'.neovim.packages.default;
-              neovim-unwrapped = inputs'.neovim.packages.default;
-            })
-          ];
-        };
-      in {
-        _module.args.pkgs = pkgs;
-
+      }: {
         devShells.default = pkgs.mkShell {
           name = "neovim.nix";
           shellHook = ''