python.nix

@@ -2,16 +2,5 @@
 {
   home.packages = with pkgs; [
     uv
-    (python3.withPackages (ps: with ps; [
-      python-lsp-server
-      python-lsp-jsonrpc
-      python-lsp-black
-      python-lsp-ruff
-      pyls-isort
-      pyls-flake8
-      flake8
-      isort
-      black
-    ]))
   ];
 }

rcfiles/neovim.lua

@@ -36,33 +36,47 @@ vim.keymap.set('n', '<leader>fb', tbuiltin.buffers, {})
 vim.keymap.set('n', '<leader>fh', tbuiltin.help_tags, {})
 vim.keymap.set('n', '<leader>fs', tbuiltin.spell_suggest, {})
 
--- General LSP settings
+-- Mason (tool manager) setup
-vim.lsp.enable('pylsp')
+-- we want rust-analyzer and codelldb
-
+require("mason").setup({
--- LSP diagnostic signs
+  ui = {
-vim.diagnostic.config({
+    icons = {
-    virtual_text = true,
+      package_installed = "✔️",
-    signs = true,
+      package_pending = "🔄",
-    update_in_insert = true,
+      package_uninstalled = "🌐"
-    underline = true,
-    severity_sort = true,
-    signs = {
-      text = {
-        [vim.diagnostic.severity.ERROR] = "E",
-        [vim.diagnostic.severity.WARN] = "W",
-        [vim.diagnostic.severity.INFO] = "I",
-        [vim.diagnostic.severity.HINT] = "?"
-      },
-      numhl = {
-        [vim.diagnostic.severity.ERROR] = "ErrorMsg",
-        [vim.diagnostic.severity.WARN] = "WarningMsg",
-        [vim.diagnostic.severity.INFO] = "DiagnosticInfo",
-        [vim.diagnostic.severity.HINT] = "DiagnosticHint"
     }
   }
 })
+require("mason-lspconfig").setup()
 
-vim.keymap.set('n', '<leader><leader>d', '<cmd>lua vim.diagnostic.open_float()<CR>', { noremap = true, silent = true })
+-- General LSP settings
+-- from https://rsdlt.github.io/posts/rust-nvim-ide-guide-walkthrough-development-debug/
+local sign = function(opts)
+  vim.fn.sign_define(opts.name, {
+    texthl = opts.name,
+    text = opts.text,
+    numhl = ''
+  })
+end
+
+sign({name = 'DiagnosticSignError', text = '🛑'})
+sign({name = 'DiagnosticSignWarn', text = '⚠️'})
+sign({name = 'DiagnosticSignHint', text = '💭'})
+sign({name = 'DiagnosticSignInfo', text = '🗒️'})
+
+vim.diagnostic.config({
+    virtual_text = false,
+    signs = true,
+    update_in_insert = true,
+    underline = true,
+    severity_sort = false,
+    float = {
+        border = 'rounded',
+        source = 'always',
+        header = '',
+        prefix = '',
+    },
+})
 
 vim.cmd([[
 set signcolumn=yes

vim.nix

@@ -17,8 +17,9 @@
       nvim-treesitter-parsers.toml
       nvim-treesitter-parsers.python
       jedi-vim
-      nvim-lspconfig
+      mason-nvim
-      nvim-lsputils
+      mason-tool-installer-nvim
+      mason-lspconfig-nvim
       fzf-vim
       sleuth
       whitespace-nvim # ,t to trim whitespace