feat(neovim): add python lsp, lint and formatting

modules/home-manager/programs/neovim/default.nix

@@ -76,6 +76,11 @@ in
         nixd
         nixfmt-rfc-style
 
+        # Python
+        basedpyright
+        python312Packages.flake8
+        ruff
+
         # TypeScript
         typescript-language-server
 
@@ -100,185 +105,9 @@ in
       source = ./lua;
     };
 
-    xdg.configFile."nvim/lua/plugins/astrolsp.lua".text =
+    xdg.configFile."nvim/lua/plugins/astrolsp.lua".text = import ./lsp.nix {
-      let
+      config = config;
-        hostname = config.programs.neovim.flake.hostname;
+      pkgs = pkgs;
-        location = config.programs.neovim.flake.location;
+    };
-      in
-      #lua
-      ''
-        -- AstroLSP allows you to customize the features in AstroNvim's LSP configuration engine
-        -- Configuration documentation can be found with `:h astrolsp`
-        -- NOTE: We highly recommend setting up the Lua Language Server (`:LspInstall lua_ls`)
-        --       as this provides autocomplete and documentation while editing
-
-        ---@type LazySpec
-        return {
-          "AstroNvim/astrolsp",
-          ---@type AstroLSPOpts
-          opts = {
-            -- Configuration table of features provided by AstroLSP
-            features = {
-              autoformat = true,      -- enable or disable auto formatting on start
-              codelens = true,        -- enable/disable codelens refresh on start
-              inlay_hints = false,    -- enable/disable inlay hints on start
-              semantic_tokens = true, -- enable/disable semantic token highlighting
-            },
-            -- customize lsp formatting options
-            formatting = {
-              -- control auto formatting on save
-              format_on_save = {
-                enabled = true,     -- enable or disable format on save globally
-                allow_filetypes = { -- enable format on save for specified filetypes only
-                  -- "go",
-                  "c",
-                  "cpp",
-                  "h",
-                  "javascript",
-                  "jsx",
-                  "lua",
-                  "nix",
-                  "rust",
-                  "svelte",
-                  "tsx",
-                  "typescript",
-                },
-                ignore_filetypes = { -- disable format on save for specified filetypes
-                  -- "python",
-                },
-              },
-              disabled = { -- disable formatting capabilities for the listed language servers
-                -- disable lua_ls formatting capability if you want to use StyLua to format your lua code
-                -- "lua_ls",
-              },
-              timeout_ms = 1000, -- default format timeout
-              -- filter = function(client) -- fully override the default formatting function
-              --   return true
-              -- end
-            },
-            -- enable servers that you already have installed without mason
-            servers = {
-              -- "pyright"
-              "clangd",
-              "cmake",
-              "cssls",
-              "eslint",
-              "html",
-              "jsonls",
-              "lua_ls",
-              "marksman",
-              "nixd",
-              "rust_analyzer",
-              "svelte",
-              "taplo",
-              "tsserver",
-              "volar",
-              "yamlls",
-            },
-            -- customize language server configuration options passed to `lspconfig`
-            ---@diagnostic disable: missing-fields
-            config = {
-              -- clangd = { capabilities = { offsetEncoding = "utf-8" } },
-              nixd = {
-                settings = {
-                  nixd = {
-                    options = {
-                      nixos = {
-                        expr = '(builtins.getFlake ("${location}")).nixosConfigurations.${hostname}.options',
-                      },
-                      home_manager = {
-                        expr =
-                        '(builtins.getFlake ("${location}")).homeConfigurations.${hostname}.options',
-                      },
-                    },
-                  },
-                },
-              },
-              tsserver = {
-                init_options = {
-                  plugins = {
-                    {
-                      name = "@vue/typescript-plugin",
-                      location = "${pkgs.vue-language-server}/bin/vue-language-server",
-                      languages = { "javascript", "typescript", "vue" },
-                    },
-                  },
-                },
-                filetypes = {
-                  "javascript",
-                  "typescript",
-                  "vue",
-                },
-              },
-            },
-            -- customize how language servers are attached
-            handlers = {
-              -- a function without a key is simply the default handler, functions take two parameters, the server name and the configured options table for that server
-              -- function(server, opts) require("lspconfig")[server].setup(opts) end
-
-              -- the key is the server that is being setup with `lspconfig`
-              -- rust_analyzer = false, -- setting a handler to false will disable the set up of that language server
-              -- pyright = function(_, opts) require("lspconfig").pyright.setup(opts) end -- or a custom handler function can be passed
-            },
-            -- Configure buffer local auto commands to add when attaching a language server
-            autocmds = {
-              -- first key is the `augroup` to add the auto commands to (:h augroup)
-              lsp_document_highlight = {
-                -- Optional condition to create/delete auto command group
-                -- can either be a string of a client capability or a function of `fun(client, bufnr): boolean`
-                -- condition will be resolved for each client on each execution and if it ever fails for all clients,
-                -- the auto commands will be deleted for that buffer
-                cond = "textDocument/documentHighlight",
-                -- cond = function(client, bufnr) return client.name == "lua_ls" end,
-                -- list of auto commands to set
-                {
-                  -- events to trigger
-                  event = { "CursorHold", "CursorHoldI" },
-                  -- the rest of the autocmd options (:h nvim_create_autocmd)
-                  desc = "Document Highlighting",
-                  callback = function()
-                    vim.lsp.buf.document_highlight()
-                  end,
-                },
-                {
-                  event = { "CursorMoved", "CursorMovedI", "BufLeave" },
-                  desc = "Document Highlighting Clear",
-                  callback = function()
-                    vim.lsp.buf.clear_references()
-                  end,
-                },
-              },
-            },
-            -- mappings to be set up on attaching of a language server
-            mappings = {
-              n = {
-                gl = {
-                  function()
-                    vim.diagnostic.open_float()
-                  end,
-                  desc = "Hover diagnostics",
-                },
-                -- a `cond` key can provided as the string of a server capability to be required to attach, or a function with `client` and `bufnr` parameters from the `on_attach` that returns a boolean
-                -- gD = {
-                --   function() vim.lsp.buf.declaration() end,
-                --   desc = "Declaration of current symbol",
-                --   cond = "textDocument/declaration",
-                -- },
-                -- ["<Leader>uY"] = {
-                --   function() require("astrolsp.toggles").buffer_semantic_tokens() end,
-                --   desc = "Toggle LSP semantic highlight (buffer)",
-                --   cond = function(client) return client.server_capabilities.semanticTokensProvider and vim.lsp.semantic_tokens end,
-                -- },
-              },
-            },
-            -- A custom `on_attach` function to be run after the default `on_attach` function
-            -- takes two parameters `client` and `bufnr`  (`:h lspconfig-setup`)
-            on_attach = function(client, bufnr)
-              -- this would disable semanticTokensProvider for all clients
-              -- client.server_capabilities.semanticTokensProvider = nil
-            end,
-          },
-        }
-      '';
   };
 }

