flake/overlay: remove pkgs

flake.nix

@@ -12,7 +12,21 @@
     supportedSystems = ["x86_64-linux" "aarch64-linux"];
     forAllSystems = nixpkgs.lib.genAttrs supportedSystems;
     nixpkgsFor = forAllSystems (system: import nixpkgs {inherit system;});
-    pkgs = nixpkgs.legacyPackages.x86_64-linux.pkgs;
+    additionalDeps = pkgs: [
+      pkgs.alejandra
+      pkgs.ccls
+      pkgs.gopls
+      pkgs.luaformatter
+      pkgs.nixd
+      pkgs.pyright
+      pkgs.rust-analyzer
+      pkgs.sumneko-lua-language-server
+      pkgs.svls
+      pkgs.texlab
+      pkgs.tree-sitter
+      pkgs.verible
+      pkgs.zls
+    ];
   in {
     packages = forAllSystems (system: let
       pkgs = nixpkgsFor.${system};
@@ -22,6 +36,7 @@
 
     devShells = forAllSystems (system: let
       pkgs = nixpkgsFor.${system};
+      vim = self.packages.${system};
     in {
       default = pkgs.mkShell {
         nativeBuildInputs = [
@@ -38,11 +53,20 @@
           pkgs.tree-sitter
           pkgs.verible
           pkgs.zls
-          (import ./nvim-lsp.nix {inherit pkgs;})
+          vim
         ];
       };
     });
 
+    overlays = forAllSystems (system: let
+      pkgs = nixpkgsFor.${system};
+    in {
+      overlay = final: prev: {
+        inherit (self.packages.${system}) nvim;
+        inherit additionalDeps;
+      };
+    });
+
     defaultPackage = forAllSystems (system: self.packages.${system}.nvim);
   };
 }

nvim-lsp.nix

@@ -7,59 +7,59 @@
         EOF
       '';
 
-      packages.myPlugins.start = with pkgs.vimPlugins;
-        [
-          (nvim-treesitter.withPlugins (parsers: [
-            parsers.c
-            parsers.cpp
-            parsers.go
-            parsers.json
-            parsers.latex
-            parsers.lua
-            parsers.nix
-            parsers.python
-            parsers.query
-            parsers.rust
-            parsers.verilog
-            parsers.vimdoc
-            parsers.zig
-          ]))
-          cmp-buffer
-          cmp-cmdline
-          cmp-nvim-lsp
-          cmp-nvim-ultisnips
-          cmp-path
-          colorizer
-          fugitive
-          fzf-lua
-          gruvbox
-          nvim-cmp
-          nvim-lspconfig
-          nvim-ts-rainbow
-          repeat
-          targets-vim
-          UltiSnips
-          vim-addon-nix
-          vim-signify
-          vim-slime
-          vim-snippets
-          zig-vim
-        ]
-        ++ [
-          pkgs.alejandra
-          pkgs.ccls
-          pkgs.gopls
-          pkgs.luaformatter
-          pkgs.nixd
-          pkgs.pyright
-          pkgs.rust-analyzer
-          pkgs.sumneko-lua-language-server
-          pkgs.svls
-          pkgs.texlab
-          pkgs.tree-sitter
-          pkgs.verible
-          pkgs.zls
-        ];
+      packages.myPlugins.start = with pkgs.vimPlugins; [
+        (nvim-treesitter.withPlugins (parsers: [
+          parsers.c
+          parsers.cpp
+          parsers.go
+          parsers.json
+          parsers.latex
+          parsers.lua
+          parsers.nix
+          parsers.python
+          parsers.query
+          parsers.rust
+          parsers.verilog
+          parsers.vimdoc
+          parsers.zig
+        ]))
+        cmp-buffer
+        cmp-cmdline
+        cmp-nvim-lsp
+        cmp-nvim-ultisnips
+        cmp-path
+        colorizer
+        editorconfig-nvim
+        fugitive
+        fzf-lua
+        gruvbox
+        nvim-cmp
+        nvim-lspconfig
+        rainbow-delimiters-nvim
+        repeat
+        targets-vim
+        UltiSnips
+        vim-addon-nix
+        vim-signify
+        vim-slime
+        vim-snippets
+        zig-vim
+      ];
+      nativeBuildInputs = [
+        pkgs.alejandra
+        pkgs.ccls
+        pkgs.gopls
+        pkgs.luaformatter
+        pkgs.nixd
+        pkgs.pyright
+        pkgs.rust-analyzer
+        pkgs.sumneko-lua-language-server
+        pkgs.svls
+        pkgs.texlab
+        pkgs.tree-sitter
+        pkgs.verible
+        pkgs.zls
+      ];
     };
   };