diff --git a/flake-modules/dev/list-plugins.py b/flake-modules/dev/list-plugins.py index d603181e..09d2c59b 100755 --- a/flake-modules/dev/list-plugins.py +++ b/flake-modules/dev/list-plugins.py @@ -84,7 +84,6 @@ KNOWN_PATHS: dict[ "plugins/by-name/nix-develop/default.nix": (State.OLD, Kind.NEOVIM, False), "plugins/by-name/openscad/default.nix": (State.OLD, Kind.VIM, False), "plugins/by-name/plantuml-syntax/default.nix": (State.OLD, Kind.VIM, False), - "plugins/by-name/quickmath/default.nix": (State.OLD, Kind.VIM, False), # No options "plugins/by-name/rainbow-delimiters/default.nix": (State.OLD, Kind.NEOVIM, False), "plugins/by-name/treesitter-refactor/default.nix": (State.OLD, Kind.MISC, True), "plugins/by-name/treesitter-textobjects/default.nix": ( diff --git a/plugins/by-name/quickmath/default.nix b/plugins/by-name/quickmath/default.nix index 693fc4bc..2dbb0f99 100644 --- a/plugins/by-name/quickmath/default.nix +++ b/plugins/by-name/quickmath/default.nix @@ -1,29 +1,22 @@ { lib, - helpers, - config, - pkgs, ... }: -with lib; let - cfg = config.plugins.quickmath; + inherit (lib) types; in -{ - options.plugins.quickmath = { - enable = mkEnableOption "quickmath.nvim"; +lib.nixvim.vim-plugin.mkVimPlugin { + name = "quickmath"; + packPathName = "quickmath.nvim"; + package = "quickmath-nvim"; - package = lib.mkPackageOption pkgs "quickmath.nvim" { - default = [ - "vimPlugins" - "quickmath-nvim" - ]; - }; + maintainers = [ lib.maintainers.GaetanLepage ]; + extraOptions = { keymap = { - key = helpers.mkNullOrOption types.str "Keymap to run the `:Quickmath` command."; + key = lib.nixvim.mkNullOrOption types.str "Keymap to run the `:Quickmath` command."; - silent = mkOption { + silent = lib.mkOption { type = types.bool; description = "Whether the quickmath keymap should be silent."; default = false; @@ -31,15 +24,13 @@ in }; }; - config = mkIf cfg.enable { - extraPlugins = [ cfg.package ]; - + extraConfig = cfg: { keymaps = with cfg.keymap; - optional (key != null) { + lib.optional (key != null) { mode = "n"; inherit key; - action = ":Quickmath"; + action = "Quickmath"; options.silent = cfg.keymap.silent; }; };