flake: update

flake.lock

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

flake.nix

@@ -12,21 +12,6 @@
     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};
@@ -36,7 +21,6 @@
 
     devShells = forAllSystems (system: let
       pkgs = nixpkgsFor.${system};
-      vim = self.packages.${system};
     in {
       default = pkgs.mkShell {
         nativeBuildInputs = [
@@ -53,7 +37,7 @@
           pkgs.tree-sitter
           pkgs.verible
           pkgs.zls
-          vim
+          (import ./nvim-lsp.nix {inherit pkgs;})
         ];
       };
     });
@@ -62,11 +46,28 @@
       pkgs = nixpkgsFor.${system};
     in {
       overlay = final: prev: {
-        inherit (self.packages.${system}) nvim;
-        inherit additionalDeps;
+        nvim = pkgs.symlinkJoin {
+          name = "nvim";
+          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);
   };
 }