flake/overlay: remove pkgs

flake.lock

@@ -2,11 +2,11 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1727140925,
-        "narHash": "sha256-ZHSasdLwEEjSOD/WTW1o7dr3/EjuYsdwYB4NSgICZ2I=",
+        "lastModified": 1698266953,
+        "narHash": "sha256-jf72t7pC8+8h8fUslUYbWTX5rKsRwOzRMX8jJsGqDXA=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "189e5f171b163feb7791a9118afa778d9a1db81f",
+        "rev": "75a52265bda7fd25e06e3a67dee3f0354e73243c",
         "type": "github"
       },
       "original": {

flake.nix

@@ -12,35 +12,31 @@
     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};
-      neovim = import ./nvim-lsp.nix {inherit pkgs;};
     in {
-      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
-          ]
-          ++ [neovim];
-      };
+      nvim = import ./nvim-lsp.nix {inherit pkgs;};
     });
 
     devShells = forAllSystems (system: let
       pkgs = nixpkgsFor.${system};
+      vim = self.packages.${system};
     in {
       default = pkgs.mkShell {
         nativeBuildInputs = [
@@ -48,7 +44,7 @@
           pkgs.ccls
           pkgs.gopls
           pkgs.luaformatter
-	  pkgs.nixd
+          pkgs.nixd
           pkgs.pyright
           pkgs.rust-analyzer
           pkgs.sumneko-lua-language-server
@@ -57,7 +53,7 @@
           pkgs.tree-sitter
           pkgs.verible
           pkgs.zls
-          (import ./nvim-lsp.nix {inherit pkgs;})
+          vim
         ];
       };
     });
@@ -66,9 +62,11 @@
       pkgs = nixpkgsFor.${system};
     in {
       overlay = final: prev: {
-        nvim = self.packages.${system}.nvim;
+        inherit (self.packages.${system}) nvim;
+        inherit additionalDeps;
       };
     });
+
     defaultPackage = forAllSystems (system: self.packages.${system}.nvim);
   };
 }

nvim-lsp.nix

@@ -1,4 +1,4 @@
-{pkgs}: let
+{pkgs ? import <nixpkgs> {}}: let
   neovim = pkgs.neovim.override {
     configure = {
       customRC = ''
@@ -45,6 +45,21 @@
         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
+      ];
     };
   };
 

vimrc.lua

@@ -32,9 +32,11 @@ require 'nvim-treesitter.configs'.setup {
 	indent = { enable = false, disable = {} },
 	rainbow = {
 		enable = true,
-		extended_mode = true,
-		max_file_lines = 1000,
-		colors = { '#ff0000', '#0051a0' ,'#ffa500', '#ffff00', '#008000',  '#8003f2' }
+		extended_mode = true, -- Highlight also non-parentheses delimiters, boolean or table: lang -> boolean
+		max_file_lines = 1000, -- Do not enable for files with more than 1000 lines, int
+		colors = {
+			'#ff0000', '#ffa500', '#ffff00', '#008000', '#0051a0', '#8003f2'
+		} -- table of hex strings
 	}
 }
 
@@ -105,18 +107,18 @@ vim.api.nvim_create_autocmd('LspAttach', {
 	end
 })
 
-vim.diagnostic.config({ virtual_text = false }) -- Turn off inline diagnostics
+vim.diagnostic.config({ virtual_text = false}) -- Turn off inline diagnostics 
 
 -- Show all diagnostics on current line in floating window
-vim.api.nvim_set_keymap('n', '<Leader>d', ':lua vim.diagnostic.open_float()<CR>', opts)
+vim.api.nvim_set_keymap( 'n', '<Leader>d', ':lua vim.diagnostic.open_float()<CR>', opts)
 
 -- Go to next diagnostic (if there are multiple on the same line, only shows
 -- one at a time in the floating window)
-vim.api.nvim_set_keymap('n', '<Leader>n', ':lua vim.diagnostic.goto_next()<CR>', opts)
+vim.api.nvim_set_keymap( 'n', '<Leader>n', ':lua vim.diagnostic.goto_next()<CR>', opts)
 
 -- Go to prev diagnostic (if there are multiple on the same line, only shows
 -- one at a time in the floating window)
-vim.api.nvim_set_keymap('n', '<Leader>p', ':lua vim.diagnostic.goto_prev()<CR>', opts)
+vim.api.nvim_set_keymap( 'n', '<Leader>p', ':lua vim.diagnostic.goto_prev()<CR>', opts)
 
 -- Use a loop to conveniently call 'setup' on multiple servers and
 -- map buffer local keybindings when the language server attaches
@@ -217,7 +219,7 @@ require('lspconfig').lua_ls.setup({
 
 require('lspconfig').verible.setup({
 	capabilities = capabilities,
-	root_dir = function() return vim.fn.getcwd() end
+	root_dir = function() return vim.loop.cwd() end
 })
 
 if vim.fn.exists('+undofile') ~= 0 then