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

This reverts commit 13bed01615.

.gitignore

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

.nixd.json

@@ -0,0 +1 @@
+{"formatting":{"command":"alejandra"}}

flake.lock

@@ -2,16 +2,16 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1688646010,
-        "narHash": "sha256-kCeza5eKI2NEi8k0EoeZfv3lN1r1Vwx+L/VA6I8tmG4=",
-        "owner": "NixOS",
+        "lastModified": 1764494334,
+        "narHash": "sha256-x2xCEXUlU4Ap56+t5HaoReOQ/bV/bIQ5rzTn/m+V3HQ=",
+        "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "5daaa32204e9c46b05cd709218b7ba733d07e80c",
+        "rev": "d542db745310b6929708d9abea513f3ff19b1341",
         "type": "github"
       },
       "original": {
-        "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
+        "owner": "nixos",
+        "ref": "nixos-25.11",
         "repo": "nixpkgs",
         "type": "github"
       }

flake.nix

@@ -2,31 +2,89 @@
   description = "A very basic flake";
 
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11";
   };
 
-  outputs = {
-    self,
-    nixpkgs,
-  }: let
-    pkgs = nixpkgs.legacyPackages.x86_64-linux.pkgs;
-  in {
-    nvim = pkgs.mkShell {
-      nativeBuildInputs = [
-        pkgs.alejandra
-        pkgs.ccls
-        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
-        (import ./nvim-lsp.nix {inherit pkgs;})
-      ];
+  outputs =
+    { self
+    , nixpkgs
+    ,
+    }:
+    let
+      supportedSystems = [ "x86_64-linux" "aarch64-linux" ];
+      forAllSystems = nixpkgs.lib.genAttrs supportedSystems;
+      nixpkgsFor = forAllSystems (system: import nixpkgs { inherit system; });
+    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
+                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
+          pkgs = nixpkgsFor.${system};
+        in
+        {
+          default = pkgs.mkShell {
+            nativeBuildInputs = [
+              pkgs.alejandra
+              pkgs.ccls
+              pkgs.gopls
+              pkgs.luaformatter
+              pkgs.nixd
+              pkgs.nixfmt-rfc-style
+              pkgs.pyright
+              pkgs.rust-analyzer
+              pkgs.lua-language-server
+              pkgs.svls
+              pkgs.texlab
+              pkgs.tree-sitter
+              pkgs.verible
+              pkgs.zls
+              (import ./nvim-lsp.nix { inherit pkgs; })
+            ];
+          };
+        });
+
+      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 = ''
@@ -11,6 +11,7 @@
         (nvim-treesitter.withPlugins (parsers: [
           parsers.c
           parsers.cpp
+          parsers.go
           parsers.json
           parsers.latex
           parsers.lua
@@ -18,7 +19,6 @@
           parsers.python
           parsers.query
           parsers.rust
-          parsers.verilog
           parsers.vimdoc
           parsers.zig
         ]))
@@ -28,12 +28,13 @@
         cmp-nvim-ultisnips
         cmp-path
         colorizer
+        editorconfig-nvim
         fugitive
         fzf-lua
         gruvbox
         nvim-cmp
         nvim-lspconfig
-        nvim-ts-rainbow
+        rainbow-delimiters-nvim
         repeat
         targets-vim
         UltiSnips
@@ -42,6 +43,7 @@
         vim-slime
         vim-snippets
         zig-vim
+	nvim-web-devicons
       ];
     };
   };

vimrc.lua

@@ -1,22 +1,30 @@
 -- Basic settings
 vim.g.loaded_matchparen = true
 vim.g.netrw_liststyle = 3
-vim.go.background = 'dark'
-vim.go.belloff = 'all'
-vim.go.breakindent = true
-vim.go.hlsearch = false
-vim.go.laststatus = 0
-vim.go.lazyredraw = true
-vim.go.showcmd = true
-vim.go.synmaxcol = 800
-vim.go.syntax = 'on'
-vim.go.termguicolors = true
-vim.go.titleold = vim.fn.getcwd()
-vim.go.title = true
-vim.go.wildmenu = true
-vim.go.wrap = true
 vim.wo.number = true
 
+local glob_opts = {
+	background = 'dark',
+	belloff = 'all',
+	breakindent = true,
+	hlsearch = false,
+	laststatus = 0,
+	lazyredraw = true,
+	showcmd = true,
+	synmaxcol = 800,
+	syntax = 'on',
+	termguicolors = true,
+	titleold = vim.fn.getcwd(),
+	title = true,
+	wildmenu = true,
+	wrap = true,
+}
+
+for option, value in pairs(glob_opts) do
+	vim.go[option] = value
+end
+
+
 vim.cmd([[colorscheme gruvbox]])
 
 require 'nvim-treesitter.configs'.setup {
@@ -24,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
-		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
+		extended_mode = true,
+		max_file_lines = 1000,
+		colors = { '#ff0000', '#0051a0', '#ffa500', '#ffff00', '#008000', '#8003f2' }
 	}
 }
 
@@ -99,6 +105,19 @@ vim.api.nvim_create_autocmd('LspAttach', {
 	end
 })
 
+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)
+
+-- 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)
+
+-- 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)
+
 -- Use a loop to conveniently call 'setup' on multiple servers and
 -- map buffer local keybindings when the language server attaches
 local cmp = require 'cmp'
@@ -163,21 +182,72 @@ cmp.setup({
 	}
 })
 
-local servers = { 'pyright', 'rust_analyzer', 'ccls', 'lua_ls', 'nixd', 'texlab', 'verible' }
+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({
-	single_file_support = true,
-})
+vim.lsp.config('nixd', {
+	cmd = { "nixd" },
+	settings = {
+		nixd = {
+			nixpkgs = {
+				expr = 'import "${flake.inputs.nixpkgs}" { }',
 
-require('lspconfig').verible.setup({
-	root_dir = function() return vim.loop.cwd() end
+			},
+			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 = {
+		Lua = {
+			diagnostics = {
+				globals = { 'vim' },
+			},
+			runtime = {
+				version = 'LuaJIT',
+				path = vim.split(package.path, ';'),
+			},
+			workspace = {
+				library = {
+					[vim.fn.expand('$VIMRUNTIME/lua')] = true,
+					[vim.fn.expand('$VIMRUNTIME/lua/vim/lsp')] = true,
+				},
+			},
+			telemetry = {
+				enable = false,
+			},
+		},
+	},
+})
+vim.lsp.enable('lua_ls');
+
+vim.lsp.config('verible', {
+	capabilities = capabilities,
+	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'