Merge branch 'main' into improve-terraformls

modules/plugins/assistant/avante/config.nix

@@ -4,25 +4,16 @@
   ...
 }: let
   inherit (lib.modules) mkIf;
-  inherit (lib.lists) optionals;
 
   cfg = config.vim.assistant.avante-nvim;
 in {
   config = mkIf cfg.enable {
     vim = {
-      startPlugins =
-        [
-          "nvim-treesitter"
-          "plenary-nvim"
-          "dressing-nvim"
-          "nui-nvim"
-        ]
-        ++ (optionals config.vim.mini.pick.enable ["mini-pick"])
-        ++ (optionals config.vim.telescope.enable ["telescope"])
-        ++ (optionals config.vim.autocomplete.nvim-cmp.enable ["nvim-cmp"])
-        ++ (optionals config.vim.fzf-lua.enable ["fzf-lua"])
-        ++ (optionals config.vim.visuals.nvim-web-devicons.enable ["nvim-web-devicons"])
-        ++ (optionals config.vim.utility.images.img-clip.enable ["img-clip"]);
+      startPlugins = [
+        "plenary-nvim"
+        "dressing-nvim"
+        "nui-nvim"
+      ];
 
       lazy.plugins = {
         avante-nvim = {

modules/plugins/languages/lua.nix

@@ -9,7 +9,7 @@
   inherit (lib.modules) mkIf mkMerge;
   inherit (lib.meta) getExe;
   inherit (lib.types) bool enum listOf;
-  inherit (lib.nvim.types) diagnostics mkGrammarOption deprecatedSingleOrListOf;
+  inherit (lib.nvim.types) diagnostics mkGrammarOption;
   inherit (lib.nvim.dag) entryBefore;
   inherit (lib.nvim.attrsets) mapListToAttrs;
 
@@ -46,6 +46,9 @@
     luacheck = {
       package = pkgs.luajitPackages.luacheck;
     };
+    selene = {
+      package = pkgs.selene;
+    };
   };
 in {
   imports = [
@@ -79,7 +82,7 @@ in {
         description = "Enable Lua formatting";
       };
       type = mkOption {
-        type = deprecatedSingleOrListOf "vim.language.lua.format.type" (enum (attrNames formats));
+        type = listOf (enum (attrNames formats));
         default = defaultFormat;
         description = "Lua formatter to use";
       };

modules/plugins/languages/python.nix

@@ -169,6 +169,22 @@
         ".git"
       ];
     };
+
+    zuban = {
+      enable = true;
+      cmd = [(getExe pkgs.zuban) "server"];
+      filetypes = ["python"];
+      root_markers = [
+        "pyproject.toml"
+        "setup.py"
+        "setup.cfg"
+        "requirements.txt"
+        "Pipfile"
+        ".git"
+        "mypy.ini"
+        ".mypy.ini"
+      ];
+    };
   };
 
   defaultFormat = ["black"];

modules/plugins/utility/leetcode-nvim/config.nix

@@ -10,7 +10,6 @@ in {
   config = mkIf cfg.enable {
     vim = {
       startPlugins = [
-        "leetcode-nvim"
         "plenary-nvim"
         "fzf-lua"
         "nui-nvim"
@@ -21,6 +20,8 @@ in {
         setupModule = "leetcode";
         inherit (cfg) setupOpts;
       };
+
+      telescope.enable = true;
     };
   };
 }