flake/overlay: remove pkgs

.gitignore

@@ -1,4 +1 @@
 result
-.ccls-cache/
-hello.c
-compile_commands.json

flake.lock

@@ -2,18 +2,17 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1764494334,
+        "lastModified": 1698266953,
-        "narHash": "sha256-x2xCEXUlU4Ap56+t5HaoReOQ/bV/bIQ5rzTn/m+V3HQ=",
+        "narHash": "sha256-jf72t7pC8+8h8fUslUYbWTX5rKsRwOzRMX8jJsGqDXA=",
-        "owner": "nixos",
+        "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "d542db745310b6929708d9abea513f3ff19b1341",
+        "rev": "75a52265bda7fd25e06e3a67dee3f0354e73243c",
         "type": "github"
       },
       "original": {
-        "owner": "nixos",
+        "id": "nixpkgs",
-        "ref": "nixos-25.11",
+        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
+        "type": "indirect"
-        "type": "github"
       }
     },
     "root": {

flake.nix

@@ -2,59 +2,42 @@
   description = "A very basic flake";
 
   inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11";
+    nixpkgs.url = "nixpkgs/nixpkgs-unstable";
   };
 
-  outputs =
+  outputs = {
-    { self
+    self,
-    , nixpkgs
+    nixpkgs,
-    ,
+  }: let
-    }:
-    let
     supportedSystems = ["x86_64-linux" "aarch64-linux"];
     forAllSystems = nixpkgs.lib.genAttrs supportedSystems;
     nixpkgsFor = forAllSystems (system: import nixpkgs {inherit system;});
-    in
+    additionalDeps = pkgs: [
-    {
+      pkgs.alejandra
-      packages = forAllSystems (system:
+      pkgs.ccls
-        let
+      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 {
-        in
+      nvim = import ./nvim-lsp.nix {inherit pkgs;};
-        {
-          nvim = pkgs.symlinkJoin {
-            name = "nvim";
-            paths = with pkgs;
-              [
-                alejandra
-                ccls
-                gopls
-                luaformatter
-                nixd
-                nixfmt-rfc-style
-                pyright
-                rust-analyzer
-                lua-language-server
-                svls
-                texlab
-                tree-sitter
-                tinymist
-                verible
-                yaml-language-server
-                zls
-                viu
-                chafa
-                ueberzugpp
-              ]
-              ++ [ neovim ];
-          };
     });
 
-      devShells = forAllSystems (system:
+    devShells = forAllSystems (system: let
-        let
       pkgs = nixpkgsFor.${system};
-        in
+      vim = self.packages.${system};
-        {
+    in {
       default = pkgs.mkShell {
         nativeBuildInputs = [
           pkgs.alejandra
@@ -62,29 +45,28 @@
           pkgs.gopls
           pkgs.luaformatter
           pkgs.nixd
-              pkgs.nixfmt-rfc-style
           pkgs.pyright
           pkgs.rust-analyzer
-              pkgs.lua-language-server
+          pkgs.sumneko-lua-language-server
           pkgs.svls
           pkgs.texlab
           pkgs.tree-sitter
           pkgs.verible
           pkgs.zls
-              (import ./nvim-lsp.nix { inherit pkgs; })
+          vim
         ];
       };
     });
 
-      overlays = forAllSystems (system:
+    overlays = forAllSystems (system: let
-        let
       pkgs = nixpkgsFor.${system};
-        in
+    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 = ''
@@ -19,6 +19,7 @@
           parsers.python
           parsers.query
           parsers.rust
+          parsers.verilog
           parsers.vimdoc
           parsers.zig
         ]))
@@ -43,7 +44,21 @@
         vim-slime
         vim-snippets
         zig-vim
-	nvim-web-devicons
+      ];
+      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,
+		extended_mode = true, -- Highlight also non-parentheses delimiters, boolean or table: lang -> boolean
-		max_file_lines = 1000,
+		max_file_lines = 1000, -- Do not enable for files with more than 1000 lines, int
-		colors = { '#ff0000', '#0051a0', '#ffa500', '#ffff00', '#008000', '#8003f2' }
+		colors = {
+			'#ff0000', '#ffa500', '#ffff00', '#008000', '#0051a0', '#8003f2'
+		} -- table of hex strings
 	}
 }
 
@@ -182,42 +184,15 @@ cmp.setup({
 	}
 })
 
-local servers = { 'pyright', 'rust_analyzer', 'ccls', 'texlab', 'zls', 'gopls', 'yamlls' }
+local servers = { 'pyright', 'rust_analyzer', 'ccls', 'nixd', 'texlab', 'zls', 'gopls' }
 local capabilities = require('cmp_nvim_lsp').default_capabilities()
 for _, lsp in pairs(servers) do
-	vim.lsp.config(lsp, {
+	require('lspconfig')[lsp].setup {
 		capabilities = capabilities
-	})
+	}
-	vim.lsp.enable(lsp)
 end
 
-vim.lsp.config('nixd', {
+require('lspconfig').lua_ls.setup({
-	cmd = { "nixd" },
-	settings = {
-		nixd = {
-			nixpkgs = {
-				expr = 'import "${flake.inputs.nixpkgs}" { }',
-
-			},
-			formatting = {
-				command = { "nixpkgs-fmt" },
-			},
-			options = {
-				nixos = {
-					expr =
-					'(let pkgs = import "${inputs.nixpkgs}" { }; in (pkgs.lib.evalModules { modules =  (import "${inputs.nixpkgs}/nixos/modules/module-list.nix") ++ [ ({...}: { nixpkgs.hostPlatform = builtins.currentSystem;} ) ] ; })).options',
-				},
-				home_manager = {
-					expr =
-					'(let pkgs = import "${inputs.nixpkgs}" { }; lib = import "${inputs.home-manager}/modules/lib/stdlib-extended.nix" pkgs.lib; in (lib.evalModules { modules =  (import "${inputs.home-manager}/modules/modules.nix") { inherit lib pkgs; check = false; }; })).options',
-				},
-			},
-		},
-	},
-})
-vim.lsp.enable('nixd');
-
-vim.lsp.config('lua_ls', {
 	capabilities = capabilities,
 	single_file_support = true,
 	settings = {
@@ -241,13 +216,11 @@ vim.lsp.config('lua_ls', {
 		},
 	},
 })
-vim.lsp.enable('lua_ls');
 
-vim.lsp.config('verible', {
+require('lspconfig').verible.setup({
 	capabilities = capabilities,
-	root_dir = function() return vim.fn.getcwd() end
+	root_dir = function() return vim.loop.cwd() end
 })
-vim.lsp.enable('verible');
 
 if vim.fn.exists('+undofile') ~= 0 then
 	local undo_dir = vim.env.HOME .. '/.config/nvim/undo'