flake/overlay: remove pkgs

flake.lock

@@ -2,11 +2,11 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1710534455,
+        "lastModified": 1698266953,
-        "narHash": "sha256-huQT4Xs0y4EeFKn2BTBVYgEwJSv8SDlm82uWgMnCMmI=",
+        "narHash": "sha256-jf72t7pC8+8h8fUslUYbWTX5rKsRwOzRMX8jJsGqDXA=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "9af9c1c87ed3e3ed271934cb896e0cdd33dae212",
+        "rev": "75a52265bda7fd25e06e3a67dee3f0354e73243c",
         "type": "github"
       },
       "original": {

flake.nix

@@ -12,6 +12,21 @@
     supportedSystems = ["x86_64-linux" "aarch64-linux"];
     forAllSystems = nixpkgs.lib.genAttrs supportedSystems;
     nixpkgsFor = forAllSystems (system: import nixpkgs {inherit system;});
+    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};
@@ -21,6 +36,7 @@
 
     devShells = forAllSystems (system: let
       pkgs = nixpkgsFor.${system};
+      vim = self.packages.${system};
     in {
       default = pkgs.mkShell {
         nativeBuildInputs = [
@@ -37,7 +53,7 @@
           pkgs.tree-sitter
           pkgs.verible
           pkgs.zls
-          (import ./nvim-lsp.nix {inherit pkgs;})
+          vim
         ];
       };
     });
@@ -46,28 +62,11 @@
       pkgs = nixpkgsFor.${system};
     in {
       overlay = final: prev: {
-        nvim = pkgs.symlinkJoin {
+        inherit (self.packages.${system}) nvim;
-          name = "nvim";
+        inherit additionalDeps;
-          paths = with pkgs;
-            [
-              alejandra
-              ccls
-              gopls
-              luaformatter
-              nixd
-              pyright
-              rust-analyzer
-              sumneko-lua-language-server
-              svls
-              texlab
-              tree-sitter
-              verible
-              zls
-            ]
-            ++ [self.packages.${system}.nvim];
-        };
       };
     });
+
     defaultPackage = forAllSystems (system: self.packages.${system}.nvim);
   };
 }