modules/home-manager/programs/neovim/lsp.nix

@@ -0,0 +1,180 @@
+{ config, pkgs }:
+let
+  hostname = config.programs.neovim.flake.hostname;
+  location = config.programs.neovim.flake.location;
+in
+#lua
+''
+  -- AstroLSP allows you to customize the features in AstroNvim's LSP configuration engine
+  -- Configuration documentation can be found with `:h astrolsp`
+  -- NOTE: We highly recommend setting up the Lua Language Server (`:LspInstall lua_ls`)
+  --       as this provides autocomplete and documentation while editing
+
+  ---@type LazySpec
+  return {
+    "AstroNvim/astrolsp",
+    ---@type AstroLSPOpts
+    opts = {
+      -- Configuration table of features provided by AstroLSP
+      features = {
+        autoformat = true,      -- enable or disable auto formatting on start
+        codelens = true,        -- enable/disable codelens refresh on start
+        inlay_hints = false,    -- enable/disable inlay hints on start
+        semantic_tokens = true, -- enable/disable semantic token highlighting
+      },
+      -- customize lsp formatting options
+      formatting = {
+        -- control auto formatting on save
+        format_on_save = {
+          enabled = true,     -- enable or disable format on save globally
+          allow_filetypes = { -- enable format on save for specified filetypes only
+            -- "go",
+            "c",
+            "cpp",
+            "h",
+            "javascript",
+            "jsx",
+            "lua",
+            "nix",
+            "rust",
+            "svelte",
+            "tsx",
+            "typescript",
+          },
+          ignore_filetypes = { -- disable format on save for specified filetypes
+            -- "python",
+          },
+        },
+        disabled = { -- disable formatting capabilities for the listed language servers
+          -- disable lua_ls formatting capability if you want to use StyLua to format your lua code
+          -- "lua_ls",
+        },
+        timeout_ms = 1000, -- default format timeout
+        -- filter = function(client) -- fully override the default formatting function
+        --   return true
+        -- end
+      },
+      -- enable servers that you already have installed without mason
+      servers = {
+        "basedpyright",
+        "clangd",
+        "cmake",
+        "cssls",
+        "eslint",
+        "html",
+        "jsonls",
+        "lua_ls",
+        "marksman",
+        "nixd",
+        "rust_analyzer",
+        "svelte",
+        "taplo",
+        "tsserver",
+        "volar",
+        "yamlls",
+      },
+      -- customize language server configuration options passed to `lspconfig`
+      ---@diagnostic disable: missing-fields
+      config = {
+        -- clangd = { capabilities = { offsetEncoding = "utf-8" } },
+        nixd = {
+          settings = {
+            nixd = {
+              options = {
+                nixos = {
+                  expr = '(builtins.getFlake ("${location}")).nixosConfigurations.${hostname}.options',
+                },
+                home_manager = {
+                  expr =
+                    '(builtins.getFlake ("${location}")).homeConfigurations.${hostname}.options',
+                },
+              },
+            },
+          },
+        },
+        tsserver = {
+          init_options = {
+            plugins = {
+              {
+                name = "@vue/typescript-plugin",
+                location = "${pkgs.vue-language-server}/bin/vue-language-server",
+                languages = { "javascript", "typescript", "vue" },
+              },
+            },
+          },
+          filetypes = {
+            "javascript",
+            "typescript",
+            "vue",
+          },
+        },
+      },
+      -- customize how language servers are attached
+      handlers = {
+        -- a function without a key is simply the default handler, functions take two parameters, the server name and the configured options table for that server
+        -- function(server, opts) require("lspconfig")[server].setup(opts) end
+
+        -- the key is the server that is being setup with `lspconfig`
+        -- rust_analyzer = false, -- setting a handler to false will disable the set up of that language server
+        -- pyright = function(_, opts) require("lspconfig").pyright.setup(opts) end -- or a custom handler function can be passed
+      },
+      -- Configure buffer local auto commands to add when attaching a language server
+      autocmds = {
+        -- first key is the `augroup` to add the auto commands to (:h augroup)
+        lsp_document_highlight = {
+          -- Optional condition to create/delete auto command group
+          -- can either be a string of a client capability or a function of `fun(client, bufnr): boolean`
+          -- condition will be resolved for each client on each execution and if it ever fails for all clients,
+          -- the auto commands will be deleted for that buffer
+          cond = "textDocument/documentHighlight",
+          -- cond = function(client, bufnr) return client.name == "lua_ls" end,
+          -- list of auto commands to set
+          {
+            -- events to trigger
+            event = { "CursorHold", "CursorHoldI" },
+            -- the rest of the autocmd options (:h nvim_create_autocmd)
+            desc = "Document Highlighting",
+            callback = function()
+              vim.lsp.buf.document_highlight()
+            end,
+          },
+          {
+            event = { "CursorMoved", "CursorMovedI", "BufLeave" },
+            desc = "Document Highlighting Clear",
+            callback = function()
+              vim.lsp.buf.clear_references()
+            end,
+          },
+        },
+      },
+      -- mappings to be set up on attaching of a language server
+      mappings = {
+        n = {
+          gl = {
+            function()
+              vim.diagnostic.open_float()
+            end,
+            desc = "Hover diagnostics",
+          },
+          -- a `cond` key can provided as the string of a server capability to be required to attach, or a function with `client` and `bufnr` parameters from the `on_attach` that returns a boolean
+          -- gD = {
+          --   function() vim.lsp.buf.declaration() end,
+          --   desc = "Declaration of current symbol",
+          --   cond = "textDocument/declaration",
+          -- },
+          -- ["<Leader>uY"] = {
+          --   function() require("astrolsp.toggles").buffer_semantic_tokens() end,
+          --   desc = "Toggle LSP semantic highlight (buffer)",
+          --   cond = function(client) return client.server_capabilities.semanticTokensProvider and vim.lsp.semantic_tokens end,
+          -- },
+        },
+      },
+      -- A custom `on_attach` function to be run after the default `on_attach` function
+      -- takes two parameters `client` and `bufnr`  (`:h lspconfig-setup`)
+      on_attach = function(client, bufnr)
+        -- this would disable semanticTokensProvider for all clients
+        -- client.server_capabilities.semanticTokensProvider = nil
+      end,
+    },
+  }
+''

modules/home-manager/programs/neovim/lua/plugins/none-ls.lua

@@ -3,6 +3,9 @@
 ---@type LazySpec
 return {
   "nvimtools/none-ls.nvim",
+  dependencies = {
+    "nvimtools/none-ls-extras.nvim",
+  },
   opts = function(_, config)
     -- config variable is the default configuration table for the setup function call
     local null_ls = require("null-ls")
@@ -12,9 +15,11 @@ return {
     -- https://github.com/nvimtools/none-ls.nvim/tree/main/lua/null-ls/builtins/diagnostics
     config.sources = {
       -- Set a formatter
+      require("none-ls.diagnostics.flake8"),
       null_ls.builtins.formatting.clang_format,
       null_ls.builtins.formatting.nixfmt,
       null_ls.builtins.formatting.prettier,
+      require("none-ls.formatting.ruff"),
       null_ls.builtins.formatting.stylua,
     }
     return config -- return final config table