Merge 8f1b38ee81 into 516174e296

docs/manual/configuring/custom-plugins/configuring.md

@@ -12,7 +12,7 @@ pattern. Otherwise, the `before` and `after` hooks should do what you need.
 ```nix
 {
   config.vim.lazy.plugins = {
-    aerial.nvim = {
+    aerial-nvim = {
       # ^^^^^^^^^ this name should match the package.pname or package.name
       package = aerial-nvim;
 

docs/manual/configuring/custom-plugins/lazy-method.md

@@ -6,9 +6,9 @@ As of version **0.7**, we exposed an API for configuring lazy-loaded plugins via
 ```nix
 {
   config.vim.lazy.plugins = {
-    "aerial.nvim" = {
+    aerial = {
       package = pkgs.vimPlugins.aerial-nvim;
-      setupModule = "aerial";
+      setupModule = aerial;
       setupOpts = {
         option_name = true;
       };

docs/release-notes/rl-0.7.md

@@ -220,7 +220,6 @@ To migrate to `nixfmt`, simply change `vim.languages.nix.format.type` to
 
 [ts-error-translator.nvim]: https://github.com/dmmulroy/ts-error-translator.nvim
 [credo]: https://github.com/rrrene/credo
-[tiny-devicons-auto-colors]: https://github.com/rachartier/tiny-devicons-auto-colors.nvim
 
 - Add `deno fmt` as the default Markdown formatter. This will be enabled
   automatically if you have autoformatting enabled, but can be disabled manually
@@ -289,9 +288,6 @@ To migrate to `nixfmt`, simply change `vim.languages.nix.format.type` to
 - Add combined nvf configuration (`config.vim`) into the final package's
   passthru as `passthru.neovimConfiguration` for easier debugging.
 
-- Add support for [tiny-devicons-auto-colors] under
-  `vim.visuals.tiny-devicons-auto-colors`
-
 [ppenguin](https://github.com/ppenguin):
 
 - Telescope:
@@ -313,7 +309,6 @@ To migrate to `nixfmt`, simply change `vim.languages.nix.format.type` to
 - Add [Tinymist](https://github.com/Myriad-Dreamin/tinymist] as a formatter for
   the Typst language module.
 - Add LSP and Treesitter support for Assembly under `vim.languages.assembly`
-- Move [which-key](https://github.com/folke/which-key.nvim) to the new spec
 
 [Bloxx12](https://github.com/Bloxx12)
 

flake.lock

@@ -1790,22 +1790,6 @@
         "type": "github"
       }
     },
-    "plugin-tiny-devicons-auto-colors": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1724403745,
-        "narHash": "sha256-Ndkbvxn/x7+fxEYD7JIygqUiItuhoY+4+DaL/pJGKdc=",
-        "owner": "rachartier",
-        "repo": "tiny-devicons-auto-colors.nvim",
-        "rev": "a39fa4c92268832f6034306793b8acbfec2a7549",
-        "type": "github"
-      },
-      "original": {
-        "owner": "rachartier",
-        "repo": "tiny-devicons-auto-colors.nvim",
-        "type": "github"
-      }
-    },
     "plugin-todo-comments": {
       "flake": false,
       "locked": {
@@ -2128,7 +2112,6 @@
         "plugin-sqls-nvim": "plugin-sqls-nvim",
         "plugin-tabular": "plugin-tabular",
         "plugin-telescope": "plugin-telescope",
-        "plugin-tiny-devicons-auto-colors": "plugin-tiny-devicons-auto-colors",
         "plugin-todo-comments": "plugin-todo-comments",
         "plugin-toggleterm-nvim": "plugin-toggleterm-nvim",
         "plugin-tokyonight": "plugin-tokyonight",

flake.nix

@@ -464,11 +464,6 @@
       flake = false;
     };
 
-    plugin-tiny-devicons-auto-colors = {
-      url = "github:rachartier/tiny-devicons-auto-colors.nvim";
-      flake = false;
-    };
-
     plugin-gitsigns-nvim = {
       url = "github:lewis6991/gitsigns.nvim";
       flake = false;

modules/default.nix

@@ -128,10 +128,9 @@ in {
     # will return the configuration in full.
     passthru.neovimConfig = vimOptions;
 
-    meta =
-      neovim-wrapped.meta
-      // {
-        description = "Wrapped Neovim package with helper scripts to print the config (path)";
+    meta = {
+      description = "Wrapped version of Neovim with additional helper scripts";
+      mainProgram = "nvim";
     };
   };
 }

modules/plugins/languages/zig.nix

@@ -4,33 +4,13 @@
   lib,
   ...
 }: let
-  inherit (builtins) attrNames;
   inherit (lib.options) mkEnableOption mkOption;
   inherit (lib.modules) mkIf mkMerge;
   inherit (lib.lists) isList;
-  inherit (lib.types) either listOf package str enum;
+  inherit (lib.types) either listOf package str;
   inherit (lib.nvim.lua) expToLua;
   inherit (lib.nvim.types) mkGrammarOption;
 
-  defaultServer = "zls";
-  servers = {
-    zls = {
-      package = pkgs.zls;
-      internalFormatter = true;
-      lspConfig = ''
-        lspconfig.zls.setup {
-          capabilities = capabilities,
-          on_attach = default_on_attach,
-          cmd = ${
-          if isList cfg.lsp.package
-          then expToLua cfg.lsp.package
-          else "{'${cfg.lsp.package}/bin/zls'}"
-        }
-        }
-      '';
-    };
-  };
-
   cfg = config.vim.languages.zig;
 in {
   options.vim.languages.zig = {
@@ -42,19 +22,20 @@ in {
     };
 
     lsp = {
-      enable = mkEnableOption "Zig LSP support" // {default = config.vim.languages.enableLSP;};
-
-      server = mkOption {
-        type = enum (attrNames servers);
-        default = defaultServer;
-        description = "Zig LSP server to use";
-      };
+      enable = mkEnableOption "Zig LSP support (zls)" // {default = config.vim.languages.enableLSP;};
 
       package = mkOption {
         description = "ZLS package, or the command to run as a list of strings";
+        example = ''[lib.getExe pkgs.jdt-language-server "-data" "~/.cache/jdtls/workspace"]'';
         type = either package (listOf str);
         default = pkgs.zls;
       };
+
+      zigPackage = mkOption {
+        description = "Zig package used by ZLS";
+        type = package;
+        default = pkgs.zig;
+      };
     };
   };
   config = mkIf cfg.enable (mkMerge [
@@ -65,7 +46,23 @@ in {
 
     (mkIf cfg.lsp.enable {
       vim.lsp.lspconfig.enable = true;
-      vim.lsp.lspconfig.sources.zig-lsp = servers.${cfg.lsp.server}.lspConfig;
+      vim.lsp.lspconfig.sources.zig-lsp = ''
+        lspconfig.zls.setup {
+          capabilities = capabilities,
+          on_attach=default_on_attach,
+          cmd = ${
+          if isList cfg.lsp.package
+          then expToLua cfg.lsp.package
+          else ''{"${cfg.lsp.package}/bin/zls"}''
+        },
+          settings = {
+            ["zls"] = {
+              zig_exe_path = "${cfg.lsp.zigPackage}/bin/zig",
+              zig_lib_path = "${cfg.lsp.zigPackage}/lib/zig",
+            }
+          }
+        }
+      '';
     })
   ]);
 }

modules/plugins/utility/binds/which-key/config.nix

@@ -5,12 +5,9 @@
 }: let
   inherit (lib.modules) mkIf;
   inherit (lib.nvim.lua) toLuaObject;
-  inherit (lib.attrsets) mapAttrsToList;
-  inherit (lib.generators) mkLuaInline;
   inherit (lib.nvim.dag) entryAnywhere;
 
   cfg = config.vim.binds.whichKey;
-  register = mapAttrsToList (n: v: mkLuaInline "{ '${n}', desc = '${v}' }") cfg.register;
 in {
   config = mkIf cfg.enable {
     vim = {
@@ -19,7 +16,7 @@ in {
       pluginRC.whichkey = entryAnywhere ''
         local wk = require("which-key")
         wk.setup (${toLuaObject cfg.setupOpts})
-        wk.add(${toLuaObject register})
+        wk.register(${toLuaObject cfg.register})
       '';
     };
   };

modules/plugins/visuals/default.nix

@@ -15,6 +15,5 @@ in {
     ./nvim-cursorline
     ./nvim-scrollbar
     ./nvim-web-devicons
-    ./tiny-devicons-auto-colors
   ];
 }

modules/plugins/visuals/tiny-devicons-auto-colors/config.nix

@@ -1,21 +0,0 @@
-{
-  config,
-  lib,
-  ...
-}: let
-  inherit (lib.modules) mkIf;
-  inherit (lib.nvim.lua) toLuaObject;
-  inherit (lib.nvim.dag) entryAnywhere;
-
-  cfg = config.vim.visuals.tiny-devicons-auto-colors;
-in {
-  config = mkIf cfg.enable {
-    vim = {
-      startPlugins = ["tiny-devicons-auto-colors" "nvim-web-devicons"];
-
-      pluginRC.tiny-devicons-auto-colors = entryAnywhere ''
-        require("tiny-devicons-auto-colors").setup(${toLuaObject cfg.setupOpts})
-      '';
-    };
-  };
-}

modules/plugins/visuals/tiny-devicons-auto-colors/default.nix

@@ -1,6 +0,0 @@
-{
-  imports = [
-    ./config.nix
-    ./tiny-devicons-auto-colors.nix
-  ];
-}

modules/plugins/visuals/tiny-devicons-auto-colors/tiny-devicons-auto-colors.nix

@@ -1,41 +0,0 @@
-{lib, ...}: let
-  inherit (lib.options) mkOption mkEnableOption;
-  inherit (lib.types) int float;
-  inherit (lib.generators) mkLuaInline;
-  inherit (lib.nvim.types) mkPluginSetupOption luaInline;
-in {
-  options.vim.visuals.tiny-devicons-auto-colors = {
-    enable = mkEnableOption "alternative nvim-web-devicons icon colors [tiny-devicons-auto-colors]";
-
-    setupOpts = mkPluginSetupOption "tiny-devicons-auto-colors" {
-      factors = {
-        lightness = mkOption {
-          type = float;
-          default = 1.76;
-          description = "Lightness factor of icons";
-        };
-
-        chroma = mkOption {
-          type = int;
-          default = 1;
-          description = "Chroma factor of icons";
-        };
-
-        hue = mkOption {
-          type = float;
-          default = 1.25;
-          description = "Hue factor of icons";
-        };
-
-        cache = {
-          enabled = mkEnableOption "caching of icon colors. This will greatly improve performance" // {default = true;};
-          path = mkOption {
-            type = luaInline;
-            default = mkLuaInline "vim.fn.stdpath(\"cache\") .. \"/tiny-devicons-auto-colors-cache.json\"";
-            description = "Path to the cache file";
-          };
-        };
-      };
-    };
-  };
-}