nvim/lsp: fix server not beeing enabled; remove tinymist

This reverts commit 13bed01615.

.gitignore

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

flake.lock

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

flake.nix

@@ -2,47 +2,89 @@
   description = "A very basic flake";
 
   inputs = {
-    nixpkgs.url = "nixpkgs/nixpkgs-unstable";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11";
   };
 
-  outputs = {
+  outputs =
-    self,
+    { self
-    nixpkgs,
+    , nixpkgs
-  }: let
+    ,
-    supportedSystems = ["x86_64-linux" "aarch64-linux"];
+    }:
-    forAllSystems = nixpkgs.lib.genAttrs supportedSystems;
+    let
-    nixpkgsFor = forAllSystems (system: import nixpkgs {inherit system;});
+      supportedSystems = [ "x86_64-linux" "aarch64-linux" ];
-    pkgs = nixpkgs.legacyPackages.x86_64-linux.pkgs;
+      forAllSystems = nixpkgs.lib.genAttrs supportedSystems;
-  in {
+      nixpkgsFor = forAllSystems (system: import nixpkgs { inherit system; });
-    packages = forAllSystems (system: let
+    in
-      pkgs = nixpkgsFor.${system};
+    {
-    in {
+      packages = forAllSystems (system:
-      nvim = import ./nvim-lsp.nix {inherit pkgs;};
+        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
+                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: let
+      devShells = forAllSystems (system:
-      pkgs = nixpkgsFor.${system};
+        let
-    in {
+          pkgs = nixpkgsFor.${system};
-      default = pkgs.mkShell {
+        in
-        nativeBuildInputs = [
+        {
-          pkgs.alejandra
+          default = pkgs.mkShell {
-          pkgs.ccls
+            nativeBuildInputs = [
-          pkgs.gopls
+              pkgs.alejandra
-          pkgs.luaformatter
+              pkgs.ccls
-          pkgs.nixd
+              pkgs.gopls
-          pkgs.pyright
+              pkgs.luaformatter
-          pkgs.rust-analyzer
+              pkgs.nixd
-          pkgs.sumneko-lua-language-server
+              pkgs.nixfmt-rfc-style
-          pkgs.svls
+              pkgs.pyright
-          pkgs.texlab
+              pkgs.rust-analyzer
-          pkgs.tree-sitter
+              pkgs.lua-language-server
-          pkgs.verible
+              pkgs.svls
-          pkgs.zls
+              pkgs.texlab
-          (import ./nvim-lsp.nix {inherit pkgs;})
+              pkgs.tree-sitter
-        ];
+              pkgs.verible
-      };
+              pkgs.zls
-    });
+              (import ./nvim-lsp.nix { inherit pkgs; })
+            ];
+          };
+        });
 
-    defaultPackage = forAllSystems (system: self.packages.${system}.nvim);
+      overlays = forAllSystems (system:
-  };
+        let
+          pkgs = nixpkgsFor.${system};
+        in
+        {
+          overlay = final: prev: {
+            nvim = self.packages.${system}.nvim;
+          };
+        });
+      defaultPackage = forAllSystems (system: self.packages.${system}.nvim);
+    };
 }

nvim-lsp.nix

@@ -1,4 +1,4 @@
-{pkgs ? import <nixpkgs> {}}: let
+{pkgs}: let
   neovim = pkgs.neovim.override {
     configure = {
       customRC = ''
@@ -19,7 +19,6 @@
           parsers.python
           parsers.query
           parsers.rust
-          parsers.verilog
           parsers.vimdoc
           parsers.zig
         ]))
@@ -44,21 +43,7 @@
         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,11 +32,9 @@ require 'nvim-treesitter.configs'.setup {
 	indent = { enable = false, disable = {} },
 	rainbow = {
 		enable = true,
-		extended_mode = true, -- Highlight also non-parentheses delimiters, boolean or table: lang -> boolean
+		extended_mode = true,
-		max_file_lines = 1000, -- Do not enable for files with more than 1000 lines, int
+		max_file_lines = 1000,
-		colors = {
+		colors = { '#ff0000', '#0051a0', '#ffa500', '#ffff00', '#008000', '#8003f2' }
-			'#ff0000', '#ffa500', '#ffff00', '#008000', '#0051a0', '#8003f2'
-		} -- table of hex strings
 	}
 }
 
@@ -107,18 +105,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
@@ -184,15 +182,42 @@ cmp.setup({
 	}
 })
 
-local servers = { 'pyright', 'rust_analyzer', 'ccls', 'nixd', 'texlab', 'zls', 'gopls' }
+local servers = { 'pyright', 'rust_analyzer', 'ccls', 'texlab', 'zls', 'gopls', 'yamlls' }
 local capabilities = require('cmp_nvim_lsp').default_capabilities()
 for _, lsp in pairs(servers) do
-	require('lspconfig')[lsp].setup {
+	vim.lsp.config(lsp, {
 		capabilities = capabilities
-	}
+	})
+	vim.lsp.enable(lsp)
 end
 
-require('lspconfig').lua_ls.setup({
+vim.lsp.config('nixd', {
+	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 = {
@@ -216,11 +241,13 @@ require('lspconfig').lua_ls.setup({
 		},
 	},
 })
+vim.lsp.enable('lua_ls');
 
-require('lspconfig').verible.setup({
+vim.lsp.config('verible', {
 	capabilities = capabilities,
-	root_dir = function() return vim.loop.cwd() end
+	root_dir = function() return vim.fn.getcwd() end
 })
+vim.lsp.enable('verible');
 
 if vim.fn.exists('+undofile') ~= 0 then
 	local undo_dir = vim.env.HOME .. '/.config/nvim/undo'