Merge branch 'nixos' into nixos-work

modules/programs/nvim/plugins/coding.nix

@@ -317,5 +317,21 @@ with builtins;
       cmd = [ "ConformInfo" "Format" ];
       conf = readFile ./lua/conform.lua;
     }
+    {
+      plugin = neogen;
+      keys = [
+        { key = "<leader>cg"; cmd = "<cmd>Neogen<cr>"; desc = "Test"; }
+      ];
+      opts = {
+        languages = {
+          python = {
+            template = {
+              annotation_convention = "reST";
+            };
+          };
+        };
+      };
+      cmd = [ "Neogen" ];
+    }
   ];
 }

modules/programs/nvim/plugins/lua/nvim-lspconfig.lua

@@ -81,7 +81,7 @@ local on_attach_def = function(client, bufnr)
         function()
           require("telescope.builtin").lsp_type_definitions({ reuse_win = true })
         end,
-        "Goto type defininition",
+        "Goto type definition",
       },
       r = { "<cmd>Telescope lsp_references<cr>", "Goto references" },
       D = { vim.lsp.buf.declaration, "Goto declaration" },
@@ -129,7 +129,6 @@ local servers = {
   "gopls",
   "nil_ls",
   "nixd",
-  "pylsp",
   "ruff_lsp",
   "typst_lsp",
 }
@@ -137,6 +136,18 @@ for _, lsp in ipairs(servers) do
   lspconfig_setup(lsp, {})
 end
 
+lspconfig_setup("pylsp", {
+  settings = {
+    pylsp = {
+      plugins = {
+        rope_autoimport = {
+          enabled = true,
+        },
+      },
+    },
+  },
+})
+
 lspconfig_setup("rust_analyzer", {
   settings = {
     ["rust-analyzer"] = {

modules/programs/nvim/plugins/lua/nvim-treesitter.lua

@@ -4,7 +4,4 @@ require("nvim-treesitter.configs").setup({
   highlight = {
     enable = true,
   },
-  context_commentstring = {
-    enable = true,
-  },
 })

modules/programs/nvim/plugins/treesitter.nix

@@ -21,7 +21,7 @@ with builtins;
           }
         '';
       dependencies = [
-        { plugin = nvim-ts-context-commentstring; }
+        { plugin = nvim-ts-context-commentstring; opts = { }; }
       ];
     }
     {