From 952a3f1ad01d6f3eb28a90bd3c87b872c801a925 Mon Sep 17 00:00:00 2001 From: LilleAila Date: Thu, 16 Jan 2025 08:23:19 +0100 Subject: [PATCH 01/54] collections/mini: init --- flake.lock | 17 ++++++++++ flake.nix | 6 ++++ modules/modules.nix | 1 + modules/plugins/collections/default.nix | 5 +++ .../plugins/collections/mini-nvim/config.nix | 32 +++++++++++++++++++ .../plugins/collections/mini-nvim/default.nix | 6 ++++ .../collections/mini-nvim/mini-nvim.nix | 28 ++++++++++++++++ 7 files changed, 95 insertions(+) create mode 100644 modules/plugins/collections/default.nix create mode 100644 modules/plugins/collections/mini-nvim/config.nix create mode 100644 modules/plugins/collections/mini-nvim/default.nix create mode 100644 modules/plugins/collections/mini-nvim/mini-nvim.nix diff --git a/flake.lock b/flake.lock index da38b9673..448bd8b25 100644 --- a/flake.lock +++ b/flake.lock @@ -936,6 +936,22 @@ "type": "github" } }, + "plugin-mini-nvim": { + "flake": false, + "locked": { + "lastModified": 1736875588, + "narHash": "sha256-v5cMB/IK+muogipWPtU7rFTfYWO7wr+VyGfqPU/fE70=", + "owner": "echasnovski", + "repo": "mini.nvim", + "rev": "9e603a31d3fbc7ee61c9b556cd84e97fa2dcff53", + "type": "github" + }, + "original": { + "owner": "echasnovski", + "repo": "mini.nvim", + "type": "github" + } + }, "plugin-minimap-vim": { "flake": false, "locked": { @@ -2132,6 +2148,7 @@ "plugin-lz-n": "plugin-lz-n", "plugin-lzn-auto-require": "plugin-lzn-auto-require", "plugin-mind-nvim": "plugin-mind-nvim", + "plugin-mini-nvim": "plugin-mini-nvim", "plugin-minimap-vim": "plugin-minimap-vim", "plugin-modes-nvim": "plugin-modes-nvim", "plugin-neo-tree-nvim": "plugin-neo-tree-nvim", diff --git a/flake.nix b/flake.nix index 89690cadd..4d6873ea2 100644 --- a/flake.nix +++ b/flake.nix @@ -744,5 +744,11 @@ url = "github:stevearc/aerial.nvim"; flake = false; }; + + # Plugin collections + plugin-mini-nvim = { + url = "github:echasnovski/mini.nvim"; + flake = false; + }; }; } diff --git a/modules/modules.nix b/modules/modules.nix index 6e05c592d..198608841 100644 --- a/modules/modules.nix +++ b/modules/modules.nix @@ -19,6 +19,7 @@ plugins = map (p: ./plugins + "/${p}") [ "assistant" "autopairs" + "collections" "comments" "completion" "dashboard" diff --git a/modules/plugins/collections/default.nix b/modules/plugins/collections/default.nix new file mode 100644 index 000000000..7f5524a65 --- /dev/null +++ b/modules/plugins/collections/default.nix @@ -0,0 +1,5 @@ +{ + imports = [ + ./mini-nvim + ]; +} diff --git a/modules/plugins/collections/mini-nvim/config.nix b/modules/plugins/collections/mini-nvim/config.nix new file mode 100644 index 000000000..c04c81916 --- /dev/null +++ b/modules/plugins/collections/mini-nvim/config.nix @@ -0,0 +1,32 @@ +{ + options, + config, + lib, + pkgs, + inputs, + ... +}: let + inherit (lib) mkMerge; + inherit (lib.modules) mkIf; + inherit (lib.strings) concatStringsSep; + inherit (lib.attrsets) mapAttrsToList; + inherit (lib.nvim.lua) toLuaObject; + + cfg = config.vim.collections.mini-nvim; +in { + config = mkIf cfg.enable { + vim.lazy.plugins."mini-nvim" = { + package = "mini-nvim"; + # package = pkgs.vimPlugins.mini-nvim; + # package = pkgs.vimUtils.buildVimPlugin { + # name = "mini-nvim"; + # src = inputs.plugin-mini-nvim; + # }; + lazy = false; + after = concatStringsSep "\n" (mapAttrsToList (name: value: '' + require("mini.${name}").setup(${toLuaObject value.setupOpts}) + '') + cfg.modules); + }; + }; +} diff --git a/modules/plugins/collections/mini-nvim/default.nix b/modules/plugins/collections/mini-nvim/default.nix new file mode 100644 index 000000000..91faca278 --- /dev/null +++ b/modules/plugins/collections/mini-nvim/default.nix @@ -0,0 +1,6 @@ +{ + imports = [ + ./config.nix + ./mini-nvim.nix + ]; +} diff --git a/modules/plugins/collections/mini-nvim/mini-nvim.nix b/modules/plugins/collections/mini-nvim/mini-nvim.nix new file mode 100644 index 000000000..b9764eed7 --- /dev/null +++ b/modules/plugins/collections/mini-nvim/mini-nvim.nix @@ -0,0 +1,28 @@ +{lib, ...}: let + inherit (lib.options) mkEnableOption mkOption literalExpression; + inherit (lib.types) attrsOf submodule; + inherit (lib.nvim.types) mkPluginSetupOption; +in { + options.vim.collections.mini-nvim = { + enable = mkEnableOption "mini.nvim, a collection of quality-of-life modules"; + modules = mkOption { + type = attrsOf (submodule { + options = { + setupOpts = mkPluginSetupOption "mini.nvim plugin" {}; + }; + }); + default = {}; + example = + literalExpression + '' + { + files = {}; + sessions = { + autoread = true; + autowrite = true; + }; + } + ''; + }; + }; +} From 9c09915170353fc4f6bf4fc55376a33db4cbe15e Mon Sep 17 00:00:00 2001 From: LilleAila Date: Fri, 17 Jan 2025 17:36:47 +0100 Subject: [PATCH 02/54] Revert "collections/mini: init" This reverts commit 952a3f1ad01d6f3eb28a90bd3c87b872c801a925. --- flake.lock | 17 ---------- flake.nix | 6 ---- modules/modules.nix | 1 - modules/plugins/collections/default.nix | 5 --- .../plugins/collections/mini-nvim/config.nix | 32 ------------------- .../plugins/collections/mini-nvim/default.nix | 6 ---- .../collections/mini-nvim/mini-nvim.nix | 28 ---------------- 7 files changed, 95 deletions(-) delete mode 100644 modules/plugins/collections/default.nix delete mode 100644 modules/plugins/collections/mini-nvim/config.nix delete mode 100644 modules/plugins/collections/mini-nvim/default.nix delete mode 100644 modules/plugins/collections/mini-nvim/mini-nvim.nix diff --git a/flake.lock b/flake.lock index 448bd8b25..da38b9673 100644 --- a/flake.lock +++ b/flake.lock @@ -936,22 +936,6 @@ "type": "github" } }, - "plugin-mini-nvim": { - "flake": false, - "locked": { - "lastModified": 1736875588, - "narHash": "sha256-v5cMB/IK+muogipWPtU7rFTfYWO7wr+VyGfqPU/fE70=", - "owner": "echasnovski", - "repo": "mini.nvim", - "rev": "9e603a31d3fbc7ee61c9b556cd84e97fa2dcff53", - "type": "github" - }, - "original": { - "owner": "echasnovski", - "repo": "mini.nvim", - "type": "github" - } - }, "plugin-minimap-vim": { "flake": false, "locked": { @@ -2148,7 +2132,6 @@ "plugin-lz-n": "plugin-lz-n", "plugin-lzn-auto-require": "plugin-lzn-auto-require", "plugin-mind-nvim": "plugin-mind-nvim", - "plugin-mini-nvim": "plugin-mini-nvim", "plugin-minimap-vim": "plugin-minimap-vim", "plugin-modes-nvim": "plugin-modes-nvim", "plugin-neo-tree-nvim": "plugin-neo-tree-nvim", diff --git a/flake.nix b/flake.nix index 4d6873ea2..89690cadd 100644 --- a/flake.nix +++ b/flake.nix @@ -744,11 +744,5 @@ url = "github:stevearc/aerial.nvim"; flake = false; }; - - # Plugin collections - plugin-mini-nvim = { - url = "github:echasnovski/mini.nvim"; - flake = false; - }; }; } diff --git a/modules/modules.nix b/modules/modules.nix index 198608841..6e05c592d 100644 --- a/modules/modules.nix +++ b/modules/modules.nix @@ -19,7 +19,6 @@ plugins = map (p: ./plugins + "/${p}") [ "assistant" "autopairs" - "collections" "comments" "completion" "dashboard" diff --git a/modules/plugins/collections/default.nix b/modules/plugins/collections/default.nix deleted file mode 100644 index 7f5524a65..000000000 --- a/modules/plugins/collections/default.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ - imports = [ - ./mini-nvim - ]; -} diff --git a/modules/plugins/collections/mini-nvim/config.nix b/modules/plugins/collections/mini-nvim/config.nix deleted file mode 100644 index c04c81916..000000000 --- a/modules/plugins/collections/mini-nvim/config.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ - options, - config, - lib, - pkgs, - inputs, - ... -}: let - inherit (lib) mkMerge; - inherit (lib.modules) mkIf; - inherit (lib.strings) concatStringsSep; - inherit (lib.attrsets) mapAttrsToList; - inherit (lib.nvim.lua) toLuaObject; - - cfg = config.vim.collections.mini-nvim; -in { - config = mkIf cfg.enable { - vim.lazy.plugins."mini-nvim" = { - package = "mini-nvim"; - # package = pkgs.vimPlugins.mini-nvim; - # package = pkgs.vimUtils.buildVimPlugin { - # name = "mini-nvim"; - # src = inputs.plugin-mini-nvim; - # }; - lazy = false; - after = concatStringsSep "\n" (mapAttrsToList (name: value: '' - require("mini.${name}").setup(${toLuaObject value.setupOpts}) - '') - cfg.modules); - }; - }; -} diff --git a/modules/plugins/collections/mini-nvim/default.nix b/modules/plugins/collections/mini-nvim/default.nix deleted file mode 100644 index 91faca278..000000000 --- a/modules/plugins/collections/mini-nvim/default.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ - imports = [ - ./config.nix - ./mini-nvim.nix - ]; -} diff --git a/modules/plugins/collections/mini-nvim/mini-nvim.nix b/modules/plugins/collections/mini-nvim/mini-nvim.nix deleted file mode 100644 index b9764eed7..000000000 --- a/modules/plugins/collections/mini-nvim/mini-nvim.nix +++ /dev/null @@ -1,28 +0,0 @@ -{lib, ...}: let - inherit (lib.options) mkEnableOption mkOption literalExpression; - inherit (lib.types) attrsOf submodule; - inherit (lib.nvim.types) mkPluginSetupOption; -in { - options.vim.collections.mini-nvim = { - enable = mkEnableOption "mini.nvim, a collection of quality-of-life modules"; - modules = mkOption { - type = attrsOf (submodule { - options = { - setupOpts = mkPluginSetupOption "mini.nvim plugin" {}; - }; - }); - default = {}; - example = - literalExpression - '' - { - files = {}; - sessions = { - autoread = true; - autowrite = true; - }; - } - ''; - }; - }; -} From 8923d3b891b4f6ad0dfeb14aa8c049987cdecdbc Mon Sep 17 00:00:00 2001 From: LilleAila Date: Fri, 17 Jan 2025 18:57:59 +0100 Subject: [PATCH 03/54] mini/ai: init --- docs/release-notes/rl-0.8.md | 2 ++ flake.lock | 17 +++++++++++++++++ flake.nix | 6 ++++++ modules/modules.nix | 1 + modules/plugins/mini/ai/ai.nix | 13 +++++++++++++ modules/plugins/mini/ai/config.nix | 19 +++++++++++++++++++ modules/plugins/mini/ai/default.nix | 6 ++++++ modules/plugins/mini/default.nix | 5 +++++ 8 files changed, 69 insertions(+) create mode 100644 modules/plugins/mini/ai/ai.nix create mode 100644 modules/plugins/mini/ai/config.nix create mode 100644 modules/plugins/mini/ai/default.nix create mode 100644 modules/plugins/mini/default.nix diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md index d15c68421..067782d8f 100644 --- a/docs/release-notes/rl-0.8.md +++ b/docs/release-notes/rl-0.8.md @@ -53,6 +53,8 @@ issue with setting the workspace directory. - Add `vim.snippets.luasnip.setupOpts`, which was previously missing. - Add `"prettierd"` as a formatter option in `vim.languages.markdown.format.type`. +- Add the following plugins from [mini.nvim](https://github.com/echasnovski/mini.nvim) + - `mini.ai` [kaktu5](https://github.com/kaktu5): diff --git a/flake.lock b/flake.lock index da38b9673..351eae83a 100644 --- a/flake.lock +++ b/flake.lock @@ -936,6 +936,22 @@ "type": "github" } }, + "plugin-mini-ai": { + "flake": false, + "locked": { + "lastModified": 1733662803, + "narHash": "sha256-b/776l9nYM9e2atzXrvOk9dCxjzIuW/+iINC/yPv88Y=", + "owner": "echasnovski", + "repo": "mini.ai", + "rev": "ebb04799794a7f94628153991e6334c3304961b8", + "type": "github" + }, + "original": { + "owner": "echasnovski", + "repo": "mini.ai", + "type": "github" + } + }, "plugin-minimap-vim": { "flake": false, "locked": { @@ -2132,6 +2148,7 @@ "plugin-lz-n": "plugin-lz-n", "plugin-lzn-auto-require": "plugin-lzn-auto-require", "plugin-mind-nvim": "plugin-mind-nvim", + "plugin-mini-ai": "plugin-mini-ai", "plugin-minimap-vim": "plugin-minimap-vim", "plugin-modes-nvim": "plugin-modes-nvim", "plugin-neo-tree-nvim": "plugin-neo-tree-nvim", diff --git a/flake.nix b/flake.nix index 89690cadd..c236e71a1 100644 --- a/flake.nix +++ b/flake.nix @@ -744,5 +744,11 @@ url = "github:stevearc/aerial.nvim"; flake = false; }; + + # Mini.nvim + plugin-mini-ai = { + url = "github:echasnovski/mini.ai"; + flake = false; + }; }; } diff --git a/modules/modules.nix b/modules/modules.nix index 6e05c592d..65b0c9664 100644 --- a/modules/modules.nix +++ b/modules/modules.nix @@ -27,6 +27,7 @@ "git" "languages" "lsp" + "mini" "minimap" "notes" "projects" diff --git a/modules/plugins/mini/ai/ai.nix b/modules/plugins/mini/ai/ai.nix new file mode 100644 index 000000000..c8e60b8e2 --- /dev/null +++ b/modules/plugins/mini/ai/ai.nix @@ -0,0 +1,13 @@ +{ + config, + lib, + ... +}: let + inherit (lib.options) mkEnableOption mkOption; + inherit (lib.nvim.types) mkPluginSetupOption; +in { + options.vim.mini.ai = { + enable = mkEnableOption "mini.ai"; + setupOpts = mkPluginSetupOption "mini.ai" {}; + }; +} diff --git a/modules/plugins/mini/ai/config.nix b/modules/plugins/mini/ai/config.nix new file mode 100644 index 000000000..7385e1b1e --- /dev/null +++ b/modules/plugins/mini/ai/config.nix @@ -0,0 +1,19 @@ +{ + config, + lib, + ... +}: let + inherit (lib.modules) mkIf; + inherit (lib.nvim.dag) entryAnywhere; + inherit (lib.nvim.lua) toLuaObject; + + cfg = config.vim.mini.ai; +in { + vim = mkIf cfg.enable { + startPlugins = ["mini-ai"]; + + pluginRC.mini-ai = entryAnywhere '' + require("mini.ai").setup(${toLuaObject cfg.setupOpts}) + ''; + }; +} diff --git a/modules/plugins/mini/ai/default.nix b/modules/plugins/mini/ai/default.nix new file mode 100644 index 000000000..57da6c080 --- /dev/null +++ b/modules/plugins/mini/ai/default.nix @@ -0,0 +1,6 @@ +{ + imports = [ + ./ai.nix + ./config.nix + ]; +} diff --git a/modules/plugins/mini/default.nix b/modules/plugins/mini/default.nix new file mode 100644 index 000000000..f36323214 --- /dev/null +++ b/modules/plugins/mini/default.nix @@ -0,0 +1,5 @@ +{ + imports = [ + ./ai + ]; +} From c8d727f2e94293e95d0a836dcf9fcdd593a39f39 Mon Sep 17 00:00:00 2001 From: LilleAila Date: Fri, 17 Jan 2025 19:00:43 +0100 Subject: [PATCH 04/54] mini/align: init --- docs/release-notes/rl-0.8.md | 1 + flake.lock | 17 +++++++++++++++++ flake.nix | 5 +++++ modules/plugins/mini/align/align.nix | 13 +++++++++++++ modules/plugins/mini/align/config.nix | 19 +++++++++++++++++++ modules/plugins/mini/align/default.nix | 6 ++++++ modules/plugins/mini/default.nix | 1 + 7 files changed, 62 insertions(+) create mode 100644 modules/plugins/mini/align/align.nix create mode 100644 modules/plugins/mini/align/config.nix create mode 100644 modules/plugins/mini/align/default.nix diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md index 067782d8f..28b9408a2 100644 --- a/docs/release-notes/rl-0.8.md +++ b/docs/release-notes/rl-0.8.md @@ -55,6 +55,7 @@ - Add `"prettierd"` as a formatter option in `vim.languages.markdown.format.type`. - Add the following plugins from [mini.nvim](https://github.com/echasnovski/mini.nvim) - `mini.ai` + - `mini.align` [kaktu5](https://github.com/kaktu5): diff --git a/flake.lock b/flake.lock index 351eae83a..5bcb6a8cc 100644 --- a/flake.lock +++ b/flake.lock @@ -952,6 +952,22 @@ "type": "github" } }, + "plugin-mini-align": { + "flake": false, + "locked": { + "lastModified": 1735582248, + "narHash": "sha256-oHub8dEihIx4kcP3CD9GXG1SUObJUVpH4bg2Z6PmadQ=", + "owner": "echasnovski", + "repo": "mini.align", + "rev": "e715137aece7d05734403d793b8b6b64486bc812", + "type": "github" + }, + "original": { + "owner": "echasnovski", + "repo": "mini.align", + "type": "github" + } + }, "plugin-minimap-vim": { "flake": false, "locked": { @@ -2149,6 +2165,7 @@ "plugin-lzn-auto-require": "plugin-lzn-auto-require", "plugin-mind-nvim": "plugin-mind-nvim", "plugin-mini-ai": "plugin-mini-ai", + "plugin-mini-align": "plugin-mini-align", "plugin-minimap-vim": "plugin-minimap-vim", "plugin-modes-nvim": "plugin-modes-nvim", "plugin-neo-tree-nvim": "plugin-neo-tree-nvim", diff --git a/flake.nix b/flake.nix index c236e71a1..1586e3847 100644 --- a/flake.nix +++ b/flake.nix @@ -750,5 +750,10 @@ url = "github:echasnovski/mini.ai"; flake = false; }; + + plugin-mini-align = { + url = "github:echasnovski/mini.align"; + flake = false; + }; }; } diff --git a/modules/plugins/mini/align/align.nix b/modules/plugins/mini/align/align.nix new file mode 100644 index 000000000..c21e9532d --- /dev/null +++ b/modules/plugins/mini/align/align.nix @@ -0,0 +1,13 @@ +{ + config, + lib, + ... +}: let + inherit (lib.options) mkEnableOption mkOption; + inherit (lib.nvim.types) mkPluginSetupOption; +in { + options.vim.mini.align = { + enable = mkEnableOption "mini.align"; + setupOpts = mkPluginSetupOption "mini.align" {}; + }; +} diff --git a/modules/plugins/mini/align/config.nix b/modules/plugins/mini/align/config.nix new file mode 100644 index 000000000..0a7a5a690 --- /dev/null +++ b/modules/plugins/mini/align/config.nix @@ -0,0 +1,19 @@ +{ + config, + lib, + ... +}: let + inherit (lib.modules) mkIf; + inherit (lib.nvim.dag) entryAnywhere; + inherit (lib.nvim.lua) toLuaObject; + + cfg = config.vim.mini.align; +in { + vim = mkIf cfg.enable { + startPlugins = ["mini-align"]; + + pluginRC.mini-align = entryAnywhere '' + require("mini.align").setup(${toLuaObject cfg.setupOpts}) + ''; + }; +} diff --git a/modules/plugins/mini/align/default.nix b/modules/plugins/mini/align/default.nix new file mode 100644 index 000000000..9ddaff693 --- /dev/null +++ b/modules/plugins/mini/align/default.nix @@ -0,0 +1,6 @@ +{ + imports = [ + ./align.nix + ./config.nix + ]; +} diff --git a/modules/plugins/mini/default.nix b/modules/plugins/mini/default.nix index f36323214..051274cbb 100644 --- a/modules/plugins/mini/default.nix +++ b/modules/plugins/mini/default.nix @@ -1,5 +1,6 @@ { imports = [ ./ai + ./align ]; } From a1a0ab89b6d725f52f42efdcd86b27024afb651f Mon Sep 17 00:00:00 2001 From: LilleAila Date: Fri, 17 Jan 2025 19:03:44 +0100 Subject: [PATCH 05/54] mini/animate: init --- docs/release-notes/rl-0.8.md | 1 + flake.lock | 17 +++++++++++++++++ flake.nix | 5 +++++ modules/plugins/mini/animate/animate.nix | 13 +++++++++++++ modules/plugins/mini/animate/config.nix | 19 +++++++++++++++++++ modules/plugins/mini/animate/default.nix | 6 ++++++ modules/plugins/mini/default.nix | 1 + 7 files changed, 62 insertions(+) create mode 100644 modules/plugins/mini/animate/animate.nix create mode 100644 modules/plugins/mini/animate/config.nix create mode 100644 modules/plugins/mini/animate/default.nix diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md index 28b9408a2..969dfd45c 100644 --- a/docs/release-notes/rl-0.8.md +++ b/docs/release-notes/rl-0.8.md @@ -56,6 +56,7 @@ - Add the following plugins from [mini.nvim](https://github.com/echasnovski/mini.nvim) - `mini.ai` - `mini.align` + - `mini.animate` [kaktu5](https://github.com/kaktu5): diff --git a/flake.lock b/flake.lock index 5bcb6a8cc..27777b4b2 100644 --- a/flake.lock +++ b/flake.lock @@ -968,6 +968,22 @@ "type": "github" } }, + "plugin-mini-animate": { + "flake": false, + "locked": { + "lastModified": 1733078395, + "narHash": "sha256-ZePmJuHCCymTgaK46nSg5tRloxs+UKrVgVmT++rGKpc=", + "owner": "echasnovski", + "repo": "mini.animate", + "rev": "d14190ac3040116540889e2ebc25f488b195799e", + "type": "github" + }, + "original": { + "owner": "echasnovski", + "repo": "mini.animate", + "type": "github" + } + }, "plugin-minimap-vim": { "flake": false, "locked": { @@ -2166,6 +2182,7 @@ "plugin-mind-nvim": "plugin-mind-nvim", "plugin-mini-ai": "plugin-mini-ai", "plugin-mini-align": "plugin-mini-align", + "plugin-mini-animate": "plugin-mini-animate", "plugin-minimap-vim": "plugin-minimap-vim", "plugin-modes-nvim": "plugin-modes-nvim", "plugin-neo-tree-nvim": "plugin-neo-tree-nvim", diff --git a/flake.nix b/flake.nix index 1586e3847..36683e912 100644 --- a/flake.nix +++ b/flake.nix @@ -755,5 +755,10 @@ url = "github:echasnovski/mini.align"; flake = false; }; + + plugin-mini-animate = { + url = "github:echasnovski/mini.animate"; + flake = false; + }; }; } diff --git a/modules/plugins/mini/animate/animate.nix b/modules/plugins/mini/animate/animate.nix new file mode 100644 index 000000000..6be633b58 --- /dev/null +++ b/modules/plugins/mini/animate/animate.nix @@ -0,0 +1,13 @@ +{ + config, + lib, + ... +}: let + inherit (lib.options) mkEnableOption mkOption; + inherit (lib.nvim.types) mkPluginSetupOption; +in { + options.vim.mini.animate = { + enable = mkEnableOption "mini.animate"; + setupOpts = mkPluginSetupOption "mini.animate" {}; + }; +} diff --git a/modules/plugins/mini/animate/config.nix b/modules/plugins/mini/animate/config.nix new file mode 100644 index 000000000..e9cf2813e --- /dev/null +++ b/modules/plugins/mini/animate/config.nix @@ -0,0 +1,19 @@ +{ + config, + lib, + ... +}: let + inherit (lib.modules) mkIf; + inherit (lib.nvim.dag) entryAnywhere; + inherit (lib.nvim.lua) toLuaObject; + + cfg = config.vim.mini.animate; +in { + vim = mkIf cfg.enable { + startPlugins = ["mini-animate"]; + + pluginRC.mini-animate = entryAnywhere '' + require("mini.animate").setup(${toLuaObject cfg.setupOpts}) + ''; + }; +} diff --git a/modules/plugins/mini/animate/default.nix b/modules/plugins/mini/animate/default.nix new file mode 100644 index 000000000..5390fae10 --- /dev/null +++ b/modules/plugins/mini/animate/default.nix @@ -0,0 +1,6 @@ +{ + imports = [ + ./animate.nix + ./config.nix + ]; +} diff --git a/modules/plugins/mini/default.nix b/modules/plugins/mini/default.nix index 051274cbb..6a4e37208 100644 --- a/modules/plugins/mini/default.nix +++ b/modules/plugins/mini/default.nix @@ -2,5 +2,6 @@ imports = [ ./ai ./align + ./animate ]; } From c52e3c0507f8096d93cd43ad1f29cba22349a27c Mon Sep 17 00:00:00 2001 From: LilleAila Date: Fri, 17 Jan 2025 19:08:50 +0100 Subject: [PATCH 06/54] mini/base16: init --- docs/release-notes/rl-0.8.md | 1 + flake.lock | 17 +++++++++++++++++ flake.nix | 5 +++++ modules/plugins/mini/default.nix | 1 + modules/plugins/theme/supported-themes.nix | 8 ++++++++ 5 files changed, 32 insertions(+) diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md index 969dfd45c..e654f5956 100644 --- a/docs/release-notes/rl-0.8.md +++ b/docs/release-notes/rl-0.8.md @@ -57,6 +57,7 @@ - `mini.ai` - `mini.align` - `mini.animate` + - `mini.base16` [kaktu5](https://github.com/kaktu5): diff --git a/flake.lock b/flake.lock index 27777b4b2..862e75507 100644 --- a/flake.lock +++ b/flake.lock @@ -984,6 +984,22 @@ "type": "github" } }, + "plugin-mini-base16": { + "flake": false, + "locked": { + "lastModified": 1734960100, + "narHash": "sha256-VGs4k/xDujPcA0Nv5T18ybSv1iqnzg0AFmaweRdhvDM=", + "owner": "echasnovski", + "repo": "mini.base16", + "rev": "23453dacc1606e5d42238d82f0b42a2985386b62", + "type": "github" + }, + "original": { + "owner": "echasnovski", + "repo": "mini.base16", + "type": "github" + } + }, "plugin-minimap-vim": { "flake": false, "locked": { @@ -2183,6 +2199,7 @@ "plugin-mini-ai": "plugin-mini-ai", "plugin-mini-align": "plugin-mini-align", "plugin-mini-animate": "plugin-mini-animate", + "plugin-mini-base16": "plugin-mini-base16", "plugin-minimap-vim": "plugin-minimap-vim", "plugin-modes-nvim": "plugin-modes-nvim", "plugin-neo-tree-nvim": "plugin-neo-tree-nvim", diff --git a/flake.nix b/flake.nix index 36683e912..b5b9629ea 100644 --- a/flake.nix +++ b/flake.nix @@ -760,5 +760,10 @@ url = "github:echasnovski/mini.animate"; flake = false; }; + + plugin-mini-base16 = { + url = "github:echasnovski/mini.base16"; + flake = false; + }; }; } diff --git a/modules/plugins/mini/default.nix b/modules/plugins/mini/default.nix index 6a4e37208..ecf80efd6 100644 --- a/modules/plugins/mini/default.nix +++ b/modules/plugins/mini/default.nix @@ -3,5 +3,6 @@ ./ai ./align ./animate + # ./base16 # NOTE: configured in theme/ ]; } diff --git a/modules/plugins/theme/supported-themes.nix b/modules/plugins/theme/supported-themes.nix index e185eb0d8..87266e71f 100644 --- a/modules/plugins/theme/supported-themes.nix +++ b/modules/plugins/theme/supported-themes.nix @@ -12,6 +12,14 @@ in { require('base16-colorscheme').setup(${toLuaObject base16-colors}) ''; }; + mini-base16 = { + setup = {base16-colors, ...}: '' + -- Base16 theme + require('mini.base16').setup({ + palette = ${toLuaObject base16-colors} + }) + ''; + }; onedark = { setup = {style ? "dark", ...}: '' -- OneDark theme From be5ab793424e6d26c2a7eadae0ba71900a9def30 Mon Sep 17 00:00:00 2001 From: LilleAila Date: Fri, 17 Jan 2025 19:11:31 +0100 Subject: [PATCH 07/54] mini/basics: init --- docs/release-notes/rl-0.8.md | 1 + flake.lock | 17 +++++++++++++++++ flake.nix | 5 +++++ modules/plugins/mini/basics/basics.nix | 13 +++++++++++++ modules/plugins/mini/basics/config.nix | 19 +++++++++++++++++++ modules/plugins/mini/basics/default.nix | 6 ++++++ modules/plugins/mini/default.nix | 1 + 7 files changed, 62 insertions(+) create mode 100644 modules/plugins/mini/basics/basics.nix create mode 100644 modules/plugins/mini/basics/config.nix create mode 100644 modules/plugins/mini/basics/default.nix diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md index e654f5956..7523aa220 100644 --- a/docs/release-notes/rl-0.8.md +++ b/docs/release-notes/rl-0.8.md @@ -58,6 +58,7 @@ - `mini.align` - `mini.animate` - `mini.base16` + - `mini.basics` [kaktu5](https://github.com/kaktu5): diff --git a/flake.lock b/flake.lock index 862e75507..2c580ea08 100644 --- a/flake.lock +++ b/flake.lock @@ -1000,6 +1000,22 @@ "type": "github" } }, + "plugin-mini-basics": { + "flake": false, + "locked": { + "lastModified": 1730194519, + "narHash": "sha256-R8POaMcgb6SBOxIpanZsswieywapnU7zDNjQMRTkR8U=", + "owner": "echasnovski", + "repo": "mini.basics", + "rev": "67c10b3436d5d3b892715137f4773e71c6753b13", + "type": "github" + }, + "original": { + "owner": "echasnovski", + "repo": "mini.basics", + "type": "github" + } + }, "plugin-minimap-vim": { "flake": false, "locked": { @@ -2200,6 +2216,7 @@ "plugin-mini-align": "plugin-mini-align", "plugin-mini-animate": "plugin-mini-animate", "plugin-mini-base16": "plugin-mini-base16", + "plugin-mini-basics": "plugin-mini-basics", "plugin-minimap-vim": "plugin-minimap-vim", "plugin-modes-nvim": "plugin-modes-nvim", "plugin-neo-tree-nvim": "plugin-neo-tree-nvim", diff --git a/flake.nix b/flake.nix index b5b9629ea..c14323b26 100644 --- a/flake.nix +++ b/flake.nix @@ -765,5 +765,10 @@ url = "github:echasnovski/mini.base16"; flake = false; }; + + plugin-mini-basics = { + url = "github:echasnovski/mini.basics"; + flake = false; + }; }; } diff --git a/modules/plugins/mini/basics/basics.nix b/modules/plugins/mini/basics/basics.nix new file mode 100644 index 000000000..b2a4ff307 --- /dev/null +++ b/modules/plugins/mini/basics/basics.nix @@ -0,0 +1,13 @@ +{ + config, + lib, + ... +}: let + inherit (lib.options) mkEnableOption mkOption; + inherit (lib.nvim.types) mkPluginSetupOption; +in { + options.vim.mini.basics = { + enable = mkEnableOption "mini.basics"; + setupOpts = mkPluginSetupOption "mini.basics" {}; + }; +} diff --git a/modules/plugins/mini/basics/config.nix b/modules/plugins/mini/basics/config.nix new file mode 100644 index 000000000..9893ef429 --- /dev/null +++ b/modules/plugins/mini/basics/config.nix @@ -0,0 +1,19 @@ +{ + config, + lib, + ... +}: let + inherit (lib.modules) mkIf; + inherit (lib.nvim.dag) entryAnywhere; + inherit (lib.nvim.lua) toLuaObject; + + cfg = config.vim.mini.basics; +in { + vim = mkIf cfg.enable { + startPlugins = ["mini-basics"]; + + pluginRC.mini-basics = entryAnywhere '' + require("mini.basics").setup(${toLuaObject cfg.setupOpts}) + ''; + }; +} diff --git a/modules/plugins/mini/basics/default.nix b/modules/plugins/mini/basics/default.nix new file mode 100644 index 000000000..15bf750bf --- /dev/null +++ b/modules/plugins/mini/basics/default.nix @@ -0,0 +1,6 @@ +{ + imports = [ + ./basics.nix + ./config.nix + ]; +} diff --git a/modules/plugins/mini/default.nix b/modules/plugins/mini/default.nix index ecf80efd6..8ec59e169 100644 --- a/modules/plugins/mini/default.nix +++ b/modules/plugins/mini/default.nix @@ -4,5 +4,6 @@ ./align ./animate # ./base16 # NOTE: configured in theme/ + ./basics ]; } From eaae68aea27193429b414cfbaef2f46620ebaa15 Mon Sep 17 00:00:00 2001 From: LilleAila Date: Fri, 17 Jan 2025 19:14:30 +0100 Subject: [PATCH 08/54] mini/bracketed: init --- docs/release-notes/rl-0.8.md | 1 + flake.lock | 17 +++++++++++++++++ flake.nix | 5 +++++ modules/plugins/mini/bracketed/bracketed.nix | 13 +++++++++++++ modules/plugins/mini/bracketed/config.nix | 19 +++++++++++++++++++ modules/plugins/mini/bracketed/default.nix | 6 ++++++ modules/plugins/mini/default.nix | 1 + 7 files changed, 62 insertions(+) create mode 100644 modules/plugins/mini/bracketed/bracketed.nix create mode 100644 modules/plugins/mini/bracketed/config.nix create mode 100644 modules/plugins/mini/bracketed/default.nix diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md index 7523aa220..3d55f630d 100644 --- a/docs/release-notes/rl-0.8.md +++ b/docs/release-notes/rl-0.8.md @@ -59,6 +59,7 @@ - `mini.animate` - `mini.base16` - `mini.basics` + - `mini.bracketed` [kaktu5](https://github.com/kaktu5): diff --git a/flake.lock b/flake.lock index 2c580ea08..5fe53f6a3 100644 --- a/flake.lock +++ b/flake.lock @@ -1016,6 +1016,22 @@ "type": "github" } }, + "plugin-mini-bracketed": { + "flake": false, + "locked": { + "lastModified": 1737036218, + "narHash": "sha256-y+tGFF1H37ES/hnEtr3GJK3GeB6D5s8ZdSpvzl+lh3s=", + "owner": "echasnovski", + "repo": "mini.bracketed", + "rev": "0091e11fabe34973fc038a8d0d0485202742e403", + "type": "github" + }, + "original": { + "owner": "echasnovski", + "repo": "mini.bracketed", + "type": "github" + } + }, "plugin-minimap-vim": { "flake": false, "locked": { @@ -2217,6 +2233,7 @@ "plugin-mini-animate": "plugin-mini-animate", "plugin-mini-base16": "plugin-mini-base16", "plugin-mini-basics": "plugin-mini-basics", + "plugin-mini-bracketed": "plugin-mini-bracketed", "plugin-minimap-vim": "plugin-minimap-vim", "plugin-modes-nvim": "plugin-modes-nvim", "plugin-neo-tree-nvim": "plugin-neo-tree-nvim", diff --git a/flake.nix b/flake.nix index c14323b26..2875a0103 100644 --- a/flake.nix +++ b/flake.nix @@ -770,5 +770,10 @@ url = "github:echasnovski/mini.basics"; flake = false; }; + + plugin-mini-bracketed = { + url = "github:echasnovski/mini.bracketed"; + flake = false; + }; }; } diff --git a/modules/plugins/mini/bracketed/bracketed.nix b/modules/plugins/mini/bracketed/bracketed.nix new file mode 100644 index 000000000..950f4e7fd --- /dev/null +++ b/modules/plugins/mini/bracketed/bracketed.nix @@ -0,0 +1,13 @@ +{ + config, + lib, + ... +}: let + inherit (lib.options) mkEnableOption mkOption; + inherit (lib.nvim.types) mkPluginSetupOption; +in { + options.vim.mini.bracketed = { + enable = mkEnableOption "mini.bracketed"; + setupOpts = mkPluginSetupOption "mini.bracketed" {}; + }; +} diff --git a/modules/plugins/mini/bracketed/config.nix b/modules/plugins/mini/bracketed/config.nix new file mode 100644 index 000000000..09c6262f2 --- /dev/null +++ b/modules/plugins/mini/bracketed/config.nix @@ -0,0 +1,19 @@ +{ + config, + lib, + ... +}: let + inherit (lib.modules) mkIf; + inherit (lib.nvim.dag) entryAnywhere; + inherit (lib.nvim.lua) toLuaObject; + + cfg = config.vim.mini.bracketed; +in { + vim = mkIf cfg.enable { + startPlugins = ["mini-bracketed"]; + + pluginRC.mini-bracketed = entryAnywhere '' + require("mini.bracketed").setup(${toLuaObject cfg.setupOpts}) + ''; + }; +} diff --git a/modules/plugins/mini/bracketed/default.nix b/modules/plugins/mini/bracketed/default.nix new file mode 100644 index 000000000..057dbd312 --- /dev/null +++ b/modules/plugins/mini/bracketed/default.nix @@ -0,0 +1,6 @@ +{ + imports = [ + ./bracketed.nix + ./config.nix + ]; +} diff --git a/modules/plugins/mini/default.nix b/modules/plugins/mini/default.nix index 8ec59e169..dce0e0810 100644 --- a/modules/plugins/mini/default.nix +++ b/modules/plugins/mini/default.nix @@ -5,5 +5,6 @@ ./animate # ./base16 # NOTE: configured in theme/ ./basics + ./bracketed ]; } From beedffcb5be18e0f2e813252412e0f84a4e44bb4 Mon Sep 17 00:00:00 2001 From: LilleAila Date: Fri, 17 Jan 2025 19:17:05 +0100 Subject: [PATCH 09/54] mini/bufremove: init --- docs/release-notes/rl-0.8.md | 1 + flake.lock | 17 +++++++++++++++++ flake.nix | 5 +++++ modules/plugins/mini/bufremove/bufremove.nix | 13 +++++++++++++ modules/plugins/mini/bufremove/config.nix | 19 +++++++++++++++++++ modules/plugins/mini/bufremove/default.nix | 6 ++++++ modules/plugins/mini/default.nix | 1 + 7 files changed, 62 insertions(+) create mode 100644 modules/plugins/mini/bufremove/bufremove.nix create mode 100644 modules/plugins/mini/bufremove/config.nix create mode 100644 modules/plugins/mini/bufremove/default.nix diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md index 3d55f630d..5624aa072 100644 --- a/docs/release-notes/rl-0.8.md +++ b/docs/release-notes/rl-0.8.md @@ -60,6 +60,7 @@ - `mini.base16` - `mini.basics` - `mini.bracketed` + - `mini.bufremove` [kaktu5](https://github.com/kaktu5): diff --git a/flake.lock b/flake.lock index 5fe53f6a3..d53052348 100644 --- a/flake.lock +++ b/flake.lock @@ -1032,6 +1032,22 @@ "type": "github" } }, + "plugin-mini-bufremove": { + "flake": false, + "locked": { + "lastModified": 1730726192, + "narHash": "sha256-CB6ZIlrCQlh2W44Knnb10REDcvj4jcYkW/9CiOaoH2E=", + "owner": "echasnovski", + "repo": "mini.bufremove", + "rev": "285bdac9596ee7375db50c0f76ed04336dcd2685", + "type": "github" + }, + "original": { + "owner": "echasnovski", + "repo": "mini.bufremove", + "type": "github" + } + }, "plugin-minimap-vim": { "flake": false, "locked": { @@ -2234,6 +2250,7 @@ "plugin-mini-base16": "plugin-mini-base16", "plugin-mini-basics": "plugin-mini-basics", "plugin-mini-bracketed": "plugin-mini-bracketed", + "plugin-mini-bufremove": "plugin-mini-bufremove", "plugin-minimap-vim": "plugin-minimap-vim", "plugin-modes-nvim": "plugin-modes-nvim", "plugin-neo-tree-nvim": "plugin-neo-tree-nvim", diff --git a/flake.nix b/flake.nix index 2875a0103..01f9beadf 100644 --- a/flake.nix +++ b/flake.nix @@ -775,5 +775,10 @@ url = "github:echasnovski/mini.bracketed"; flake = false; }; + + plugin-mini-bufremove = { + url = "github:echasnovski/mini.bufremove"; + flake = false; + }; }; } diff --git a/modules/plugins/mini/bufremove/bufremove.nix b/modules/plugins/mini/bufremove/bufremove.nix new file mode 100644 index 000000000..79b849367 --- /dev/null +++ b/modules/plugins/mini/bufremove/bufremove.nix @@ -0,0 +1,13 @@ +{ + config, + lib, + ... +}: let + inherit (lib.options) mkEnableOption mkOption; + inherit (lib.nvim.types) mkPluginSetupOption; +in { + options.vim.mini.bufremove = { + enable = mkEnableOption "mini.bufremove"; + setupOpts = mkPluginSetupOption "mini.bufremove" {}; + }; +} diff --git a/modules/plugins/mini/bufremove/config.nix b/modules/plugins/mini/bufremove/config.nix new file mode 100644 index 000000000..b65b261af --- /dev/null +++ b/modules/plugins/mini/bufremove/config.nix @@ -0,0 +1,19 @@ +{ + config, + lib, + ... +}: let + inherit (lib.modules) mkIf; + inherit (lib.nvim.dag) entryAnywhere; + inherit (lib.nvim.lua) toLuaObject; + + cfg = config.vim.mini.bufremove; +in { + vim = mkIf cfg.enable { + startPlugins = ["mini-bufremove"]; + + pluginRC.mini-bufremove = entryAnywhere '' + require("mini.bufremove").setup(${toLuaObject cfg.setupOpts}) + ''; + }; +} diff --git a/modules/plugins/mini/bufremove/default.nix b/modules/plugins/mini/bufremove/default.nix new file mode 100644 index 000000000..7f4e79f97 --- /dev/null +++ b/modules/plugins/mini/bufremove/default.nix @@ -0,0 +1,6 @@ +{ + imports = [ + ./bufremove.nix + ./config.nix + ]; +} diff --git a/modules/plugins/mini/default.nix b/modules/plugins/mini/default.nix index dce0e0810..da5ccb83a 100644 --- a/modules/plugins/mini/default.nix +++ b/modules/plugins/mini/default.nix @@ -6,5 +6,6 @@ # ./base16 # NOTE: configured in theme/ ./basics ./bracketed + ./bufremove ]; } From 3d47d3f8c3b2c0bd9eb3de0588343003736a6f39 Mon Sep 17 00:00:00 2001 From: LilleAila Date: Fri, 17 Jan 2025 19:19:20 +0100 Subject: [PATCH 10/54] mini/clue: init --- docs/release-notes/rl-0.8.md | 1 + flake.lock | 17 +++++++++++++++++ flake.nix | 5 +++++ modules/plugins/mini/clue/clue.nix | 13 +++++++++++++ modules/plugins/mini/clue/config.nix | 19 +++++++++++++++++++ modules/plugins/mini/clue/default.nix | 6 ++++++ modules/plugins/mini/default.nix | 1 + 7 files changed, 62 insertions(+) create mode 100644 modules/plugins/mini/clue/clue.nix create mode 100644 modules/plugins/mini/clue/config.nix create mode 100644 modules/plugins/mini/clue/default.nix diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md index 5624aa072..559c4c4b9 100644 --- a/docs/release-notes/rl-0.8.md +++ b/docs/release-notes/rl-0.8.md @@ -61,6 +61,7 @@ - `mini.basics` - `mini.bracketed` - `mini.bufremove` + - `mini.clue` [kaktu5](https://github.com/kaktu5): diff --git a/flake.lock b/flake.lock index d53052348..238f06b81 100644 --- a/flake.lock +++ b/flake.lock @@ -1048,6 +1048,22 @@ "type": "github" } }, + "plugin-mini-clue": { + "flake": false, + "locked": { + "lastModified": 1737130586, + "narHash": "sha256-/0DpZV/jXuhaqBz5j4JN3xmofATlwPMHNSm/uTXALg0=", + "owner": "echasnovski", + "repo": "mini.clue", + "rev": "63e42dad781b9ed4845d90ef1da8c52dfb6dce3f", + "type": "github" + }, + "original": { + "owner": "echasnovski", + "repo": "mini.clue", + "type": "github" + } + }, "plugin-minimap-vim": { "flake": false, "locked": { @@ -2251,6 +2267,7 @@ "plugin-mini-basics": "plugin-mini-basics", "plugin-mini-bracketed": "plugin-mini-bracketed", "plugin-mini-bufremove": "plugin-mini-bufremove", + "plugin-mini-clue": "plugin-mini-clue", "plugin-minimap-vim": "plugin-minimap-vim", "plugin-modes-nvim": "plugin-modes-nvim", "plugin-neo-tree-nvim": "plugin-neo-tree-nvim", diff --git a/flake.nix b/flake.nix index 01f9beadf..b88b9d8a6 100644 --- a/flake.nix +++ b/flake.nix @@ -780,5 +780,10 @@ url = "github:echasnovski/mini.bufremove"; flake = false; }; + + plugin-mini-clue = { + url = "github:echasnovski/mini.clue"; + flake = false; + }; }; } diff --git a/modules/plugins/mini/clue/clue.nix b/modules/plugins/mini/clue/clue.nix new file mode 100644 index 000000000..de4cf2ee1 --- /dev/null +++ b/modules/plugins/mini/clue/clue.nix @@ -0,0 +1,13 @@ +{ + config, + lib, + ... +}: let + inherit (lib.options) mkEnableOption mkOption; + inherit (lib.nvim.types) mkPluginSetupOption; +in { + options.vim.mini.clue = { + enable = mkEnableOption "mini.clue"; + setupOpts = mkPluginSetupOption "mini.clue" {}; + }; +} diff --git a/modules/plugins/mini/clue/config.nix b/modules/plugins/mini/clue/config.nix new file mode 100644 index 000000000..efdc29468 --- /dev/null +++ b/modules/plugins/mini/clue/config.nix @@ -0,0 +1,19 @@ +{ + config, + lib, + ... +}: let + inherit (lib.modules) mkIf; + inherit (lib.nvim.dag) entryAnywhere; + inherit (lib.nvim.lua) toLuaObject; + + cfg = config.vim.mini.clue; +in { + vim = mkIf cfg.enable { + startPlugins = ["mini-clue"]; + + pluginRC.mini-clue = entryAnywhere '' + require("mini.clue").setup(${toLuaObject cfg.setupOpts}) + ''; + }; +} diff --git a/modules/plugins/mini/clue/default.nix b/modules/plugins/mini/clue/default.nix new file mode 100644 index 000000000..55ac57e74 --- /dev/null +++ b/modules/plugins/mini/clue/default.nix @@ -0,0 +1,6 @@ +{ + imports = [ + ./clue.nix + ./config.nix + ]; +} diff --git a/modules/plugins/mini/default.nix b/modules/plugins/mini/default.nix index da5ccb83a..8c3a9a4a8 100644 --- a/modules/plugins/mini/default.nix +++ b/modules/plugins/mini/default.nix @@ -7,5 +7,6 @@ ./basics ./bracketed ./bufremove + ./clue ]; } From 86fc7a3764b9bb3d328284bdbec4dd25cee7175d Mon Sep 17 00:00:00 2001 From: LilleAila Date: Fri, 17 Jan 2025 19:23:03 +0100 Subject: [PATCH 11/54] mini/colors: init --- docs/release-notes/rl-0.8.md | 1 + flake.lock | 17 +++++++++++++++++ flake.nix | 5 +++++ modules/plugins/mini/colors/colors.nix | 11 +++++++++++ modules/plugins/mini/colors/config.nix | 18 ++++++++++++++++++ modules/plugins/mini/colors/default.nix | 6 ++++++ modules/plugins/mini/default.nix | 1 + 7 files changed, 59 insertions(+) create mode 100644 modules/plugins/mini/colors/colors.nix create mode 100644 modules/plugins/mini/colors/config.nix create mode 100644 modules/plugins/mini/colors/default.nix diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md index 559c4c4b9..16bae05c2 100644 --- a/docs/release-notes/rl-0.8.md +++ b/docs/release-notes/rl-0.8.md @@ -62,6 +62,7 @@ - `mini.bracketed` - `mini.bufremove` - `mini.clue` + - `mini.colors` [kaktu5](https://github.com/kaktu5): diff --git a/flake.lock b/flake.lock index 238f06b81..5ff55331f 100644 --- a/flake.lock +++ b/flake.lock @@ -1064,6 +1064,22 @@ "type": "github" } }, + "plugin-mini-colors": { + "flake": false, + "locked": { + "lastModified": 1730726192, + "narHash": "sha256-B2JahCUhKpYwOJrl+BhSp3UQFiyyMGJAYKGK+uMv3fk=", + "owner": "echasnovski", + "repo": "mini.colors", + "rev": "d64b1c0f520579d905f97208eca85329e664ab88", + "type": "github" + }, + "original": { + "owner": "echasnovski", + "repo": "mini.colors", + "type": "github" + } + }, "plugin-minimap-vim": { "flake": false, "locked": { @@ -2268,6 +2284,7 @@ "plugin-mini-bracketed": "plugin-mini-bracketed", "plugin-mini-bufremove": "plugin-mini-bufremove", "plugin-mini-clue": "plugin-mini-clue", + "plugin-mini-colors": "plugin-mini-colors", "plugin-minimap-vim": "plugin-minimap-vim", "plugin-modes-nvim": "plugin-modes-nvim", "plugin-neo-tree-nvim": "plugin-neo-tree-nvim", diff --git a/flake.nix b/flake.nix index b88b9d8a6..11d9a5a32 100644 --- a/flake.nix +++ b/flake.nix @@ -785,5 +785,10 @@ url = "github:echasnovski/mini.clue"; flake = false; }; + + plugin-mini-colors = { + url = "github:echasnovski/mini.colors"; + flake = false; + }; }; } diff --git a/modules/plugins/mini/colors/colors.nix b/modules/plugins/mini/colors/colors.nix new file mode 100644 index 000000000..81fe58404 --- /dev/null +++ b/modules/plugins/mini/colors/colors.nix @@ -0,0 +1,11 @@ +{ + config, + lib, + ... +}: let + inherit (lib.options) mkEnableOption mkOption; +in { + options.vim.mini.colors = { + enable = mkEnableOption "mini.colors"; + }; +} diff --git a/modules/plugins/mini/colors/config.nix b/modules/plugins/mini/colors/config.nix new file mode 100644 index 000000000..60953c16d --- /dev/null +++ b/modules/plugins/mini/colors/config.nix @@ -0,0 +1,18 @@ +{ + config, + lib, + ... +}: let + inherit (lib.modules) mkIf; + inherit (lib.nvim.dag) entryAnywhere; + + cfg = config.vim.mini.colors; +in { + vim = mkIf cfg.enable { + startPlugins = ["mini-colors"]; + + pluginRC.mini-colors = entryAnywhere '' + require("mini.colors").setup() + ''; + }; +} diff --git a/modules/plugins/mini/colors/default.nix b/modules/plugins/mini/colors/default.nix new file mode 100644 index 000000000..4eed47704 --- /dev/null +++ b/modules/plugins/mini/colors/default.nix @@ -0,0 +1,6 @@ +{ + imports = [ + ./colors.nix + ./config.nix + ]; +} diff --git a/modules/plugins/mini/default.nix b/modules/plugins/mini/default.nix index 8c3a9a4a8..748cd2f80 100644 --- a/modules/plugins/mini/default.nix +++ b/modules/plugins/mini/default.nix @@ -8,5 +8,6 @@ ./bracketed ./bufremove ./clue + ./colors ]; } From 68483183c11d6303e559567f63b8490d92892a02 Mon Sep 17 00:00:00 2001 From: LilleAila Date: Fri, 17 Jan 2025 19:25:56 +0100 Subject: [PATCH 12/54] mini/comment: init --- docs/release-notes/rl-0.8.md | 1 + flake.lock | 17 +++++++++++++++++ flake.nix | 5 +++++ modules/plugins/mini/comment/comment.nix | 13 +++++++++++++ modules/plugins/mini/comment/config.nix | 19 +++++++++++++++++++ modules/plugins/mini/comment/default.nix | 6 ++++++ modules/plugins/mini/default.nix | 1 + 7 files changed, 62 insertions(+) create mode 100644 modules/plugins/mini/comment/comment.nix create mode 100644 modules/plugins/mini/comment/config.nix create mode 100644 modules/plugins/mini/comment/default.nix diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md index 16bae05c2..a9c796f1e 100644 --- a/docs/release-notes/rl-0.8.md +++ b/docs/release-notes/rl-0.8.md @@ -63,6 +63,7 @@ - `mini.bufremove` - `mini.clue` - `mini.colors` + - `mini.comment` [kaktu5](https://github.com/kaktu5): diff --git a/flake.lock b/flake.lock index 5ff55331f..9a0a76b19 100644 --- a/flake.lock +++ b/flake.lock @@ -1080,6 +1080,22 @@ "type": "github" } }, + "plugin-mini-comment": { + "flake": false, + "locked": { + "lastModified": 1736611383, + "narHash": "sha256-vAgBDSVtXCP+rlu+cmXdoZQBGShyH7KfL8E/gvDMfnM=", + "owner": "echasnovski", + "repo": "mini.comment", + "rev": "6e1f9a8ebbf6f693fa3787ceda8ca3bf3cb6aec7", + "type": "github" + }, + "original": { + "owner": "echasnovski", + "repo": "mini.comment", + "type": "github" + } + }, "plugin-minimap-vim": { "flake": false, "locked": { @@ -2285,6 +2301,7 @@ "plugin-mini-bufremove": "plugin-mini-bufremove", "plugin-mini-clue": "plugin-mini-clue", "plugin-mini-colors": "plugin-mini-colors", + "plugin-mini-comment": "plugin-mini-comment", "plugin-minimap-vim": "plugin-minimap-vim", "plugin-modes-nvim": "plugin-modes-nvim", "plugin-neo-tree-nvim": "plugin-neo-tree-nvim", diff --git a/flake.nix b/flake.nix index 11d9a5a32..ef61bd9c8 100644 --- a/flake.nix +++ b/flake.nix @@ -790,5 +790,10 @@ url = "github:echasnovski/mini.colors"; flake = false; }; + + plugin-mini-comment = { + url = "github:echasnovski/mini.comment"; + flake = false; + }; }; } diff --git a/modules/plugins/mini/comment/comment.nix b/modules/plugins/mini/comment/comment.nix new file mode 100644 index 000000000..2231a3600 --- /dev/null +++ b/modules/plugins/mini/comment/comment.nix @@ -0,0 +1,13 @@ +{ + config, + lib, + ... +}: let + inherit (lib.options) mkEnableOption mkOption; + inherit (lib.nvim.types) mkPluginSetupOption; +in { + options.vim.mini.comment = { + enable = mkEnableOption "mini.comment"; + setupOpts = mkPluginSetupOption "mini.comment" {}; + }; +} diff --git a/modules/plugins/mini/comment/config.nix b/modules/plugins/mini/comment/config.nix new file mode 100644 index 000000000..7babd8a95 --- /dev/null +++ b/modules/plugins/mini/comment/config.nix @@ -0,0 +1,19 @@ +{ + config, + lib, + ... +}: let + inherit (lib.modules) mkIf; + inherit (lib.nvim.dag) entryAnywhere; + inherit (lib.nvim.lua) toLuaObject; + + cfg = config.vim.mini.comment; +in { + vim = mkIf cfg.enable { + startPlugins = ["mini-comment"]; + + pluginRC.mini-comment = entryAnywhere '' + require("mini.comment").setup(${toLuaObject cfg.setupOpts}) + ''; + }; +} diff --git a/modules/plugins/mini/comment/default.nix b/modules/plugins/mini/comment/default.nix new file mode 100644 index 000000000..0a0e6d99a --- /dev/null +++ b/modules/plugins/mini/comment/default.nix @@ -0,0 +1,6 @@ +{ + imports = [ + ./comment.nix + ./config.nix + ]; +} diff --git a/modules/plugins/mini/default.nix b/modules/plugins/mini/default.nix index 748cd2f80..dd3bbf586 100644 --- a/modules/plugins/mini/default.nix +++ b/modules/plugins/mini/default.nix @@ -9,5 +9,6 @@ ./bufremove ./clue ./colors + ./comment ]; } From 887e563076a1a1c33fafc2c1b98dcf7a01c5ac7b Mon Sep 17 00:00:00 2001 From: LilleAila Date: Fri, 17 Jan 2025 19:28:07 +0100 Subject: [PATCH 13/54] mini/completion: init --- docs/release-notes/rl-0.8.md | 1 + flake.lock | 17 +++++++++++++++++ flake.nix | 5 +++++ .../plugins/mini/completion/completion.nix | 13 +++++++++++++ modules/plugins/mini/completion/config.nix | 19 +++++++++++++++++++ modules/plugins/mini/completion/default.nix | 6 ++++++ modules/plugins/mini/default.nix | 1 + 7 files changed, 62 insertions(+) create mode 100644 modules/plugins/mini/completion/completion.nix create mode 100644 modules/plugins/mini/completion/config.nix create mode 100644 modules/plugins/mini/completion/default.nix diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md index a9c796f1e..ea0f7d50f 100644 --- a/docs/release-notes/rl-0.8.md +++ b/docs/release-notes/rl-0.8.md @@ -64,6 +64,7 @@ - `mini.clue` - `mini.colors` - `mini.comment` + - `mini.completion` [kaktu5](https://github.com/kaktu5): diff --git a/flake.lock b/flake.lock index 9a0a76b19..86ca362bd 100644 --- a/flake.lock +++ b/flake.lock @@ -1096,6 +1096,22 @@ "type": "github" } }, + "plugin-mini-completion": { + "flake": false, + "locked": { + "lastModified": 1732271068, + "narHash": "sha256-dlQCfHUQX9rPiSYZSRipezHX0CG/redbV2g7cpwwExY=", + "owner": "echasnovski", + "repo": "mini.completion", + "rev": "6eb9546685c4e1c4af2365b87166d4afa39d8a1b", + "type": "github" + }, + "original": { + "owner": "echasnovski", + "repo": "mini.completion", + "type": "github" + } + }, "plugin-minimap-vim": { "flake": false, "locked": { @@ -2302,6 +2318,7 @@ "plugin-mini-clue": "plugin-mini-clue", "plugin-mini-colors": "plugin-mini-colors", "plugin-mini-comment": "plugin-mini-comment", + "plugin-mini-completion": "plugin-mini-completion", "plugin-minimap-vim": "plugin-minimap-vim", "plugin-modes-nvim": "plugin-modes-nvim", "plugin-neo-tree-nvim": "plugin-neo-tree-nvim", diff --git a/flake.nix b/flake.nix index ef61bd9c8..87b546931 100644 --- a/flake.nix +++ b/flake.nix @@ -795,5 +795,10 @@ url = "github:echasnovski/mini.comment"; flake = false; }; + + plugin-mini-completion = { + url = "github:echasnovski/mini.completion"; + flake = false; + }; }; } diff --git a/modules/plugins/mini/completion/completion.nix b/modules/plugins/mini/completion/completion.nix new file mode 100644 index 000000000..a5f8caa57 --- /dev/null +++ b/modules/plugins/mini/completion/completion.nix @@ -0,0 +1,13 @@ +{ + config, + lib, + ... +}: let + inherit (lib.options) mkEnableOption mkOption; + inherit (lib.nvim.types) mkPluginSetupOption; +in { + options.vim.mini.completion = { + enable = mkEnableOption "mini.completion"; + setupOpts = mkPluginSetupOption "mini.completion" {}; + }; +} diff --git a/modules/plugins/mini/completion/config.nix b/modules/plugins/mini/completion/config.nix new file mode 100644 index 000000000..e0d0b9040 --- /dev/null +++ b/modules/plugins/mini/completion/config.nix @@ -0,0 +1,19 @@ +{ + config, + lib, + ... +}: let + inherit (lib.modules) mkIf; + inherit (lib.nvim.dag) entryAnywhere; + inherit (lib.nvim.lua) toLuaObject; + + cfg = config.vim.mini.completion; +in { + vim = mkIf cfg.enable { + startPlugins = ["mini-completion"]; + + pluginRC.mini-completion = entryAnywhere '' + require("mini.completion").setup(${toLuaObject cfg.setupOpts}) + ''; + }; +} diff --git a/modules/plugins/mini/completion/default.nix b/modules/plugins/mini/completion/default.nix new file mode 100644 index 000000000..1251f7515 --- /dev/null +++ b/modules/plugins/mini/completion/default.nix @@ -0,0 +1,6 @@ +{ + imports = [ + ./completion.nix + ./config.nix + ]; +} diff --git a/modules/plugins/mini/default.nix b/modules/plugins/mini/default.nix index dd3bbf586..0564a46ab 100644 --- a/modules/plugins/mini/default.nix +++ b/modules/plugins/mini/default.nix @@ -10,5 +10,6 @@ ./clue ./colors ./comment + ./completion ]; } From 4b4423af91d2ba6600752cb64e28dfb8749e5f07 Mon Sep 17 00:00:00 2001 From: LilleAila Date: Fri, 17 Jan 2025 19:32:56 +0100 Subject: [PATCH 14/54] mini/diff: init --- docs/release-notes/rl-0.8.md | 1 + flake.lock | 17 +++++++++++++++++ flake.nix | 5 +++++ modules/plugins/mini/default.nix | 1 + modules/plugins/mini/diff/config.nix | 19 +++++++++++++++++++ modules/plugins/mini/diff/default.nix | 6 ++++++ modules/plugins/mini/diff/diff.nix | 13 +++++++++++++ 7 files changed, 62 insertions(+) create mode 100644 modules/plugins/mini/diff/config.nix create mode 100644 modules/plugins/mini/diff/default.nix create mode 100644 modules/plugins/mini/diff/diff.nix diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md index ea0f7d50f..54ce0492c 100644 --- a/docs/release-notes/rl-0.8.md +++ b/docs/release-notes/rl-0.8.md @@ -65,6 +65,7 @@ - `mini.colors` - `mini.comment` - `mini.completion` + - `mini.diff` [kaktu5](https://github.com/kaktu5): diff --git a/flake.lock b/flake.lock index 86ca362bd..370118959 100644 --- a/flake.lock +++ b/flake.lock @@ -1112,6 +1112,22 @@ "type": "github" } }, + "plugin-mini-diff": { + "flake": false, + "locked": { + "lastModified": 1735324663, + "narHash": "sha256-dRvW/1lfVShiHmRU0mQA5g5xDyQ0EVtVLLZ0y6WSedg=", + "owner": "echasnovski", + "repo": "mini.diff", + "rev": "00f072250061ef498f91ed226918c9ec31a416a4", + "type": "github" + }, + "original": { + "owner": "echasnovski", + "repo": "mini.diff", + "type": "github" + } + }, "plugin-minimap-vim": { "flake": false, "locked": { @@ -2319,6 +2335,7 @@ "plugin-mini-colors": "plugin-mini-colors", "plugin-mini-comment": "plugin-mini-comment", "plugin-mini-completion": "plugin-mini-completion", + "plugin-mini-diff": "plugin-mini-diff", "plugin-minimap-vim": "plugin-minimap-vim", "plugin-modes-nvim": "plugin-modes-nvim", "plugin-neo-tree-nvim": "plugin-neo-tree-nvim", diff --git a/flake.nix b/flake.nix index 87b546931..36ca93c50 100644 --- a/flake.nix +++ b/flake.nix @@ -800,5 +800,10 @@ url = "github:echasnovski/mini.completion"; flake = false; }; + + plugin-mini-diff = { + url = "github:echasnovski/mini.diff"; + flake = false; + }; }; } diff --git a/modules/plugins/mini/default.nix b/modules/plugins/mini/default.nix index 0564a46ab..b8e665bfa 100644 --- a/modules/plugins/mini/default.nix +++ b/modules/plugins/mini/default.nix @@ -11,5 +11,6 @@ ./colors ./comment ./completion + ./diff ]; } diff --git a/modules/plugins/mini/diff/config.nix b/modules/plugins/mini/diff/config.nix new file mode 100644 index 000000000..6c5969f63 --- /dev/null +++ b/modules/plugins/mini/diff/config.nix @@ -0,0 +1,19 @@ +{ + config, + lib, + ... +}: let + inherit (lib.modules) mkIf; + inherit (lib.nvim.dag) entryAnywhere; + inherit (lib.nvim.lua) toLuaObject; + + cfg = config.vim.mini.diff; +in { + vim = mkIf cfg.enable { + startPlugins = ["mini-diff"]; + + pluginRC.mini-diff = entryAnywhere '' + require("mini.diff").setup(${toLuaObject cfg.setupOpts}) + ''; + }; +} diff --git a/modules/plugins/mini/diff/default.nix b/modules/plugins/mini/diff/default.nix new file mode 100644 index 000000000..c77c8c679 --- /dev/null +++ b/modules/plugins/mini/diff/default.nix @@ -0,0 +1,6 @@ +{ + imports = [ + ./diff.nix + ./config.nix + ]; +} diff --git a/modules/plugins/mini/diff/diff.nix b/modules/plugins/mini/diff/diff.nix new file mode 100644 index 000000000..8438cec92 --- /dev/null +++ b/modules/plugins/mini/diff/diff.nix @@ -0,0 +1,13 @@ +{ + config, + lib, + ... +}: let + inherit (lib.options) mkEnableOption mkOption; + inherit (lib.nvim.types) mkPluginSetupOption; +in { + options.vim.mini.diff = { + enable = mkEnableOption "mini.diff"; + setupOpts = mkPluginSetupOption "mini.diff" {}; + }; +} From 753eb3e99d3de030ee0030624f2f32d1c308aed0 Mon Sep 17 00:00:00 2001 From: LilleAila Date: Fri, 17 Jan 2025 20:14:59 +0100 Subject: [PATCH 15/54] mini/doc: init --- docs/release-notes/rl-0.8.md | 1 + flake.lock | 17 +++++++++++++++++ flake.nix | 5 +++++ modules/plugins/mini/default.nix | 1 + modules/plugins/mini/doc/config.nix | 19 +++++++++++++++++++ modules/plugins/mini/doc/default.nix | 6 ++++++ modules/plugins/mini/doc/doc.nix | 13 +++++++++++++ 7 files changed, 62 insertions(+) create mode 100644 modules/plugins/mini/doc/config.nix create mode 100644 modules/plugins/mini/doc/default.nix create mode 100644 modules/plugins/mini/doc/doc.nix diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md index 54ce0492c..51a9d8db7 100644 --- a/docs/release-notes/rl-0.8.md +++ b/docs/release-notes/rl-0.8.md @@ -66,6 +66,7 @@ - `mini.comment` - `mini.completion` - `mini.diff` + - `mini.doc` [kaktu5](https://github.com/kaktu5): diff --git a/flake.lock b/flake.lock index 370118959..3ddb9ac8c 100644 --- a/flake.lock +++ b/flake.lock @@ -1128,6 +1128,22 @@ "type": "github" } }, + "plugin-mini-doc": { + "flake": false, + "locked": { + "lastModified": 1723308950, + "narHash": "sha256-Q3DAEV1ZHS+lFhZKFCNoIjn41ksk7WRrVP2b2d6uSss=", + "owner": "echasnovski", + "repo": "mini.doc", + "rev": "bb73a3d1ff390f7e2740027ea2567017099a237c", + "type": "github" + }, + "original": { + "owner": "echasnovski", + "repo": "mini.doc", + "type": "github" + } + }, "plugin-minimap-vim": { "flake": false, "locked": { @@ -2336,6 +2352,7 @@ "plugin-mini-comment": "plugin-mini-comment", "plugin-mini-completion": "plugin-mini-completion", "plugin-mini-diff": "plugin-mini-diff", + "plugin-mini-doc": "plugin-mini-doc", "plugin-minimap-vim": "plugin-minimap-vim", "plugin-modes-nvim": "plugin-modes-nvim", "plugin-neo-tree-nvim": "plugin-neo-tree-nvim", diff --git a/flake.nix b/flake.nix index 36ca93c50..7e8323ed2 100644 --- a/flake.nix +++ b/flake.nix @@ -805,5 +805,10 @@ url = "github:echasnovski/mini.diff"; flake = false; }; + + plugin-mini-doc = { + url = "github:echasnovski/mini.doc"; + flake = false; + }; }; } diff --git a/modules/plugins/mini/default.nix b/modules/plugins/mini/default.nix index b8e665bfa..fb4f70002 100644 --- a/modules/plugins/mini/default.nix +++ b/modules/plugins/mini/default.nix @@ -12,5 +12,6 @@ ./comment ./completion ./diff + ./doc ]; } diff --git a/modules/plugins/mini/doc/config.nix b/modules/plugins/mini/doc/config.nix new file mode 100644 index 000000000..e9df43b89 --- /dev/null +++ b/modules/plugins/mini/doc/config.nix @@ -0,0 +1,19 @@ +{ + config, + lib, + ... +}: let + inherit (lib.modules) mkIf; + inherit (lib.nvim.dag) entryAnywhere; + inherit (lib.nvim.lua) toLuaObject; + + cfg = config.vim.mini.doc; +in { + vim = mkIf cfg.enable { + startPlugins = ["mini-doc"]; + + pluginRC.mini-doc = entryAnywhere '' + require("mini.doc").setup(${toLuaObject cfg.setupOpts}) + ''; + }; +} diff --git a/modules/plugins/mini/doc/default.nix b/modules/plugins/mini/doc/default.nix new file mode 100644 index 000000000..bccfa8839 --- /dev/null +++ b/modules/plugins/mini/doc/default.nix @@ -0,0 +1,6 @@ +{ + imports = [ + ./doc.nix + ./config.nix + ]; +} diff --git a/modules/plugins/mini/doc/doc.nix b/modules/plugins/mini/doc/doc.nix new file mode 100644 index 000000000..f1e65730b --- /dev/null +++ b/modules/plugins/mini/doc/doc.nix @@ -0,0 +1,13 @@ +{ + config, + lib, + ... +}: let + inherit (lib.options) mkEnableOption mkOption; + inherit (lib.nvim.types) mkPluginSetupOption; +in { + options.vim.mini.doc = { + enable = mkEnableOption "mini.doc"; + setupOpts = mkPluginSetupOption "mini.doc" {}; + }; +} From 3533d5bcbd76bb3eb0f48ca9b44f4cca1e147e94 Mon Sep 17 00:00:00 2001 From: LilleAila Date: Fri, 17 Jan 2025 20:17:19 +0100 Subject: [PATCH 16/54] mini/extra: init --- docs/release-notes/rl-0.8.md | 1 + flake.lock | 17 +++++++++++++++++ flake.nix | 5 +++++ modules/plugins/mini/default.nix | 1 + modules/plugins/mini/extra/config.nix | 18 ++++++++++++++++++ modules/plugins/mini/extra/default.nix | 6 ++++++ modules/plugins/mini/extra/extra.nix | 11 +++++++++++ 7 files changed, 59 insertions(+) create mode 100644 modules/plugins/mini/extra/config.nix create mode 100644 modules/plugins/mini/extra/default.nix create mode 100644 modules/plugins/mini/extra/extra.nix diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md index 51a9d8db7..0e87c9c55 100644 --- a/docs/release-notes/rl-0.8.md +++ b/docs/release-notes/rl-0.8.md @@ -67,6 +67,7 @@ - `mini.completion` - `mini.diff` - `mini.doc` + - `mini.extra` [kaktu5](https://github.com/kaktu5): diff --git a/flake.lock b/flake.lock index 3ddb9ac8c..7442f67e2 100644 --- a/flake.lock +++ b/flake.lock @@ -1144,6 +1144,22 @@ "type": "github" } }, + "plugin-mini-extra": { + "flake": false, + "locked": { + "lastModified": 1736279066, + "narHash": "sha256-lUJrviUjAmJ70g2y93aNw3e1mHGHoB9lbh44HGP7zQs=", + "owner": "echasnovski", + "repo": "mini.extra", + "rev": "477e3dda7b597b49bc1373951ea7da4da834c352", + "type": "github" + }, + "original": { + "owner": "echasnovski", + "repo": "mini.extra", + "type": "github" + } + }, "plugin-minimap-vim": { "flake": false, "locked": { @@ -2353,6 +2369,7 @@ "plugin-mini-completion": "plugin-mini-completion", "plugin-mini-diff": "plugin-mini-diff", "plugin-mini-doc": "plugin-mini-doc", + "plugin-mini-extra": "plugin-mini-extra", "plugin-minimap-vim": "plugin-minimap-vim", "plugin-modes-nvim": "plugin-modes-nvim", "plugin-neo-tree-nvim": "plugin-neo-tree-nvim", diff --git a/flake.nix b/flake.nix index 7e8323ed2..ca26f8593 100644 --- a/flake.nix +++ b/flake.nix @@ -810,5 +810,10 @@ url = "github:echasnovski/mini.doc"; flake = false; }; + + plugin-mini-extra = { + url = "github:echasnovski/mini.extra"; + flake = false; + }; }; } diff --git a/modules/plugins/mini/default.nix b/modules/plugins/mini/default.nix index fb4f70002..d945a2222 100644 --- a/modules/plugins/mini/default.nix +++ b/modules/plugins/mini/default.nix @@ -13,5 +13,6 @@ ./completion ./diff ./doc + ./extra ]; } diff --git a/modules/plugins/mini/extra/config.nix b/modules/plugins/mini/extra/config.nix new file mode 100644 index 000000000..c430847d4 --- /dev/null +++ b/modules/plugins/mini/extra/config.nix @@ -0,0 +1,18 @@ +{ + config, + lib, + ... +}: let + inherit (lib.modules) mkIf; + inherit (lib.nvim.dag) entryAnywhere; + + cfg = config.vim.mini.extra; +in { + vim = mkIf cfg.enable { + startPlugins = ["mini-extra"]; + + pluginRC.mini-extra = entryAnywhere '' + require("mini.extra").setup() + ''; + }; +} diff --git a/modules/plugins/mini/extra/default.nix b/modules/plugins/mini/extra/default.nix new file mode 100644 index 000000000..73992e723 --- /dev/null +++ b/modules/plugins/mini/extra/default.nix @@ -0,0 +1,6 @@ +{ + imports = [ + ./extra.nix + ./config.nix + ]; +} diff --git a/modules/plugins/mini/extra/extra.nix b/modules/plugins/mini/extra/extra.nix new file mode 100644 index 000000000..c57e6cdca --- /dev/null +++ b/modules/plugins/mini/extra/extra.nix @@ -0,0 +1,11 @@ +{ + config, + lib, + ... +}: let + inherit (lib.options) mkEnableOption mkOption; +in { + options.vim.mini.extra = { + enable = mkEnableOption "mini.extra"; + }; +} From 7472cac221bbd7777c7ad832d5883013e6279ae0 Mon Sep 17 00:00:00 2001 From: LilleAila Date: Fri, 17 Jan 2025 20:19:02 +0100 Subject: [PATCH 17/54] mini/files: init --- docs/release-notes/rl-0.8.md | 1 + flake.lock | 17 +++++++++++++++++ flake.nix | 5 +++++ modules/plugins/mini/default.nix | 1 + modules/plugins/mini/files/config.nix | 19 +++++++++++++++++++ modules/plugins/mini/files/default.nix | 6 ++++++ modules/plugins/mini/files/files.nix | 13 +++++++++++++ 7 files changed, 62 insertions(+) create mode 100644 modules/plugins/mini/files/config.nix create mode 100644 modules/plugins/mini/files/default.nix create mode 100644 modules/plugins/mini/files/files.nix diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md index 0e87c9c55..1d76bfa21 100644 --- a/docs/release-notes/rl-0.8.md +++ b/docs/release-notes/rl-0.8.md @@ -68,6 +68,7 @@ - `mini.diff` - `mini.doc` - `mini.extra` + - `mini.files` [kaktu5](https://github.com/kaktu5): diff --git a/flake.lock b/flake.lock index 7442f67e2..c8652ec2a 100644 --- a/flake.lock +++ b/flake.lock @@ -1160,6 +1160,22 @@ "type": "github" } }, + "plugin-mini-files": { + "flake": false, + "locked": { + "lastModified": 1736535707, + "narHash": "sha256-UHW78m4BiYMMrABwdkyyzQUENgQrVFbWJnmNdRMtr0w=", + "owner": "echasnovski", + "repo": "mini.files", + "rev": "d0f03a5c38836fd2cce3dc80734124959002078c", + "type": "github" + }, + "original": { + "owner": "echasnovski", + "repo": "mini.files", + "type": "github" + } + }, "plugin-minimap-vim": { "flake": false, "locked": { @@ -2370,6 +2386,7 @@ "plugin-mini-diff": "plugin-mini-diff", "plugin-mini-doc": "plugin-mini-doc", "plugin-mini-extra": "plugin-mini-extra", + "plugin-mini-files": "plugin-mini-files", "plugin-minimap-vim": "plugin-minimap-vim", "plugin-modes-nvim": "plugin-modes-nvim", "plugin-neo-tree-nvim": "plugin-neo-tree-nvim", diff --git a/flake.nix b/flake.nix index ca26f8593..ea1d9e905 100644 --- a/flake.nix +++ b/flake.nix @@ -815,5 +815,10 @@ url = "github:echasnovski/mini.extra"; flake = false; }; + + plugin-mini-files = { + url = "github:echasnovski/mini.files"; + flake = false; + }; }; } diff --git a/modules/plugins/mini/default.nix b/modules/plugins/mini/default.nix index d945a2222..515b5cb41 100644 --- a/modules/plugins/mini/default.nix +++ b/modules/plugins/mini/default.nix @@ -14,5 +14,6 @@ ./diff ./doc ./extra + ./files ]; } diff --git a/modules/plugins/mini/files/config.nix b/modules/plugins/mini/files/config.nix new file mode 100644 index 000000000..eb195f8db --- /dev/null +++ b/modules/plugins/mini/files/config.nix @@ -0,0 +1,19 @@ +{ + config, + lib, + ... +}: let + inherit (lib.modules) mkIf; + inherit (lib.nvim.dag) entryAnywhere; + inherit (lib.nvim.lua) toLuaObject; + + cfg = config.vim.mini.files; +in { + vim = mkIf cfg.enable { + startPlugins = ["mini-files"]; + + pluginRC.mini-files = entryAnywhere '' + require("mini.files").setup(${toLuaObject cfg.setupOpts}) + ''; + }; +} diff --git a/modules/plugins/mini/files/default.nix b/modules/plugins/mini/files/default.nix new file mode 100644 index 000000000..6c0ebbc0a --- /dev/null +++ b/modules/plugins/mini/files/default.nix @@ -0,0 +1,6 @@ +{ + imports = [ + ./files.nix + ./config.nix + ]; +} diff --git a/modules/plugins/mini/files/files.nix b/modules/plugins/mini/files/files.nix new file mode 100644 index 000000000..f9c3f8ca6 --- /dev/null +++ b/modules/plugins/mini/files/files.nix @@ -0,0 +1,13 @@ +{ + config, + lib, + ... +}: let + inherit (lib.options) mkEnableOption mkOption; + inherit (lib.nvim.types) mkPluginSetupOption; +in { + options.vim.mini.files = { + enable = mkEnableOption "mini.files"; + setupOpts = mkPluginSetupOption "mini.files" {}; + }; +} From 173ea3f43cfe16640dfa810170177a8e6c2cf105 Mon Sep 17 00:00:00 2001 From: LilleAila Date: Fri, 17 Jan 2025 20:21:12 +0100 Subject: [PATCH 18/54] mini/fuzzy: init --- docs/release-notes/rl-0.8.md | 1 + flake.lock | 17 +++++++++++++++++ flake.nix | 5 +++++ modules/plugins/mini/default.nix | 1 + modules/plugins/mini/fuzzy/config.nix | 19 +++++++++++++++++++ modules/plugins/mini/fuzzy/default.nix | 6 ++++++ modules/plugins/mini/fuzzy/fuzzy.nix | 13 +++++++++++++ 7 files changed, 62 insertions(+) create mode 100644 modules/plugins/mini/fuzzy/config.nix create mode 100644 modules/plugins/mini/fuzzy/default.nix create mode 100644 modules/plugins/mini/fuzzy/fuzzy.nix diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md index 1d76bfa21..5c0fb5559 100644 --- a/docs/release-notes/rl-0.8.md +++ b/docs/release-notes/rl-0.8.md @@ -69,6 +69,7 @@ - `mini.doc` - `mini.extra` - `mini.files` + - `mini.fuzzy` [kaktu5](https://github.com/kaktu5): diff --git a/flake.lock b/flake.lock index c8652ec2a..7ac9b0e5f 100644 --- a/flake.lock +++ b/flake.lock @@ -1176,6 +1176,22 @@ "type": "github" } }, + "plugin-mini-fuzzy": { + "flake": false, + "locked": { + "lastModified": 1730726192, + "narHash": "sha256-XvDkDfwPcBxySuz58f2mpWTeo8EsOnMvZUcNI8HNZg8=", + "owner": "echasnovski", + "repo": "mini.fuzzy", + "rev": "faa5a6c0d29c28012c90bd011162963a58715428", + "type": "github" + }, + "original": { + "owner": "echasnovski", + "repo": "mini.fuzzy", + "type": "github" + } + }, "plugin-minimap-vim": { "flake": false, "locked": { @@ -2387,6 +2403,7 @@ "plugin-mini-doc": "plugin-mini-doc", "plugin-mini-extra": "plugin-mini-extra", "plugin-mini-files": "plugin-mini-files", + "plugin-mini-fuzzy": "plugin-mini-fuzzy", "plugin-minimap-vim": "plugin-minimap-vim", "plugin-modes-nvim": "plugin-modes-nvim", "plugin-neo-tree-nvim": "plugin-neo-tree-nvim", diff --git a/flake.nix b/flake.nix index ea1d9e905..73eef4975 100644 --- a/flake.nix +++ b/flake.nix @@ -820,5 +820,10 @@ url = "github:echasnovski/mini.files"; flake = false; }; + + plugin-mini-fuzzy = { + url = "github:echasnovski/mini.fuzzy"; + flake = false; + }; }; } diff --git a/modules/plugins/mini/default.nix b/modules/plugins/mini/default.nix index 515b5cb41..69dd8ce64 100644 --- a/modules/plugins/mini/default.nix +++ b/modules/plugins/mini/default.nix @@ -15,5 +15,6 @@ ./doc ./extra ./files + ./fuzzy ]; } diff --git a/modules/plugins/mini/fuzzy/config.nix b/modules/plugins/mini/fuzzy/config.nix new file mode 100644 index 000000000..0397f4b93 --- /dev/null +++ b/modules/plugins/mini/fuzzy/config.nix @@ -0,0 +1,19 @@ +{ + config, + lib, + ... +}: let + inherit (lib.modules) mkIf; + inherit (lib.nvim.dag) entryAnywhere; + inherit (lib.nvim.lua) toLuaObject; + + cfg = config.vim.mini.fuzzy; +in { + vim = mkIf cfg.enable { + startPlugins = ["mini-fuzzy"]; + + pluginRC.mini-fuzzy = entryAnywhere '' + require("mini.fuzzy").setup(${toLuaObject cfg.setupOpts}) + ''; + }; +} diff --git a/modules/plugins/mini/fuzzy/default.nix b/modules/plugins/mini/fuzzy/default.nix new file mode 100644 index 000000000..126d348fa --- /dev/null +++ b/modules/plugins/mini/fuzzy/default.nix @@ -0,0 +1,6 @@ +{ + imports = [ + ./fuzzy.nix + ./config.nix + ]; +} diff --git a/modules/plugins/mini/fuzzy/fuzzy.nix b/modules/plugins/mini/fuzzy/fuzzy.nix new file mode 100644 index 000000000..c5c486fc9 --- /dev/null +++ b/modules/plugins/mini/fuzzy/fuzzy.nix @@ -0,0 +1,13 @@ +{ + config, + lib, + ... +}: let + inherit (lib.options) mkEnableOption mkOption; + inherit (lib.nvim.types) mkPluginSetupOption; +in { + options.vim.mini.fuzzy = { + enable = mkEnableOption "mini.fuzzy"; + setupOpts = mkPluginSetupOption "mini.fuzzy" {}; + }; +} From c4905362303a735a951d6afc9c6d6b5e75f9096c Mon Sep 17 00:00:00 2001 From: LilleAila Date: Fri, 17 Jan 2025 20:23:40 +0100 Subject: [PATCH 19/54] mini/git: init --- docs/release-notes/rl-0.8.md | 1 + flake.lock | 17 +++++++++++++++++ flake.nix | 5 +++++ modules/plugins/mini/default.nix | 1 + modules/plugins/mini/git/config.nix | 19 +++++++++++++++++++ modules/plugins/mini/git/default.nix | 6 ++++++ modules/plugins/mini/git/git.nix | 13 +++++++++++++ 7 files changed, 62 insertions(+) create mode 100644 modules/plugins/mini/git/config.nix create mode 100644 modules/plugins/mini/git/default.nix create mode 100644 modules/plugins/mini/git/git.nix diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md index 5c0fb5559..a2bc984eb 100644 --- a/docs/release-notes/rl-0.8.md +++ b/docs/release-notes/rl-0.8.md @@ -70,6 +70,7 @@ - `mini.extra` - `mini.files` - `mini.fuzzy` + - `mini.git` [kaktu5](https://github.com/kaktu5): diff --git a/flake.lock b/flake.lock index 7ac9b0e5f..5feff935a 100644 --- a/flake.lock +++ b/flake.lock @@ -1192,6 +1192,22 @@ "type": "github" } }, + "plugin-mini-git": { + "flake": false, + "locked": { + "lastModified": 1736535710, + "narHash": "sha256-rXuKopyZBCBbpKuytCdm8keruSNK1ohk2NdeZv1wifI=", + "owner": "echasnovski", + "repo": "mini-git", + "rev": "fc13dde6cfe87cf25a4fd1ee177c0d157468436b", + "type": "github" + }, + "original": { + "owner": "echasnovski", + "repo": "mini-git", + "type": "github" + } + }, "plugin-minimap-vim": { "flake": false, "locked": { @@ -2404,6 +2420,7 @@ "plugin-mini-extra": "plugin-mini-extra", "plugin-mini-files": "plugin-mini-files", "plugin-mini-fuzzy": "plugin-mini-fuzzy", + "plugin-mini-git": "plugin-mini-git", "plugin-minimap-vim": "plugin-minimap-vim", "plugin-modes-nvim": "plugin-modes-nvim", "plugin-neo-tree-nvim": "plugin-neo-tree-nvim", diff --git a/flake.nix b/flake.nix index 73eef4975..519fc5dd0 100644 --- a/flake.nix +++ b/flake.nix @@ -825,5 +825,10 @@ url = "github:echasnovski/mini.fuzzy"; flake = false; }; + + plugin-mini-git = { + url = "github:echasnovski/mini-git"; + flake = false; + }; }; } diff --git a/modules/plugins/mini/default.nix b/modules/plugins/mini/default.nix index 69dd8ce64..df37de8eb 100644 --- a/modules/plugins/mini/default.nix +++ b/modules/plugins/mini/default.nix @@ -16,5 +16,6 @@ ./extra ./files ./fuzzy + ./git ]; } diff --git a/modules/plugins/mini/git/config.nix b/modules/plugins/mini/git/config.nix new file mode 100644 index 000000000..41a3d6cba --- /dev/null +++ b/modules/plugins/mini/git/config.nix @@ -0,0 +1,19 @@ +{ + config, + lib, + ... +}: let + inherit (lib.modules) mkIf; + inherit (lib.nvim.dag) entryAnywhere; + inherit (lib.nvim.lua) toLuaObject; + + cfg = config.vim.mini.git; +in { + vim = mkIf cfg.enable { + startPlugins = ["mini-git"]; + + pluginRC.mini-git = entryAnywhere '' + require("mini.git").setup(${toLuaObject cfg.setupOpts}) + ''; + }; +} diff --git a/modules/plugins/mini/git/default.nix b/modules/plugins/mini/git/default.nix new file mode 100644 index 000000000..e7622aa0b --- /dev/null +++ b/modules/plugins/mini/git/default.nix @@ -0,0 +1,6 @@ +{ + imports = [ + ./git.nix + ./config.nix + ]; +} diff --git a/modules/plugins/mini/git/git.nix b/modules/plugins/mini/git/git.nix new file mode 100644 index 000000000..f77a7502e --- /dev/null +++ b/modules/plugins/mini/git/git.nix @@ -0,0 +1,13 @@ +{ + config, + lib, + ... +}: let + inherit (lib.options) mkEnableOption mkOption; + inherit (lib.nvim.types) mkPluginSetupOption; +in { + options.vim.mini.git = { + enable = mkEnableOption "mini.git"; + setupOpts = mkPluginSetupOption "mini.git" {}; + }; +} From fca63ede6c94f617ac2edb2539b76c51bf6f87c3 Mon Sep 17 00:00:00 2001 From: LilleAila Date: Fri, 17 Jan 2025 20:26:09 +0100 Subject: [PATCH 20/54] mini/hipatterns: init --- docs/release-notes/rl-0.8.md | 1 + flake.lock | 17 +++++++++++++++++ flake.nix | 5 +++++ modules/plugins/mini/default.nix | 1 + modules/plugins/mini/hipatterns/config.nix | 19 +++++++++++++++++++ modules/plugins/mini/hipatterns/default.nix | 6 ++++++ .../plugins/mini/hipatterns/hipatterns.nix | 13 +++++++++++++ 7 files changed, 62 insertions(+) create mode 100644 modules/plugins/mini/hipatterns/config.nix create mode 100644 modules/plugins/mini/hipatterns/default.nix create mode 100644 modules/plugins/mini/hipatterns/hipatterns.nix diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md index a2bc984eb..25fa9b5f2 100644 --- a/docs/release-notes/rl-0.8.md +++ b/docs/release-notes/rl-0.8.md @@ -71,6 +71,7 @@ - `mini.files` - `mini.fuzzy` - `mini.git` + - `mini.hipatterns` [kaktu5](https://github.com/kaktu5): diff --git a/flake.lock b/flake.lock index 5feff935a..1fc26c136 100644 --- a/flake.lock +++ b/flake.lock @@ -1208,6 +1208,22 @@ "type": "github" } }, + "plugin-mini-hipatterns": { + "flake": false, + "locked": { + "lastModified": 1733141274, + "narHash": "sha256-zJ8OMzfcBh9NtSg2FHDjB5DFX9C2qZRo8t8lc097sCI=", + "owner": "echasnovski", + "repo": "mini.hipatterns", + "rev": "f34975103a38b3f608219a1324cdfc58ea660b8b", + "type": "github" + }, + "original": { + "owner": "echasnovski", + "repo": "mini.hipatterns", + "type": "github" + } + }, "plugin-minimap-vim": { "flake": false, "locked": { @@ -2421,6 +2437,7 @@ "plugin-mini-files": "plugin-mini-files", "plugin-mini-fuzzy": "plugin-mini-fuzzy", "plugin-mini-git": "plugin-mini-git", + "plugin-mini-hipatterns": "plugin-mini-hipatterns", "plugin-minimap-vim": "plugin-minimap-vim", "plugin-modes-nvim": "plugin-modes-nvim", "plugin-neo-tree-nvim": "plugin-neo-tree-nvim", diff --git a/flake.nix b/flake.nix index 519fc5dd0..c2bc4ade8 100644 --- a/flake.nix +++ b/flake.nix @@ -830,5 +830,10 @@ url = "github:echasnovski/mini-git"; flake = false; }; + + plugin-mini-hipatterns = { + url = "github:echasnovski/mini.hipatterns"; + flake = false; + }; }; } diff --git a/modules/plugins/mini/default.nix b/modules/plugins/mini/default.nix index df37de8eb..bc18dbbc3 100644 --- a/modules/plugins/mini/default.nix +++ b/modules/plugins/mini/default.nix @@ -17,5 +17,6 @@ ./files ./fuzzy ./git + ./hipatterns ]; } diff --git a/modules/plugins/mini/hipatterns/config.nix b/modules/plugins/mini/hipatterns/config.nix new file mode 100644 index 000000000..37876778e --- /dev/null +++ b/modules/plugins/mini/hipatterns/config.nix @@ -0,0 +1,19 @@ +{ + config, + lib, + ... +}: let + inherit (lib.modules) mkIf; + inherit (lib.nvim.dag) entryAnywhere; + inherit (lib.nvim.lua) toLuaObject; + + cfg = config.vim.mini.hipatterns; +in { + vim = mkIf cfg.enable { + startPlugins = ["mini-hipatterns"]; + + pluginRC.mini-hipatterns = entryAnywhere '' + require("mini.hipatterns").setup(${toLuaObject cfg.setupOpts}) + ''; + }; +} diff --git a/modules/plugins/mini/hipatterns/default.nix b/modules/plugins/mini/hipatterns/default.nix new file mode 100644 index 000000000..29cd9d7f0 --- /dev/null +++ b/modules/plugins/mini/hipatterns/default.nix @@ -0,0 +1,6 @@ +{ + imports = [ + ./hipatterns.nix + ./config.nix + ]; +} diff --git a/modules/plugins/mini/hipatterns/hipatterns.nix b/modules/plugins/mini/hipatterns/hipatterns.nix new file mode 100644 index 000000000..31921a898 --- /dev/null +++ b/modules/plugins/mini/hipatterns/hipatterns.nix @@ -0,0 +1,13 @@ +{ + config, + lib, + ... +}: let + inherit (lib.options) mkEnableOption mkOption; + inherit (lib.nvim.types) mkPluginSetupOption; +in { + options.vim.mini.hipatterns = { + enable = mkEnableOption "mini.hipatterns"; + setupOpts = mkPluginSetupOption "mini.hipatterns" {}; + }; +} From 755052cea97f1cc7475a2ca121602f0a98147f07 Mon Sep 17 00:00:00 2001 From: LilleAila Date: Fri, 17 Jan 2025 20:32:10 +0100 Subject: [PATCH 21/54] mini/hues: init --- docs/release-notes/rl-0.8.md | 1 + flake.lock | 17 ++++++++++++++ flake.nix | 5 ++++ modules/plugins/mini/default.nix | 1 + modules/plugins/mini/hues/config.nix | 19 +++++++++++++++ modules/plugins/mini/hues/default.nix | 6 +++++ modules/plugins/mini/hues/hues.nix | 33 +++++++++++++++++++++++++++ 7 files changed, 82 insertions(+) create mode 100644 modules/plugins/mini/hues/config.nix create mode 100644 modules/plugins/mini/hues/default.nix create mode 100644 modules/plugins/mini/hues/hues.nix diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md index 25fa9b5f2..1c843924a 100644 --- a/docs/release-notes/rl-0.8.md +++ b/docs/release-notes/rl-0.8.md @@ -72,6 +72,7 @@ - `mini.fuzzy` - `mini.git` - `mini.hipatterns` + - `mini.hues` [kaktu5](https://github.com/kaktu5): diff --git a/flake.lock b/flake.lock index 1fc26c136..edb5d0c2b 100644 --- a/flake.lock +++ b/flake.lock @@ -1224,6 +1224,22 @@ "type": "github" } }, + "plugin-mini-hues": { + "flake": false, + "locked": { + "lastModified": 1734960100, + "narHash": "sha256-4y79ejOkRL/fajZ4jC8t4K6EgNbnTsH++mIjmo6G3q0=", + "owner": "echasnovski", + "repo": "mini.hues", + "rev": "ae6ad4c666ff42c1102344fe1eba18bb486f2e46", + "type": "github" + }, + "original": { + "owner": "echasnovski", + "repo": "mini.hues", + "type": "github" + } + }, "plugin-minimap-vim": { "flake": false, "locked": { @@ -2438,6 +2454,7 @@ "plugin-mini-fuzzy": "plugin-mini-fuzzy", "plugin-mini-git": "plugin-mini-git", "plugin-mini-hipatterns": "plugin-mini-hipatterns", + "plugin-mini-hues": "plugin-mini-hues", "plugin-minimap-vim": "plugin-minimap-vim", "plugin-modes-nvim": "plugin-modes-nvim", "plugin-neo-tree-nvim": "plugin-neo-tree-nvim", diff --git a/flake.nix b/flake.nix index c2bc4ade8..98057d457 100644 --- a/flake.nix +++ b/flake.nix @@ -835,5 +835,10 @@ url = "github:echasnovski/mini.hipatterns"; flake = false; }; + + plugin-mini-hues = { + url = "github:echasnovski/mini.hues"; + flake = false; + }; }; } diff --git a/modules/plugins/mini/default.nix b/modules/plugins/mini/default.nix index bc18dbbc3..39c05cfe8 100644 --- a/modules/plugins/mini/default.nix +++ b/modules/plugins/mini/default.nix @@ -18,5 +18,6 @@ ./fuzzy ./git ./hipatterns + ./hues ]; } diff --git a/modules/plugins/mini/hues/config.nix b/modules/plugins/mini/hues/config.nix new file mode 100644 index 000000000..90eea7372 --- /dev/null +++ b/modules/plugins/mini/hues/config.nix @@ -0,0 +1,19 @@ +{ + config, + lib, + ... +}: let + inherit (lib.modules) mkIf; + inherit (lib.nvim.dag) entryAnywhere; + inherit (lib.nvim.lua) toLuaObject; + + cfg = config.vim.mini.hues; +in { + vim = mkIf cfg.enable { + startPlugins = ["mini-hues"]; + + pluginRC.mini-hues = entryAnywhere '' + require("mini.hues").setup(${toLuaObject cfg.setupOpts}) + ''; + }; +} diff --git a/modules/plugins/mini/hues/default.nix b/modules/plugins/mini/hues/default.nix new file mode 100644 index 000000000..3eba39a67 --- /dev/null +++ b/modules/plugins/mini/hues/default.nix @@ -0,0 +1,6 @@ +{ + imports = [ + ./hues.nix + ./config.nix + ]; +} diff --git a/modules/plugins/mini/hues/hues.nix b/modules/plugins/mini/hues/hues.nix new file mode 100644 index 000000000..f848923a1 --- /dev/null +++ b/modules/plugins/mini/hues/hues.nix @@ -0,0 +1,33 @@ +{ + config, + lib, + ... +}: let + inherit (lib.options) mkEnableOption mkOption; + inherit (lib.strings) hasPrefix; + inherit (lib.nvim.types) mkPluginSetupOption; + inherit (lib.nvim.types) hexColor; +in { + options.vim.mini.hues = { + enable = mkEnableOption "mini.hues"; + setupOpts = mkPluginSetupOption "mini.hues" { + background = mkOption { + description = "The background color to use"; + type = hexColor; + apply = v: + if hasPrefix "#" v + then v + else "#${v}"; + }; + + foreground = mkOption { + description = "The foreground color to use"; + type = hexColor; + apply = v: + if hasPrefix "#" v + then v + else "#${v}"; + }; + }; + }; +} From f31b2e06cb37df853b364eb1d95930ea383b193a Mon Sep 17 00:00:00 2001 From: LilleAila Date: Fri, 17 Jan 2025 20:34:02 +0100 Subject: [PATCH 22/54] mini/icons: init --- docs/release-notes/rl-0.8.md | 1 + flake.lock | 17 +++++++++++++++++ flake.nix | 5 +++++ modules/plugins/mini/default.nix | 1 + modules/plugins/mini/icons/config.nix | 19 +++++++++++++++++++ modules/plugins/mini/icons/default.nix | 6 ++++++ modules/plugins/mini/icons/icons.nix | 13 +++++++++++++ 7 files changed, 62 insertions(+) create mode 100644 modules/plugins/mini/icons/config.nix create mode 100644 modules/plugins/mini/icons/default.nix create mode 100644 modules/plugins/mini/icons/icons.nix diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md index 1c843924a..e9c1300d8 100644 --- a/docs/release-notes/rl-0.8.md +++ b/docs/release-notes/rl-0.8.md @@ -73,6 +73,7 @@ - `mini.git` - `mini.hipatterns` - `mini.hues` + - `mini.icons` [kaktu5](https://github.com/kaktu5): diff --git a/flake.lock b/flake.lock index edb5d0c2b..13ed65d96 100644 --- a/flake.lock +++ b/flake.lock @@ -1240,6 +1240,22 @@ "type": "github" } }, + "plugin-mini-icons": { + "flake": false, + "locked": { + "lastModified": 1737036219, + "narHash": "sha256-w0PxiTj9uiUffZXkMM18IO/b/zPpdRKW9ydyhvXRoqE=", + "owner": "echasnovski", + "repo": "mini.icons", + "rev": "910db5df9724d65371182948f921fce23c2c881e", + "type": "github" + }, + "original": { + "owner": "echasnovski", + "repo": "mini.icons", + "type": "github" + } + }, "plugin-minimap-vim": { "flake": false, "locked": { @@ -2455,6 +2471,7 @@ "plugin-mini-git": "plugin-mini-git", "plugin-mini-hipatterns": "plugin-mini-hipatterns", "plugin-mini-hues": "plugin-mini-hues", + "plugin-mini-icons": "plugin-mini-icons", "plugin-minimap-vim": "plugin-minimap-vim", "plugin-modes-nvim": "plugin-modes-nvim", "plugin-neo-tree-nvim": "plugin-neo-tree-nvim", diff --git a/flake.nix b/flake.nix index 98057d457..cb8206874 100644 --- a/flake.nix +++ b/flake.nix @@ -840,5 +840,10 @@ url = "github:echasnovski/mini.hues"; flake = false; }; + + plugin-mini-icons = { + url = "github:echasnovski/mini.icons"; + flake = false; + }; }; } diff --git a/modules/plugins/mini/default.nix b/modules/plugins/mini/default.nix index 39c05cfe8..23b128201 100644 --- a/modules/plugins/mini/default.nix +++ b/modules/plugins/mini/default.nix @@ -19,5 +19,6 @@ ./git ./hipatterns ./hues + ./icons ]; } diff --git a/modules/plugins/mini/icons/config.nix b/modules/plugins/mini/icons/config.nix new file mode 100644 index 000000000..aa446935c --- /dev/null +++ b/modules/plugins/mini/icons/config.nix @@ -0,0 +1,19 @@ +{ + config, + lib, + ... +}: let + inherit (lib.modules) mkIf; + inherit (lib.nvim.dag) entryAnywhere; + inherit (lib.nvim.lua) toLuaObject; + + cfg = config.vim.mini.icons; +in { + vim = mkIf cfg.enable { + startPlugins = ["mini-icons"]; + + pluginRC.mini-icons = entryAnywhere '' + require("mini.icons").setup(${toLuaObject cfg.setupOpts}) + ''; + }; +} diff --git a/modules/plugins/mini/icons/default.nix b/modules/plugins/mini/icons/default.nix new file mode 100644 index 000000000..f0b16ce8e --- /dev/null +++ b/modules/plugins/mini/icons/default.nix @@ -0,0 +1,6 @@ +{ + imports = [ + ./icons.nix + ./config.nix + ]; +} diff --git a/modules/plugins/mini/icons/icons.nix b/modules/plugins/mini/icons/icons.nix new file mode 100644 index 000000000..096fa9c21 --- /dev/null +++ b/modules/plugins/mini/icons/icons.nix @@ -0,0 +1,13 @@ +{ + config, + lib, + ... +}: let + inherit (lib.options) mkEnableOption mkOption; + inherit (lib.nvim.types) mkPluginSetupOption; +in { + options.vim.mini.icons = { + enable = mkEnableOption "mini.icons"; + setupOpts = mkPluginSetupOption "mini.icons" {}; + }; +} From be7d94960538ebb5a0d89dec0b6db841ef435ee9 Mon Sep 17 00:00:00 2001 From: LilleAila Date: Fri, 17 Jan 2025 20:35:56 +0100 Subject: [PATCH 23/54] mini/indentscope: init --- docs/release-notes/rl-0.8.md | 1 + flake.lock | 17 +++++++++++++++++ flake.nix | 5 +++++ modules/plugins/mini/default.nix | 1 + modules/plugins/mini/indentscope/config.nix | 19 +++++++++++++++++++ modules/plugins/mini/indentscope/default.nix | 6 ++++++ .../plugins/mini/indentscope/indentscope.nix | 13 +++++++++++++ 7 files changed, 62 insertions(+) create mode 100644 modules/plugins/mini/indentscope/config.nix create mode 100644 modules/plugins/mini/indentscope/default.nix create mode 100644 modules/plugins/mini/indentscope/indentscope.nix diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md index e9c1300d8..b87f64318 100644 --- a/docs/release-notes/rl-0.8.md +++ b/docs/release-notes/rl-0.8.md @@ -74,6 +74,7 @@ - `mini.hipatterns` - `mini.hues` - `mini.icons` + - `mini.indentscope` [kaktu5](https://github.com/kaktu5): diff --git a/flake.lock b/flake.lock index 13ed65d96..a8d4c17d9 100644 --- a/flake.lock +++ b/flake.lock @@ -1256,6 +1256,22 @@ "type": "github" } }, + "plugin-mini-indentscope": { + "flake": false, + "locked": { + "lastModified": 1737036220, + "narHash": "sha256-Mrzc7oHXxyEGqdE003qiC9unScyb7i5A6+l8Do7yxws=", + "owner": "echasnovski", + "repo": "mini.indentscope", + "rev": "613df2830d7faeae7483ba2e736683154b95921e", + "type": "github" + }, + "original": { + "owner": "echasnovski", + "repo": "mini.indentscope", + "type": "github" + } + }, "plugin-minimap-vim": { "flake": false, "locked": { @@ -2472,6 +2488,7 @@ "plugin-mini-hipatterns": "plugin-mini-hipatterns", "plugin-mini-hues": "plugin-mini-hues", "plugin-mini-icons": "plugin-mini-icons", + "plugin-mini-indentscope": "plugin-mini-indentscope", "plugin-minimap-vim": "plugin-minimap-vim", "plugin-modes-nvim": "plugin-modes-nvim", "plugin-neo-tree-nvim": "plugin-neo-tree-nvim", diff --git a/flake.nix b/flake.nix index cb8206874..cefd3a242 100644 --- a/flake.nix +++ b/flake.nix @@ -845,5 +845,10 @@ url = "github:echasnovski/mini.icons"; flake = false; }; + + plugin-mini-indentscope = { + url = "github:echasnovski/mini.indentscope"; + flake = false; + }; }; } diff --git a/modules/plugins/mini/default.nix b/modules/plugins/mini/default.nix index 23b128201..73ff09517 100644 --- a/modules/plugins/mini/default.nix +++ b/modules/plugins/mini/default.nix @@ -20,5 +20,6 @@ ./hipatterns ./hues ./icons + ./indentscope ]; } diff --git a/modules/plugins/mini/indentscope/config.nix b/modules/plugins/mini/indentscope/config.nix new file mode 100644 index 000000000..2e6ec03d2 --- /dev/null +++ b/modules/plugins/mini/indentscope/config.nix @@ -0,0 +1,19 @@ +{ + config, + lib, + ... +}: let + inherit (lib.modules) mkIf; + inherit (lib.nvim.dag) entryAnywhere; + inherit (lib.nvim.lua) toLuaObject; + + cfg = config.vim.mini.indentscope; +in { + vim = mkIf cfg.enable { + startPlugins = ["mini-indentscope"]; + + pluginRC.mini-indentscope = entryAnywhere '' + require("mini.indentscope").setup(${toLuaObject cfg.setupOpts}) + ''; + }; +} diff --git a/modules/plugins/mini/indentscope/default.nix b/modules/plugins/mini/indentscope/default.nix new file mode 100644 index 000000000..487c248cd --- /dev/null +++ b/modules/plugins/mini/indentscope/default.nix @@ -0,0 +1,6 @@ +{ + imports = [ + ./indentscope.nix + ./config.nix + ]; +} diff --git a/modules/plugins/mini/indentscope/indentscope.nix b/modules/plugins/mini/indentscope/indentscope.nix new file mode 100644 index 000000000..8307a88cd --- /dev/null +++ b/modules/plugins/mini/indentscope/indentscope.nix @@ -0,0 +1,13 @@ +{ + config, + lib, + ... +}: let + inherit (lib.options) mkEnableOption mkOption; + inherit (lib.nvim.types) mkPluginSetupOption; +in { + options.vim.mini.indentscope = { + enable = mkEnableOption "mini.indentscope"; + setupOpts = mkPluginSetupOption "mini.indentscope" {}; + }; +} From 36f535c4ef907cf629633b72b65a71c503bc226a Mon Sep 17 00:00:00 2001 From: LilleAila Date: Fri, 17 Jan 2025 20:37:22 +0100 Subject: [PATCH 24/54] mini/jump: init --- docs/release-notes/rl-0.8.md | 1 + flake.lock | 17 +++++++++++++++++ flake.nix | 5 +++++ modules/plugins/mini/default.nix | 1 + modules/plugins/mini/jump/config.nix | 19 +++++++++++++++++++ modules/plugins/mini/jump/default.nix | 6 ++++++ modules/plugins/mini/jump/jump.nix | 13 +++++++++++++ 7 files changed, 62 insertions(+) create mode 100644 modules/plugins/mini/jump/config.nix create mode 100644 modules/plugins/mini/jump/default.nix create mode 100644 modules/plugins/mini/jump/jump.nix diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md index b87f64318..243ade98e 100644 --- a/docs/release-notes/rl-0.8.md +++ b/docs/release-notes/rl-0.8.md @@ -75,6 +75,7 @@ - `mini.hues` - `mini.icons` - `mini.indentscope` + - `mini.jump` [kaktu5](https://github.com/kaktu5): diff --git a/flake.lock b/flake.lock index a8d4c17d9..f5c97e343 100644 --- a/flake.lock +++ b/flake.lock @@ -1272,6 +1272,22 @@ "type": "github" } }, + "plugin-mini-jump": { + "flake": false, + "locked": { + "lastModified": 1733662809, + "narHash": "sha256-qMP9ezk4xZov5S4vrUFM62lnc4YkEaZL1EVzdXwDq1Q=", + "owner": "echasnovski", + "repo": "mini.jump", + "rev": "bb93d998c9db6936697746330411f5fb9957145e", + "type": "github" + }, + "original": { + "owner": "echasnovski", + "repo": "mini.jump", + "type": "github" + } + }, "plugin-minimap-vim": { "flake": false, "locked": { @@ -2489,6 +2505,7 @@ "plugin-mini-hues": "plugin-mini-hues", "plugin-mini-icons": "plugin-mini-icons", "plugin-mini-indentscope": "plugin-mini-indentscope", + "plugin-mini-jump": "plugin-mini-jump", "plugin-minimap-vim": "plugin-minimap-vim", "plugin-modes-nvim": "plugin-modes-nvim", "plugin-neo-tree-nvim": "plugin-neo-tree-nvim", diff --git a/flake.nix b/flake.nix index cefd3a242..f47e2324b 100644 --- a/flake.nix +++ b/flake.nix @@ -850,5 +850,10 @@ url = "github:echasnovski/mini.indentscope"; flake = false; }; + + plugin-mini-jump = { + url = "github:echasnovski/mini.jump"; + flake = false; + }; }; } diff --git a/modules/plugins/mini/default.nix b/modules/plugins/mini/default.nix index 73ff09517..11bb1ace2 100644 --- a/modules/plugins/mini/default.nix +++ b/modules/plugins/mini/default.nix @@ -21,5 +21,6 @@ ./hues ./icons ./indentscope + ./jump ]; } diff --git a/modules/plugins/mini/jump/config.nix b/modules/plugins/mini/jump/config.nix new file mode 100644 index 000000000..665f96fd6 --- /dev/null +++ b/modules/plugins/mini/jump/config.nix @@ -0,0 +1,19 @@ +{ + config, + lib, + ... +}: let + inherit (lib.modules) mkIf; + inherit (lib.nvim.dag) entryAnywhere; + inherit (lib.nvim.lua) toLuaObject; + + cfg = config.vim.mini.jump; +in { + vim = mkIf cfg.enable { + startPlugins = ["mini-jump"]; + + pluginRC.mini-jump = entryAnywhere '' + require("mini.jump").setup(${toLuaObject cfg.setupOpts}) + ''; + }; +} diff --git a/modules/plugins/mini/jump/default.nix b/modules/plugins/mini/jump/default.nix new file mode 100644 index 000000000..cb1f9cb35 --- /dev/null +++ b/modules/plugins/mini/jump/default.nix @@ -0,0 +1,6 @@ +{ + imports = [ + ./jump.nix + ./config.nix + ]; +} diff --git a/modules/plugins/mini/jump/jump.nix b/modules/plugins/mini/jump/jump.nix new file mode 100644 index 000000000..ca9563d3c --- /dev/null +++ b/modules/plugins/mini/jump/jump.nix @@ -0,0 +1,13 @@ +{ + config, + lib, + ... +}: let + inherit (lib.options) mkEnableOption mkOption; + inherit (lib.nvim.types) mkPluginSetupOption; +in { + options.vim.mini.jump = { + enable = mkEnableOption "mini.jump"; + setupOpts = mkPluginSetupOption "mini.jump" {}; + }; +} From e58472cee7077ecff39108e46ed23451f12f399a Mon Sep 17 00:00:00 2001 From: LilleAila Date: Fri, 17 Jan 2025 20:39:31 +0100 Subject: [PATCH 25/54] mini/jump2d: init --- docs/release-notes/rl-0.8.md | 1 + flake.lock | 17 +++++++++++++++++ flake.nix | 5 +++++ modules/plugins/mini/default.nix | 1 + modules/plugins/mini/jump2d/config.nix | 19 +++++++++++++++++++ modules/plugins/mini/jump2d/default.nix | 6 ++++++ modules/plugins/mini/jump2d/jump2d.nix | 13 +++++++++++++ 7 files changed, 62 insertions(+) create mode 100644 modules/plugins/mini/jump2d/config.nix create mode 100644 modules/plugins/mini/jump2d/default.nix create mode 100644 modules/plugins/mini/jump2d/jump2d.nix diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md index 243ade98e..623430388 100644 --- a/docs/release-notes/rl-0.8.md +++ b/docs/release-notes/rl-0.8.md @@ -76,6 +76,7 @@ - `mini.icons` - `mini.indentscope` - `mini.jump` + - `mini.jump2d` [kaktu5](https://github.com/kaktu5): diff --git a/flake.lock b/flake.lock index f5c97e343..4660fe7c0 100644 --- a/flake.lock +++ b/flake.lock @@ -1288,6 +1288,22 @@ "type": "github" } }, + "plugin-mini-jump2d": { + "flake": false, + "locked": { + "lastModified": 1733662811, + "narHash": "sha256-+DihKCh6GYwin3H9YD+q30MLMRNXvvb1GtKnfBinGjc=", + "owner": "echasnovski", + "repo": "mini.jump2d", + "rev": "88077058297e80f1c76a18ed801ae9d7064187c6", + "type": "github" + }, + "original": { + "owner": "echasnovski", + "repo": "mini.jump2d", + "type": "github" + } + }, "plugin-minimap-vim": { "flake": false, "locked": { @@ -2506,6 +2522,7 @@ "plugin-mini-icons": "plugin-mini-icons", "plugin-mini-indentscope": "plugin-mini-indentscope", "plugin-mini-jump": "plugin-mini-jump", + "plugin-mini-jump2d": "plugin-mini-jump2d", "plugin-minimap-vim": "plugin-minimap-vim", "plugin-modes-nvim": "plugin-modes-nvim", "plugin-neo-tree-nvim": "plugin-neo-tree-nvim", diff --git a/flake.nix b/flake.nix index f47e2324b..09baf2357 100644 --- a/flake.nix +++ b/flake.nix @@ -855,5 +855,10 @@ url = "github:echasnovski/mini.jump"; flake = false; }; + + plugin-mini-jump2d = { + url = "github:echasnovski/mini.jump2d"; + flake = false; + }; }; } diff --git a/modules/plugins/mini/default.nix b/modules/plugins/mini/default.nix index 11bb1ace2..2f4683c69 100644 --- a/modules/plugins/mini/default.nix +++ b/modules/plugins/mini/default.nix @@ -22,5 +22,6 @@ ./icons ./indentscope ./jump + ./jump2d ]; } diff --git a/modules/plugins/mini/jump2d/config.nix b/modules/plugins/mini/jump2d/config.nix new file mode 100644 index 000000000..da4ba55f8 --- /dev/null +++ b/modules/plugins/mini/jump2d/config.nix @@ -0,0 +1,19 @@ +{ + config, + lib, + ... +}: let + inherit (lib.modules) mkIf; + inherit (lib.nvim.dag) entryAnywhere; + inherit (lib.nvim.lua) toLuaObject; + + cfg = config.vim.mini.jump2d; +in { + vim = mkIf cfg.enable { + startPlugins = ["mini-jump2d"]; + + pluginRC.mini-jump2d = entryAnywhere '' + require("mini.jump2d").setup(${toLuaObject cfg.setupOpts}) + ''; + }; +} diff --git a/modules/plugins/mini/jump2d/default.nix b/modules/plugins/mini/jump2d/default.nix new file mode 100644 index 000000000..9065e4d64 --- /dev/null +++ b/modules/plugins/mini/jump2d/default.nix @@ -0,0 +1,6 @@ +{ + imports = [ + ./jump2d.nix + ./config.nix + ]; +} diff --git a/modules/plugins/mini/jump2d/jump2d.nix b/modules/plugins/mini/jump2d/jump2d.nix new file mode 100644 index 000000000..c25c69025 --- /dev/null +++ b/modules/plugins/mini/jump2d/jump2d.nix @@ -0,0 +1,13 @@ +{ + config, + lib, + ... +}: let + inherit (lib.options) mkEnableOption mkOption; + inherit (lib.nvim.types) mkPluginSetupOption; +in { + options.vim.mini.jump2d = { + enable = mkEnableOption "mini.jump2d"; + setupOpts = mkPluginSetupOption "mini.jump2d" {}; + }; +} From c9d39cb758d58dea234e559b527a669ae78a4be7 Mon Sep 17 00:00:00 2001 From: LilleAila Date: Fri, 17 Jan 2025 20:41:08 +0100 Subject: [PATCH 26/54] mini/map: init --- docs/release-notes/rl-0.8.md | 1 + flake.lock | 17 +++++++++++++++++ flake.nix | 5 +++++ modules/plugins/mini/default.nix | 1 + modules/plugins/mini/map/config.nix | 19 +++++++++++++++++++ modules/plugins/mini/map/default.nix | 6 ++++++ modules/plugins/mini/map/map.nix | 13 +++++++++++++ 7 files changed, 62 insertions(+) create mode 100644 modules/plugins/mini/map/config.nix create mode 100644 modules/plugins/mini/map/default.nix create mode 100644 modules/plugins/mini/map/map.nix diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md index 623430388..642dcc1bb 100644 --- a/docs/release-notes/rl-0.8.md +++ b/docs/release-notes/rl-0.8.md @@ -77,6 +77,7 @@ - `mini.indentscope` - `mini.jump` - `mini.jump2d` + - `mini.map` [kaktu5](https://github.com/kaktu5): diff --git a/flake.lock b/flake.lock index 4660fe7c0..4e9aec66a 100644 --- a/flake.lock +++ b/flake.lock @@ -1304,6 +1304,22 @@ "type": "github" } }, + "plugin-mini-map": { + "flake": false, + "locked": { + "lastModified": 1725613927, + "narHash": "sha256-dL+d92+GLAILQ/A1JVCwoe3B5WtwVK01tPuC+fOTB5A=", + "owner": "echasnovski", + "repo": "mini.map", + "rev": "4c58e755d75f9999abcd3b3c6e934734b6a8b098", + "type": "github" + }, + "original": { + "owner": "echasnovski", + "repo": "mini.map", + "type": "github" + } + }, "plugin-minimap-vim": { "flake": false, "locked": { @@ -2523,6 +2539,7 @@ "plugin-mini-indentscope": "plugin-mini-indentscope", "plugin-mini-jump": "plugin-mini-jump", "plugin-mini-jump2d": "plugin-mini-jump2d", + "plugin-mini-map": "plugin-mini-map", "plugin-minimap-vim": "plugin-minimap-vim", "plugin-modes-nvim": "plugin-modes-nvim", "plugin-neo-tree-nvim": "plugin-neo-tree-nvim", diff --git a/flake.nix b/flake.nix index 09baf2357..75efb0d17 100644 --- a/flake.nix +++ b/flake.nix @@ -860,5 +860,10 @@ url = "github:echasnovski/mini.jump2d"; flake = false; }; + + plugin-mini-map = { + url = "github:echasnovski/mini.map"; + flake = false; + }; }; } diff --git a/modules/plugins/mini/default.nix b/modules/plugins/mini/default.nix index 2f4683c69..f7c8cf8b7 100644 --- a/modules/plugins/mini/default.nix +++ b/modules/plugins/mini/default.nix @@ -23,5 +23,6 @@ ./indentscope ./jump ./jump2d + ./map ]; } diff --git a/modules/plugins/mini/map/config.nix b/modules/plugins/mini/map/config.nix new file mode 100644 index 000000000..7a299eb88 --- /dev/null +++ b/modules/plugins/mini/map/config.nix @@ -0,0 +1,19 @@ +{ + config, + lib, + ... +}: let + inherit (lib.modules) mkIf; + inherit (lib.nvim.dag) entryAnywhere; + inherit (lib.nvim.lua) toLuaObject; + + cfg = config.vim.mini.map; +in { + vim = mkIf cfg.enable { + startPlugins = ["mini-map"]; + + pluginRC.mini-map = entryAnywhere '' + require("mini.map").setup(${toLuaObject cfg.setupOpts}) + ''; + }; +} diff --git a/modules/plugins/mini/map/default.nix b/modules/plugins/mini/map/default.nix new file mode 100644 index 000000000..711104312 --- /dev/null +++ b/modules/plugins/mini/map/default.nix @@ -0,0 +1,6 @@ +{ + imports = [ + ./map.nix + ./config.nix + ]; +} diff --git a/modules/plugins/mini/map/map.nix b/modules/plugins/mini/map/map.nix new file mode 100644 index 000000000..554e20723 --- /dev/null +++ b/modules/plugins/mini/map/map.nix @@ -0,0 +1,13 @@ +{ + config, + lib, + ... +}: let + inherit (lib.options) mkEnableOption mkOption; + inherit (lib.nvim.types) mkPluginSetupOption; +in { + options.vim.mini.map = { + enable = mkEnableOption "mini.map"; + setupOpts = mkPluginSetupOption "mini.map" {}; + }; +} From 9a27dafe67076b07c888e00010d940e9766c1918 Mon Sep 17 00:00:00 2001 From: LilleAila Date: Fri, 17 Jan 2025 20:43:25 +0100 Subject: [PATCH 27/54] mini/misc: init --- docs/release-notes/rl-0.8.md | 1 + flake.lock | 17 +++++++++++++++++ flake.nix | 5 +++++ modules/plugins/mini/default.nix | 1 + modules/plugins/mini/misc/config.nix | 19 +++++++++++++++++++ modules/plugins/mini/misc/default.nix | 6 ++++++ modules/plugins/mini/misc/misc.nix | 13 +++++++++++++ 7 files changed, 62 insertions(+) create mode 100644 modules/plugins/mini/misc/config.nix create mode 100644 modules/plugins/mini/misc/default.nix create mode 100644 modules/plugins/mini/misc/misc.nix diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md index 642dcc1bb..1d2308abe 100644 --- a/docs/release-notes/rl-0.8.md +++ b/docs/release-notes/rl-0.8.md @@ -78,6 +78,7 @@ - `mini.jump` - `mini.jump2d` - `mini.map` + - `mini.misc` [kaktu5](https://github.com/kaktu5): diff --git a/flake.lock b/flake.lock index 4e9aec66a..39acee399 100644 --- a/flake.lock +++ b/flake.lock @@ -1320,6 +1320,22 @@ "type": "github" } }, + "plugin-mini-misc": { + "flake": false, + "locked": { + "lastModified": 1734103112, + "narHash": "sha256-qnYa4IZk14MGZArmVpn15l+P9cwtFWomBVxRuYHVyXc=", + "owner": "echasnovski", + "repo": "mini.misc", + "rev": "645fb9367c19bb485902e54e5451425981498601", + "type": "github" + }, + "original": { + "owner": "echasnovski", + "repo": "mini.misc", + "type": "github" + } + }, "plugin-minimap-vim": { "flake": false, "locked": { @@ -2540,6 +2556,7 @@ "plugin-mini-jump": "plugin-mini-jump", "plugin-mini-jump2d": "plugin-mini-jump2d", "plugin-mini-map": "plugin-mini-map", + "plugin-mini-misc": "plugin-mini-misc", "plugin-minimap-vim": "plugin-minimap-vim", "plugin-modes-nvim": "plugin-modes-nvim", "plugin-neo-tree-nvim": "plugin-neo-tree-nvim", diff --git a/flake.nix b/flake.nix index 75efb0d17..d6a57ee72 100644 --- a/flake.nix +++ b/flake.nix @@ -865,5 +865,10 @@ url = "github:echasnovski/mini.map"; flake = false; }; + + plugin-mini-misc = { + url = "github:echasnovski/mini.misc"; + flake = false; + }; }; } diff --git a/modules/plugins/mini/default.nix b/modules/plugins/mini/default.nix index f7c8cf8b7..093ae3a46 100644 --- a/modules/plugins/mini/default.nix +++ b/modules/plugins/mini/default.nix @@ -24,5 +24,6 @@ ./jump ./jump2d ./map + ./misc ]; } diff --git a/modules/plugins/mini/misc/config.nix b/modules/plugins/mini/misc/config.nix new file mode 100644 index 000000000..9a9a6ae46 --- /dev/null +++ b/modules/plugins/mini/misc/config.nix @@ -0,0 +1,19 @@ +{ + config, + lib, + ... +}: let + inherit (lib.modules) mkIf; + inherit (lib.nvim.dag) entryAnywhere; + inherit (lib.nvim.lua) toLuaObject; + + cfg = config.vim.mini.misc; +in { + vim = mkIf cfg.enable { + startPlugins = ["mini-misc"]; + + pluginRC.mini-misc = entryAnywhere '' + require("mini.misc").setup(${toLuaObject cfg.setupOpts}) + ''; + }; +} diff --git a/modules/plugins/mini/misc/default.nix b/modules/plugins/mini/misc/default.nix new file mode 100644 index 000000000..9f64fd198 --- /dev/null +++ b/modules/plugins/mini/misc/default.nix @@ -0,0 +1,6 @@ +{ + imports = [ + ./misc.nix + ./config.nix + ]; +} diff --git a/modules/plugins/mini/misc/misc.nix b/modules/plugins/mini/misc/misc.nix new file mode 100644 index 000000000..7b36e9fdc --- /dev/null +++ b/modules/plugins/mini/misc/misc.nix @@ -0,0 +1,13 @@ +{ + config, + lib, + ... +}: let + inherit (lib.options) mkEnableOption mkOption; + inherit (lib.nvim.types) mkPluginSetupOption; +in { + options.vim.mini.misc = { + enable = mkEnableOption "mini.misc"; + setupOpts = mkPluginSetupOption "mini.misc" {}; + }; +} From 6060ae41829a548d317f5f08e239f4018bda4f07 Mon Sep 17 00:00:00 2001 From: LilleAila Date: Fri, 17 Jan 2025 20:57:49 +0100 Subject: [PATCH 28/54] mini/move: init --- docs/release-notes/rl-0.8.md | 1 + flake.lock | 17 +++++++++++++++++ flake.nix | 5 +++++ modules/plugins/mini/default.nix | 1 + modules/plugins/mini/move/config.nix | 19 +++++++++++++++++++ modules/plugins/mini/move/default.nix | 6 ++++++ modules/plugins/mini/move/move.nix | 13 +++++++++++++ 7 files changed, 62 insertions(+) create mode 100644 modules/plugins/mini/move/config.nix create mode 100644 modules/plugins/mini/move/default.nix create mode 100644 modules/plugins/mini/move/move.nix diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md index 1d2308abe..824dc3057 100644 --- a/docs/release-notes/rl-0.8.md +++ b/docs/release-notes/rl-0.8.md @@ -79,6 +79,7 @@ - `mini.jump2d` - `mini.map` - `mini.misc` + - `mini.move` [kaktu5](https://github.com/kaktu5): diff --git a/flake.lock b/flake.lock index 39acee399..03d1e0b51 100644 --- a/flake.lock +++ b/flake.lock @@ -1336,6 +1336,22 @@ "type": "github" } }, + "plugin-mini-move": { + "flake": false, + "locked": { + "lastModified": 1723711319, + "narHash": "sha256-nX0eAlhMnKhAftgM6qeHUuawagumLQMPKDkqZNPLljg=", + "owner": "echasnovski", + "repo": "mini.move", + "rev": "4caa1c212f5ca3d1633d21cfb184808090ed74b1", + "type": "github" + }, + "original": { + "owner": "echasnovski", + "repo": "mini.move", + "type": "github" + } + }, "plugin-minimap-vim": { "flake": false, "locked": { @@ -2557,6 +2573,7 @@ "plugin-mini-jump2d": "plugin-mini-jump2d", "plugin-mini-map": "plugin-mini-map", "plugin-mini-misc": "plugin-mini-misc", + "plugin-mini-move": "plugin-mini-move", "plugin-minimap-vim": "plugin-minimap-vim", "plugin-modes-nvim": "plugin-modes-nvim", "plugin-neo-tree-nvim": "plugin-neo-tree-nvim", diff --git a/flake.nix b/flake.nix index d6a57ee72..def1cd8c5 100644 --- a/flake.nix +++ b/flake.nix @@ -870,5 +870,10 @@ url = "github:echasnovski/mini.misc"; flake = false; }; + + plugin-mini-move = { + url = "github:echasnovski/mini.move"; + flake = false; + }; }; } diff --git a/modules/plugins/mini/default.nix b/modules/plugins/mini/default.nix index 093ae3a46..a1c5a191e 100644 --- a/modules/plugins/mini/default.nix +++ b/modules/plugins/mini/default.nix @@ -25,5 +25,6 @@ ./jump2d ./map ./misc + ./move ]; } diff --git a/modules/plugins/mini/move/config.nix b/modules/plugins/mini/move/config.nix new file mode 100644 index 000000000..8bf225265 --- /dev/null +++ b/modules/plugins/mini/move/config.nix @@ -0,0 +1,19 @@ +{ + config, + lib, + ... +}: let + inherit (lib.modules) mkIf; + inherit (lib.nvim.dag) entryAnywhere; + inherit (lib.nvim.lua) toLuaObject; + + cfg = config.vim.mini.move; +in { + vim = mkIf cfg.enable { + startPlugins = ["mini-move"]; + + pluginRC.mini-move = entryAnywhere '' + require("mini.move").setup(${toLuaObject cfg.setupOpts}) + ''; + }; +} diff --git a/modules/plugins/mini/move/default.nix b/modules/plugins/mini/move/default.nix new file mode 100644 index 000000000..83caee308 --- /dev/null +++ b/modules/plugins/mini/move/default.nix @@ -0,0 +1,6 @@ +{ + imports = [ + ./move.nix + ./config.nix + ]; +} diff --git a/modules/plugins/mini/move/move.nix b/modules/plugins/mini/move/move.nix new file mode 100644 index 000000000..e97e837b3 --- /dev/null +++ b/modules/plugins/mini/move/move.nix @@ -0,0 +1,13 @@ +{ + config, + lib, + ... +}: let + inherit (lib.options) mkEnableOption mkOption; + inherit (lib.nvim.types) mkPluginSetupOption; +in { + options.vim.mini.move = { + enable = mkEnableOption "mini.move"; + setupOpts = mkPluginSetupOption "mini.move" {}; + }; +} From 2691dbd351666893ddb99363749c7dd32bad85aa Mon Sep 17 00:00:00 2001 From: LilleAila Date: Fri, 17 Jan 2025 21:00:20 +0100 Subject: [PATCH 29/54] mini/notify: init --- docs/release-notes/rl-0.8.md | 1 + flake.lock | 17 +++++++++++++++++ flake.nix | 5 +++++ modules/plugins/mini/default.nix | 1 + modules/plugins/mini/notify/config.nix | 19 +++++++++++++++++++ modules/plugins/mini/notify/default.nix | 6 ++++++ modules/plugins/mini/notify/notify.nix | 13 +++++++++++++ 7 files changed, 62 insertions(+) create mode 100644 modules/plugins/mini/notify/config.nix create mode 100644 modules/plugins/mini/notify/default.nix create mode 100644 modules/plugins/mini/notify/notify.nix diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md index 824dc3057..d15e56098 100644 --- a/docs/release-notes/rl-0.8.md +++ b/docs/release-notes/rl-0.8.md @@ -80,6 +80,7 @@ - `mini.map` - `mini.misc` - `mini.move` + - `mini.notify` [kaktu5](https://github.com/kaktu5): diff --git a/flake.lock b/flake.lock index 03d1e0b51..6a35b799b 100644 --- a/flake.lock +++ b/flake.lock @@ -1352,6 +1352,22 @@ "type": "github" } }, + "plugin-mini-notify": { + "flake": false, + "locked": { + "lastModified": 1736790793, + "narHash": "sha256-q27j14OV6LAfoxeqBG75GSiqtqmW37GOPHpmA2fD4gs=", + "owner": "echasnovski", + "repo": "mini.notify", + "rev": "05e598d5b349bd66404d576e6a4d4340aea5f194", + "type": "github" + }, + "original": { + "owner": "echasnovski", + "repo": "mini.notify", + "type": "github" + } + }, "plugin-minimap-vim": { "flake": false, "locked": { @@ -2574,6 +2590,7 @@ "plugin-mini-map": "plugin-mini-map", "plugin-mini-misc": "plugin-mini-misc", "plugin-mini-move": "plugin-mini-move", + "plugin-mini-notify": "plugin-mini-notify", "plugin-minimap-vim": "plugin-minimap-vim", "plugin-modes-nvim": "plugin-modes-nvim", "plugin-neo-tree-nvim": "plugin-neo-tree-nvim", diff --git a/flake.nix b/flake.nix index def1cd8c5..368fc4f73 100644 --- a/flake.nix +++ b/flake.nix @@ -875,5 +875,10 @@ url = "github:echasnovski/mini.move"; flake = false; }; + + plugin-mini-notify = { + url = "github:echasnovski/mini.notify"; + flake = false; + }; }; } diff --git a/modules/plugins/mini/default.nix b/modules/plugins/mini/default.nix index a1c5a191e..315d3b0cf 100644 --- a/modules/plugins/mini/default.nix +++ b/modules/plugins/mini/default.nix @@ -26,5 +26,6 @@ ./map ./misc ./move + ./notify ]; } diff --git a/modules/plugins/mini/notify/config.nix b/modules/plugins/mini/notify/config.nix new file mode 100644 index 000000000..2a5ff46e7 --- /dev/null +++ b/modules/plugins/mini/notify/config.nix @@ -0,0 +1,19 @@ +{ + config, + lib, + ... +}: let + inherit (lib.modules) mkIf; + inherit (lib.nvim.dag) entryAnywhere; + inherit (lib.nvim.lua) toLuaObject; + + cfg = config.vim.mini.notify; +in { + vim = mkIf cfg.enable { + startPlugins = ["mini-notify"]; + + pluginRC.mini-notify = entryAnywhere '' + require("mini.notify").setup(${toLuaObject cfg.setupOpts}) + ''; + }; +} diff --git a/modules/plugins/mini/notify/default.nix b/modules/plugins/mini/notify/default.nix new file mode 100644 index 000000000..0f809b7ab --- /dev/null +++ b/modules/plugins/mini/notify/default.nix @@ -0,0 +1,6 @@ +{ + imports = [ + ./notify.nix + ./config.nix + ]; +} diff --git a/modules/plugins/mini/notify/notify.nix b/modules/plugins/mini/notify/notify.nix new file mode 100644 index 000000000..76e8c135e --- /dev/null +++ b/modules/plugins/mini/notify/notify.nix @@ -0,0 +1,13 @@ +{ + config, + lib, + ... +}: let + inherit (lib.options) mkEnableOption mkOption; + inherit (lib.nvim.types) mkPluginSetupOption; +in { + options.vim.mini.notify = { + enable = mkEnableOption "mini.notify"; + setupOpts = mkPluginSetupOption "mini.notify" {}; + }; +} From 088083c68a6c58ffa11e55a533a5522bb00fbdb1 Mon Sep 17 00:00:00 2001 From: LilleAila Date: Fri, 17 Jan 2025 21:02:20 +0100 Subject: [PATCH 30/54] mini/operators: init --- docs/release-notes/rl-0.8.md | 1 + flake.lock | 17 +++++++++++++++++ flake.nix | 5 +++++ modules/plugins/mini/default.nix | 1 + modules/plugins/mini/operators/config.nix | 19 +++++++++++++++++++ modules/plugins/mini/operators/default.nix | 6 ++++++ modules/plugins/mini/operators/operators.nix | 13 +++++++++++++ 7 files changed, 62 insertions(+) create mode 100644 modules/plugins/mini/operators/config.nix create mode 100644 modules/plugins/mini/operators/default.nix create mode 100644 modules/plugins/mini/operators/operators.nix diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md index d15e56098..59c113777 100644 --- a/docs/release-notes/rl-0.8.md +++ b/docs/release-notes/rl-0.8.md @@ -81,6 +81,7 @@ - `mini.misc` - `mini.move` - `mini.notify` + - `mini.operators` [kaktu5](https://github.com/kaktu5): diff --git a/flake.lock b/flake.lock index 6a35b799b..28e25927f 100644 --- a/flake.lock +++ b/flake.lock @@ -1368,6 +1368,22 @@ "type": "github" } }, + "plugin-mini-operators": { + "flake": false, + "locked": { + "lastModified": 1731776514, + "narHash": "sha256-+Zhy0AhuMPSHnM6dqbV45Aa7dS7XJ4mpfcHApSbuy8A=", + "owner": "echasnovski", + "repo": "mini.operators", + "rev": "7cb4dc66c51a3d736d347bbc517dc73dc7d28888", + "type": "github" + }, + "original": { + "owner": "echasnovski", + "repo": "mini.operators", + "type": "github" + } + }, "plugin-minimap-vim": { "flake": false, "locked": { @@ -2591,6 +2607,7 @@ "plugin-mini-misc": "plugin-mini-misc", "plugin-mini-move": "plugin-mini-move", "plugin-mini-notify": "plugin-mini-notify", + "plugin-mini-operators": "plugin-mini-operators", "plugin-minimap-vim": "plugin-minimap-vim", "plugin-modes-nvim": "plugin-modes-nvim", "plugin-neo-tree-nvim": "plugin-neo-tree-nvim", diff --git a/flake.nix b/flake.nix index 368fc4f73..f5ea0e15c 100644 --- a/flake.nix +++ b/flake.nix @@ -880,5 +880,10 @@ url = "github:echasnovski/mini.notify"; flake = false; }; + + plugin-mini-operators = { + url = "github:echasnovski/mini.operators"; + flake = false; + }; }; } diff --git a/modules/plugins/mini/default.nix b/modules/plugins/mini/default.nix index 315d3b0cf..0ed41e596 100644 --- a/modules/plugins/mini/default.nix +++ b/modules/plugins/mini/default.nix @@ -27,5 +27,6 @@ ./misc ./move ./notify + ./operators ]; } diff --git a/modules/plugins/mini/operators/config.nix b/modules/plugins/mini/operators/config.nix new file mode 100644 index 000000000..bb374377f --- /dev/null +++ b/modules/plugins/mini/operators/config.nix @@ -0,0 +1,19 @@ +{ + config, + lib, + ... +}: let + inherit (lib.modules) mkIf; + inherit (lib.nvim.dag) entryAnywhere; + inherit (lib.nvim.lua) toLuaObject; + + cfg = config.vim.mini.operators; +in { + vim = mkIf cfg.enable { + startPlugins = ["mini-operators"]; + + pluginRC.mini-operators = entryAnywhere '' + require("mini.operators").setup(${toLuaObject cfg.setupOpts}) + ''; + }; +} diff --git a/modules/plugins/mini/operators/default.nix b/modules/plugins/mini/operators/default.nix new file mode 100644 index 000000000..1c77bc652 --- /dev/null +++ b/modules/plugins/mini/operators/default.nix @@ -0,0 +1,6 @@ +{ + imports = [ + ./operators.nix + ./config.nix + ]; +} diff --git a/modules/plugins/mini/operators/operators.nix b/modules/plugins/mini/operators/operators.nix new file mode 100644 index 000000000..c60ad6b51 --- /dev/null +++ b/modules/plugins/mini/operators/operators.nix @@ -0,0 +1,13 @@ +{ + config, + lib, + ... +}: let + inherit (lib.options) mkEnableOption mkOption; + inherit (lib.nvim.types) mkPluginSetupOption; +in { + options.vim.mini.operators = { + enable = mkEnableOption "mini.operators"; + setupOpts = mkPluginSetupOption "mini.operators" {}; + }; +} From 226c25d45dce4ebc1c8b285b8e6bd74e9bbc9083 Mon Sep 17 00:00:00 2001 From: LilleAila Date: Fri, 17 Jan 2025 21:03:56 +0100 Subject: [PATCH 31/54] mini/pairs: init --- docs/release-notes/rl-0.8.md | 1 + flake.lock | 17 +++++++++++++++++ flake.nix | 5 +++++ modules/plugins/mini/default.nix | 1 + modules/plugins/mini/pairs/config.nix | 19 +++++++++++++++++++ modules/plugins/mini/pairs/default.nix | 6 ++++++ modules/plugins/mini/pairs/pairs.nix | 13 +++++++++++++ 7 files changed, 62 insertions(+) create mode 100644 modules/plugins/mini/pairs/config.nix create mode 100644 modules/plugins/mini/pairs/default.nix create mode 100644 modules/plugins/mini/pairs/pairs.nix diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md index 59c113777..003c26390 100644 --- a/docs/release-notes/rl-0.8.md +++ b/docs/release-notes/rl-0.8.md @@ -82,6 +82,7 @@ - `mini.move` - `mini.notify` - `mini.operators` + - `mini.pairs` [kaktu5](https://github.com/kaktu5): diff --git a/flake.lock b/flake.lock index 28e25927f..2f01ce02a 100644 --- a/flake.lock +++ b/flake.lock @@ -1384,6 +1384,22 @@ "type": "github" } }, + "plugin-mini-pairs": { + "flake": false, + "locked": { + "lastModified": 1728656795, + "narHash": "sha256-PtHxLKU1smVTx655r5SINxuz5CJmZWnBW70T8zJ/oxM=", + "owner": "echasnovski", + "repo": "mini.pairs", + "rev": "7e834c5937d95364cc1740e20d673afe2d034cdb", + "type": "github" + }, + "original": { + "owner": "echasnovski", + "repo": "mini.pairs", + "type": "github" + } + }, "plugin-minimap-vim": { "flake": false, "locked": { @@ -2608,6 +2624,7 @@ "plugin-mini-move": "plugin-mini-move", "plugin-mini-notify": "plugin-mini-notify", "plugin-mini-operators": "plugin-mini-operators", + "plugin-mini-pairs": "plugin-mini-pairs", "plugin-minimap-vim": "plugin-minimap-vim", "plugin-modes-nvim": "plugin-modes-nvim", "plugin-neo-tree-nvim": "plugin-neo-tree-nvim", diff --git a/flake.nix b/flake.nix index f5ea0e15c..018366773 100644 --- a/flake.nix +++ b/flake.nix @@ -885,5 +885,10 @@ url = "github:echasnovski/mini.operators"; flake = false; }; + + plugin-mini-pairs = { + url = "github:echasnovski/mini.pairs"; + flake = false; + }; }; } diff --git a/modules/plugins/mini/default.nix b/modules/plugins/mini/default.nix index 0ed41e596..161ae0006 100644 --- a/modules/plugins/mini/default.nix +++ b/modules/plugins/mini/default.nix @@ -28,5 +28,6 @@ ./move ./notify ./operators + ./pairs ]; } diff --git a/modules/plugins/mini/pairs/config.nix b/modules/plugins/mini/pairs/config.nix new file mode 100644 index 000000000..ce02dee08 --- /dev/null +++ b/modules/plugins/mini/pairs/config.nix @@ -0,0 +1,19 @@ +{ + config, + lib, + ... +}: let + inherit (lib.modules) mkIf; + inherit (lib.nvim.dag) entryAnywhere; + inherit (lib.nvim.lua) toLuaObject; + + cfg = config.vim.mini.pairs; +in { + vim = mkIf cfg.enable { + startPlugins = ["mini-pairs"]; + + pluginRC.mini-pairs = entryAnywhere '' + require("mini.pairs").setup(${toLuaObject cfg.setupOpts}) + ''; + }; +} diff --git a/modules/plugins/mini/pairs/default.nix b/modules/plugins/mini/pairs/default.nix new file mode 100644 index 000000000..a0563bb02 --- /dev/null +++ b/modules/plugins/mini/pairs/default.nix @@ -0,0 +1,6 @@ +{ + imports = [ + ./pairs.nix + ./config.nix + ]; +} diff --git a/modules/plugins/mini/pairs/pairs.nix b/modules/plugins/mini/pairs/pairs.nix new file mode 100644 index 000000000..db43027b2 --- /dev/null +++ b/modules/plugins/mini/pairs/pairs.nix @@ -0,0 +1,13 @@ +{ + config, + lib, + ... +}: let + inherit (lib.options) mkEnableOption mkOption; + inherit (lib.nvim.types) mkPluginSetupOption; +in { + options.vim.mini.pairs = { + enable = mkEnableOption "mini.pairs"; + setupOpts = mkPluginSetupOption "mini.pairs" {}; + }; +} From af36e185b56649977df3c96d918a9c53dff81ce5 Mon Sep 17 00:00:00 2001 From: LilleAila Date: Fri, 17 Jan 2025 21:05:49 +0100 Subject: [PATCH 32/54] mini/pick: init --- docs/release-notes/rl-0.8.md | 1 + flake.lock | 17 +++++++++++++++++ flake.nix | 5 +++++ modules/plugins/mini/default.nix | 1 + modules/plugins/mini/pick/config.nix | 19 +++++++++++++++++++ modules/plugins/mini/pick/default.nix | 6 ++++++ modules/plugins/mini/pick/pick.nix | 13 +++++++++++++ 7 files changed, 62 insertions(+) create mode 100644 modules/plugins/mini/pick/config.nix create mode 100644 modules/plugins/mini/pick/default.nix create mode 100644 modules/plugins/mini/pick/pick.nix diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md index 003c26390..800720f69 100644 --- a/docs/release-notes/rl-0.8.md +++ b/docs/release-notes/rl-0.8.md @@ -83,6 +83,7 @@ - `mini.notify` - `mini.operators` - `mini.pairs` + - `mini.pick` [kaktu5](https://github.com/kaktu5): diff --git a/flake.lock b/flake.lock index 2f01ce02a..51932306d 100644 --- a/flake.lock +++ b/flake.lock @@ -1400,6 +1400,22 @@ "type": "github" } }, + "plugin-mini-pick": { + "flake": false, + "locked": { + "lastModified": 1736696004, + "narHash": "sha256-Q4GD0WzUYNtoBMx8pIl6fX5glKn1oflS4HZVC+w/eAM=", + "owner": "echasnovski", + "repo": "mini.pick", + "rev": "09ade94d2c9c5133db9ae00f3693d82eae78e9be", + "type": "github" + }, + "original": { + "owner": "echasnovski", + "repo": "mini.pick", + "type": "github" + } + }, "plugin-minimap-vim": { "flake": false, "locked": { @@ -2625,6 +2641,7 @@ "plugin-mini-notify": "plugin-mini-notify", "plugin-mini-operators": "plugin-mini-operators", "plugin-mini-pairs": "plugin-mini-pairs", + "plugin-mini-pick": "plugin-mini-pick", "plugin-minimap-vim": "plugin-minimap-vim", "plugin-modes-nvim": "plugin-modes-nvim", "plugin-neo-tree-nvim": "plugin-neo-tree-nvim", diff --git a/flake.nix b/flake.nix index 018366773..f6fec140f 100644 --- a/flake.nix +++ b/flake.nix @@ -890,5 +890,10 @@ url = "github:echasnovski/mini.pairs"; flake = false; }; + + plugin-mini-pick = { + url = "github:echasnovski/mini.pick"; + flake = false; + }; }; } diff --git a/modules/plugins/mini/default.nix b/modules/plugins/mini/default.nix index 161ae0006..97607284c 100644 --- a/modules/plugins/mini/default.nix +++ b/modules/plugins/mini/default.nix @@ -29,5 +29,6 @@ ./notify ./operators ./pairs + ./pick ]; } diff --git a/modules/plugins/mini/pick/config.nix b/modules/plugins/mini/pick/config.nix new file mode 100644 index 000000000..6d82a8eae --- /dev/null +++ b/modules/plugins/mini/pick/config.nix @@ -0,0 +1,19 @@ +{ + config, + lib, + ... +}: let + inherit (lib.modules) mkIf; + inherit (lib.nvim.dag) entryAnywhere; + inherit (lib.nvim.lua) toLuaObject; + + cfg = config.vim.mini.pick; +in { + vim = mkIf cfg.enable { + startPlugins = ["mini-pick"]; + + pluginRC.mini-pick = entryAnywhere '' + require("mini.pick").setup(${toLuaObject cfg.setupOpts}) + ''; + }; +} diff --git a/modules/plugins/mini/pick/default.nix b/modules/plugins/mini/pick/default.nix new file mode 100644 index 000000000..37d1760cc --- /dev/null +++ b/modules/plugins/mini/pick/default.nix @@ -0,0 +1,6 @@ +{ + imports = [ + ./pick.nix + ./config.nix + ]; +} diff --git a/modules/plugins/mini/pick/pick.nix b/modules/plugins/mini/pick/pick.nix new file mode 100644 index 000000000..8f93ac35f --- /dev/null +++ b/modules/plugins/mini/pick/pick.nix @@ -0,0 +1,13 @@ +{ + config, + lib, + ... +}: let + inherit (lib.options) mkEnableOption mkOption; + inherit (lib.nvim.types) mkPluginSetupOption; +in { + options.vim.mini.pick = { + enable = mkEnableOption "mini.pick"; + setupOpts = mkPluginSetupOption "mini.pick" {}; + }; +} From 39d8f52f0e120a693e16bb9fecc30e048694305f Mon Sep 17 00:00:00 2001 From: LilleAila Date: Fri, 17 Jan 2025 21:08:34 +0100 Subject: [PATCH 33/54] mini/sessions: init --- docs/release-notes/rl-0.8.md | 1 + flake.lock | 17 +++++++++++++++++ flake.nix | 5 +++++ modules/plugins/mini/default.nix | 1 + modules/plugins/mini/sessions/config.nix | 19 +++++++++++++++++++ modules/plugins/mini/sessions/default.nix | 6 ++++++ modules/plugins/mini/sessions/sessions.nix | 13 +++++++++++++ 7 files changed, 62 insertions(+) create mode 100644 modules/plugins/mini/sessions/config.nix create mode 100644 modules/plugins/mini/sessions/default.nix create mode 100644 modules/plugins/mini/sessions/sessions.nix diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md index 800720f69..51947a422 100644 --- a/docs/release-notes/rl-0.8.md +++ b/docs/release-notes/rl-0.8.md @@ -84,6 +84,7 @@ - `mini.operators` - `mini.pairs` - `mini.pick` + - `mini.sessions` [kaktu5](https://github.com/kaktu5): diff --git a/flake.lock b/flake.lock index 51932306d..5060c260f 100644 --- a/flake.lock +++ b/flake.lock @@ -1416,6 +1416,22 @@ "type": "github" } }, + "plugin-mini-sessions": { + "flake": false, + "locked": { + "lastModified": 1735582250, + "narHash": "sha256-vyn8MGyOWFgJ5QVvjYb7K1cKDtg9qWnWYMNf80+kpHk=", + "owner": "echasnovski", + "repo": "mini.sessions", + "rev": "71c9ae596664ac110560d27eb928fc24e22bc53d", + "type": "github" + }, + "original": { + "owner": "echasnovski", + "repo": "mini.sessions", + "type": "github" + } + }, "plugin-minimap-vim": { "flake": false, "locked": { @@ -2642,6 +2658,7 @@ "plugin-mini-operators": "plugin-mini-operators", "plugin-mini-pairs": "plugin-mini-pairs", "plugin-mini-pick": "plugin-mini-pick", + "plugin-mini-sessions": "plugin-mini-sessions", "plugin-minimap-vim": "plugin-minimap-vim", "plugin-modes-nvim": "plugin-modes-nvim", "plugin-neo-tree-nvim": "plugin-neo-tree-nvim", diff --git a/flake.nix b/flake.nix index f6fec140f..abc6edbf9 100644 --- a/flake.nix +++ b/flake.nix @@ -895,5 +895,10 @@ url = "github:echasnovski/mini.pick"; flake = false; }; + + plugin-mini-sessions = { + url = "github:echasnovski/mini.sessions"; + flake = false; + }; }; } diff --git a/modules/plugins/mini/default.nix b/modules/plugins/mini/default.nix index 97607284c..0a7be1af2 100644 --- a/modules/plugins/mini/default.nix +++ b/modules/plugins/mini/default.nix @@ -30,5 +30,6 @@ ./operators ./pairs ./pick + ./sessions ]; } diff --git a/modules/plugins/mini/sessions/config.nix b/modules/plugins/mini/sessions/config.nix new file mode 100644 index 000000000..233d6b067 --- /dev/null +++ b/modules/plugins/mini/sessions/config.nix @@ -0,0 +1,19 @@ +{ + config, + lib, + ... +}: let + inherit (lib.modules) mkIf; + inherit (lib.nvim.dag) entryAnywhere; + inherit (lib.nvim.lua) toLuaObject; + + cfg = config.vim.mini.sessions; +in { + vim = mkIf cfg.enable { + startPlugins = ["mini-sessions"]; + + pluginRC.mini-sessions = entryAnywhere '' + require("mini.sessions").setup(${toLuaObject cfg.setupOpts}) + ''; + }; +} diff --git a/modules/plugins/mini/sessions/default.nix b/modules/plugins/mini/sessions/default.nix new file mode 100644 index 000000000..6de787e75 --- /dev/null +++ b/modules/plugins/mini/sessions/default.nix @@ -0,0 +1,6 @@ +{ + imports = [ + ./sessions.nix + ./config.nix + ]; +} diff --git a/modules/plugins/mini/sessions/sessions.nix b/modules/plugins/mini/sessions/sessions.nix new file mode 100644 index 000000000..9a3737d6f --- /dev/null +++ b/modules/plugins/mini/sessions/sessions.nix @@ -0,0 +1,13 @@ +{ + config, + lib, + ... +}: let + inherit (lib.options) mkEnableOption mkOption; + inherit (lib.nvim.types) mkPluginSetupOption; +in { + options.vim.mini.sessions = { + enable = mkEnableOption "mini.sessions"; + setupOpts = mkPluginSetupOption "mini.sessions" {}; + }; +} From 7fc00f75f6209aa7f7fb7b66b3d95275312b80c6 Mon Sep 17 00:00:00 2001 From: LilleAila Date: Fri, 17 Jan 2025 21:10:12 +0100 Subject: [PATCH 34/54] mini/snippets: init --- docs/release-notes/rl-0.8.md | 1 + flake.lock | 17 +++++++++++++++++ flake.nix | 5 +++++ modules/plugins/mini/default.nix | 1 + modules/plugins/mini/snippets/config.nix | 19 +++++++++++++++++++ modules/plugins/mini/snippets/default.nix | 6 ++++++ modules/plugins/mini/snippets/snippets.nix | 13 +++++++++++++ 7 files changed, 62 insertions(+) create mode 100644 modules/plugins/mini/snippets/config.nix create mode 100644 modules/plugins/mini/snippets/default.nix create mode 100644 modules/plugins/mini/snippets/snippets.nix diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md index 51947a422..7d8d29a57 100644 --- a/docs/release-notes/rl-0.8.md +++ b/docs/release-notes/rl-0.8.md @@ -85,6 +85,7 @@ - `mini.pairs` - `mini.pick` - `mini.sessions` + - `mini.snippets` [kaktu5](https://github.com/kaktu5): diff --git a/flake.lock b/flake.lock index 5060c260f..bd5abc35c 100644 --- a/flake.lock +++ b/flake.lock @@ -1432,6 +1432,22 @@ "type": "github" } }, + "plugin-mini-snippets": { + "flake": false, + "locked": { + "lastModified": 1736611383, + "narHash": "sha256-How9m7KTo66FrwjZQlgZRmJ5toFKn/+GnUbx/0va3lM=", + "owner": "echasnovski", + "repo": "mini.snippets", + "rev": "72920f62e3dd1330720e94e8f5d42592f3a1ecf8", + "type": "github" + }, + "original": { + "owner": "echasnovski", + "repo": "mini.snippets", + "type": "github" + } + }, "plugin-minimap-vim": { "flake": false, "locked": { @@ -2659,6 +2675,7 @@ "plugin-mini-pairs": "plugin-mini-pairs", "plugin-mini-pick": "plugin-mini-pick", "plugin-mini-sessions": "plugin-mini-sessions", + "plugin-mini-snippets": "plugin-mini-snippets", "plugin-minimap-vim": "plugin-minimap-vim", "plugin-modes-nvim": "plugin-modes-nvim", "plugin-neo-tree-nvim": "plugin-neo-tree-nvim", diff --git a/flake.nix b/flake.nix index abc6edbf9..742ed211a 100644 --- a/flake.nix +++ b/flake.nix @@ -900,5 +900,10 @@ url = "github:echasnovski/mini.sessions"; flake = false; }; + + plugin-mini-snippets = { + url = "github:echasnovski/mini.snippets"; + flake = false; + }; }; } diff --git a/modules/plugins/mini/default.nix b/modules/plugins/mini/default.nix index 0a7be1af2..aab04a898 100644 --- a/modules/plugins/mini/default.nix +++ b/modules/plugins/mini/default.nix @@ -31,5 +31,6 @@ ./pairs ./pick ./sessions + ./snippets ]; } diff --git a/modules/plugins/mini/snippets/config.nix b/modules/plugins/mini/snippets/config.nix new file mode 100644 index 000000000..9dc7aab15 --- /dev/null +++ b/modules/plugins/mini/snippets/config.nix @@ -0,0 +1,19 @@ +{ + config, + lib, + ... +}: let + inherit (lib.modules) mkIf; + inherit (lib.nvim.dag) entryAnywhere; + inherit (lib.nvim.lua) toLuaObject; + + cfg = config.vim.mini.snippets; +in { + vim = mkIf cfg.enable { + startPlugins = ["mini-snippets"]; + + pluginRC.mini-snippets = entryAnywhere '' + require("mini.snippets").setup(${toLuaObject cfg.setupOpts}) + ''; + }; +} diff --git a/modules/plugins/mini/snippets/default.nix b/modules/plugins/mini/snippets/default.nix new file mode 100644 index 000000000..e636d4589 --- /dev/null +++ b/modules/plugins/mini/snippets/default.nix @@ -0,0 +1,6 @@ +{ + imports = [ + ./snippets.nix + ./config.nix + ]; +} diff --git a/modules/plugins/mini/snippets/snippets.nix b/modules/plugins/mini/snippets/snippets.nix new file mode 100644 index 000000000..5dbb15576 --- /dev/null +++ b/modules/plugins/mini/snippets/snippets.nix @@ -0,0 +1,13 @@ +{ + config, + lib, + ... +}: let + inherit (lib.options) mkEnableOption mkOption; + inherit (lib.nvim.types) mkPluginSetupOption; +in { + options.vim.mini.snippets = { + enable = mkEnableOption "mini.snippets"; + setupOpts = mkPluginSetupOption "mini.snippets" {}; + }; +} From 52bc5f23ee4851a5d4c51d21c6e12972954e370a Mon Sep 17 00:00:00 2001 From: LilleAila Date: Fri, 17 Jan 2025 21:12:03 +0100 Subject: [PATCH 35/54] mini/splitjoin: init --- docs/release-notes/rl-0.8.md | 1 + flake.lock | 17 +++++++++++++++++ flake.nix | 5 +++++ modules/plugins/mini/default.nix | 1 + modules/plugins/mini/splitjoin/config.nix | 19 +++++++++++++++++++ modules/plugins/mini/splitjoin/default.nix | 6 ++++++ modules/plugins/mini/splitjoin/splitjoin.nix | 13 +++++++++++++ 7 files changed, 62 insertions(+) create mode 100644 modules/plugins/mini/splitjoin/config.nix create mode 100644 modules/plugins/mini/splitjoin/default.nix create mode 100644 modules/plugins/mini/splitjoin/splitjoin.nix diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md index 7d8d29a57..eb019afad 100644 --- a/docs/release-notes/rl-0.8.md +++ b/docs/release-notes/rl-0.8.md @@ -86,6 +86,7 @@ - `mini.pick` - `mini.sessions` - `mini.snippets` + - `mini.splitjoin` [kaktu5](https://github.com/kaktu5): diff --git a/flake.lock b/flake.lock index bd5abc35c..b74f5905f 100644 --- a/flake.lock +++ b/flake.lock @@ -1448,6 +1448,22 @@ "type": "github" } }, + "plugin-mini-splitjoin": { + "flake": false, + "locked": { + "lastModified": 1719822504, + "narHash": "sha256-LDIbh5KfupTI4zkYOlLmVCd3DuZRhx5lTASN53VG34g=", + "owner": "echasnovski", + "repo": "mini.splitjoin", + "rev": "3e92f6764e770ba392325cad3a4497adcada695f", + "type": "github" + }, + "original": { + "owner": "echasnovski", + "repo": "mini.splitjoin", + "type": "github" + } + }, "plugin-minimap-vim": { "flake": false, "locked": { @@ -2676,6 +2692,7 @@ "plugin-mini-pick": "plugin-mini-pick", "plugin-mini-sessions": "plugin-mini-sessions", "plugin-mini-snippets": "plugin-mini-snippets", + "plugin-mini-splitjoin": "plugin-mini-splitjoin", "plugin-minimap-vim": "plugin-minimap-vim", "plugin-modes-nvim": "plugin-modes-nvim", "plugin-neo-tree-nvim": "plugin-neo-tree-nvim", diff --git a/flake.nix b/flake.nix index 742ed211a..be51c405c 100644 --- a/flake.nix +++ b/flake.nix @@ -905,5 +905,10 @@ url = "github:echasnovski/mini.snippets"; flake = false; }; + + plugin-mini-splitjoin = { + url = "github:echasnovski/mini.splitjoin"; + flake = false; + }; }; } diff --git a/modules/plugins/mini/default.nix b/modules/plugins/mini/default.nix index aab04a898..92bd13cee 100644 --- a/modules/plugins/mini/default.nix +++ b/modules/plugins/mini/default.nix @@ -32,5 +32,6 @@ ./pick ./sessions ./snippets + ./splitjoin ]; } diff --git a/modules/plugins/mini/splitjoin/config.nix b/modules/plugins/mini/splitjoin/config.nix new file mode 100644 index 000000000..b4b93f3fa --- /dev/null +++ b/modules/plugins/mini/splitjoin/config.nix @@ -0,0 +1,19 @@ +{ + config, + lib, + ... +}: let + inherit (lib.modules) mkIf; + inherit (lib.nvim.dag) entryAnywhere; + inherit (lib.nvim.lua) toLuaObject; + + cfg = config.vim.mini.splitjoin; +in { + vim = mkIf cfg.enable { + startPlugins = ["mini-splitjoin"]; + + pluginRC.mini-splitjoin = entryAnywhere '' + require("mini.splitjoin").setup(${toLuaObject cfg.setupOpts}) + ''; + }; +} diff --git a/modules/plugins/mini/splitjoin/default.nix b/modules/plugins/mini/splitjoin/default.nix new file mode 100644 index 000000000..0560f9361 --- /dev/null +++ b/modules/plugins/mini/splitjoin/default.nix @@ -0,0 +1,6 @@ +{ + imports = [ + ./splitjoin.nix + ./config.nix + ]; +} diff --git a/modules/plugins/mini/splitjoin/splitjoin.nix b/modules/plugins/mini/splitjoin/splitjoin.nix new file mode 100644 index 000000000..ae4f94209 --- /dev/null +++ b/modules/plugins/mini/splitjoin/splitjoin.nix @@ -0,0 +1,13 @@ +{ + config, + lib, + ... +}: let + inherit (lib.options) mkEnableOption mkOption; + inherit (lib.nvim.types) mkPluginSetupOption; +in { + options.vim.mini.splitjoin = { + enable = mkEnableOption "mini.splitjoin"; + setupOpts = mkPluginSetupOption "mini.splitjoin" {}; + }; +} From f7abf7577c23115df57e57b99548f5571d12aa82 Mon Sep 17 00:00:00 2001 From: LilleAila Date: Fri, 17 Jan 2025 21:13:58 +0100 Subject: [PATCH 36/54] mini/starter: init --- docs/release-notes/rl-0.8.md | 1 + flake.lock | 17 +++++++++++++++++ flake.nix | 5 +++++ modules/plugins/mini/default.nix | 1 + modules/plugins/mini/starter/config.nix | 19 +++++++++++++++++++ modules/plugins/mini/starter/default.nix | 6 ++++++ modules/plugins/mini/starter/starter.nix | 13 +++++++++++++ 7 files changed, 62 insertions(+) create mode 100644 modules/plugins/mini/starter/config.nix create mode 100644 modules/plugins/mini/starter/default.nix create mode 100644 modules/plugins/mini/starter/starter.nix diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md index eb019afad..c7e0dbe69 100644 --- a/docs/release-notes/rl-0.8.md +++ b/docs/release-notes/rl-0.8.md @@ -87,6 +87,7 @@ - `mini.sessions` - `mini.snippets` - `mini.splitjoin` + - `mini.starter` [kaktu5](https://github.com/kaktu5): diff --git a/flake.lock b/flake.lock index b74f5905f..8cb6430bb 100644 --- a/flake.lock +++ b/flake.lock @@ -1464,6 +1464,22 @@ "type": "github" } }, + "plugin-mini-starter": { + "flake": false, + "locked": { + "lastModified": 1736858747, + "narHash": "sha256-pJYkZUo+L3IeGCRdTipqTzMv+HatpNnyRxshaygKtIw=", + "owner": "echasnovski", + "repo": "mini.starter", + "rev": "4b257cfc93241e8c8cde3f9302d1616ad4e0d036", + "type": "github" + }, + "original": { + "owner": "echasnovski", + "repo": "mini.starter", + "type": "github" + } + }, "plugin-minimap-vim": { "flake": false, "locked": { @@ -2693,6 +2709,7 @@ "plugin-mini-sessions": "plugin-mini-sessions", "plugin-mini-snippets": "plugin-mini-snippets", "plugin-mini-splitjoin": "plugin-mini-splitjoin", + "plugin-mini-starter": "plugin-mini-starter", "plugin-minimap-vim": "plugin-minimap-vim", "plugin-modes-nvim": "plugin-modes-nvim", "plugin-neo-tree-nvim": "plugin-neo-tree-nvim", diff --git a/flake.nix b/flake.nix index be51c405c..716c1247a 100644 --- a/flake.nix +++ b/flake.nix @@ -910,5 +910,10 @@ url = "github:echasnovski/mini.splitjoin"; flake = false; }; + + plugin-mini-starter = { + url = "github:echasnovski/mini.starter"; + flake = false; + }; }; } diff --git a/modules/plugins/mini/default.nix b/modules/plugins/mini/default.nix index 92bd13cee..8cc30c8a4 100644 --- a/modules/plugins/mini/default.nix +++ b/modules/plugins/mini/default.nix @@ -33,5 +33,6 @@ ./sessions ./snippets ./splitjoin + ./starter ]; } diff --git a/modules/plugins/mini/starter/config.nix b/modules/plugins/mini/starter/config.nix new file mode 100644 index 000000000..35b5c950d --- /dev/null +++ b/modules/plugins/mini/starter/config.nix @@ -0,0 +1,19 @@ +{ + config, + lib, + ... +}: let + inherit (lib.modules) mkIf; + inherit (lib.nvim.dag) entryAnywhere; + inherit (lib.nvim.lua) toLuaObject; + + cfg = config.vim.mini.starter; +in { + vim = mkIf cfg.enable { + startPlugins = ["mini-starter"]; + + pluginRC.mini-starter = entryAnywhere '' + require("mini.starter").setup(${toLuaObject cfg.setupOpts}) + ''; + }; +} diff --git a/modules/plugins/mini/starter/default.nix b/modules/plugins/mini/starter/default.nix new file mode 100644 index 000000000..0c98acc69 --- /dev/null +++ b/modules/plugins/mini/starter/default.nix @@ -0,0 +1,6 @@ +{ + imports = [ + ./starter.nix + ./config.nix + ]; +} diff --git a/modules/plugins/mini/starter/starter.nix b/modules/plugins/mini/starter/starter.nix new file mode 100644 index 000000000..cb42061df --- /dev/null +++ b/modules/plugins/mini/starter/starter.nix @@ -0,0 +1,13 @@ +{ + config, + lib, + ... +}: let + inherit (lib.options) mkEnableOption mkOption; + inherit (lib.nvim.types) mkPluginSetupOption; +in { + options.vim.mini.starter = { + enable = mkEnableOption "mini.starter"; + setupOpts = mkPluginSetupOption "mini.starter" {}; + }; +} From d1fa88595b969f2b0a284e5330e2ada2cf10d6d0 Mon Sep 17 00:00:00 2001 From: LilleAila Date: Fri, 17 Jan 2025 21:16:11 +0100 Subject: [PATCH 37/54] mini/statusline: init --- docs/release-notes/rl-0.8.md | 1 + flake.lock | 17 +++++++++++++++++ flake.nix | 5 +++++ modules/plugins/mini/default.nix | 1 + modules/plugins/mini/statusline/config.nix | 19 +++++++++++++++++++ modules/plugins/mini/statusline/default.nix | 6 ++++++ .../plugins/mini/statusline/statusline.nix | 13 +++++++++++++ 7 files changed, 62 insertions(+) create mode 100644 modules/plugins/mini/statusline/config.nix create mode 100644 modules/plugins/mini/statusline/default.nix create mode 100644 modules/plugins/mini/statusline/statusline.nix diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md index c7e0dbe69..54ff3b0cf 100644 --- a/docs/release-notes/rl-0.8.md +++ b/docs/release-notes/rl-0.8.md @@ -88,6 +88,7 @@ - `mini.snippets` - `mini.splitjoin` - `mini.starter` + - `mini.statusline` [kaktu5](https://github.com/kaktu5): diff --git a/flake.lock b/flake.lock index 8cb6430bb..cd751c01f 100644 --- a/flake.lock +++ b/flake.lock @@ -1480,6 +1480,22 @@ "type": "github" } }, + "plugin-mini-statusline": { + "flake": false, + "locked": { + "lastModified": 1735582251, + "narHash": "sha256-AQ2N93JDjtFpgerWTzRspmxrl9oQuALbeCUxBO4ZPqo=", + "owner": "echasnovski", + "repo": "mini.statusline", + "rev": "1b0edf76fe2af015f8c989385ff949f1db7aade2", + "type": "github" + }, + "original": { + "owner": "echasnovski", + "repo": "mini.statusline", + "type": "github" + } + }, "plugin-minimap-vim": { "flake": false, "locked": { @@ -2710,6 +2726,7 @@ "plugin-mini-snippets": "plugin-mini-snippets", "plugin-mini-splitjoin": "plugin-mini-splitjoin", "plugin-mini-starter": "plugin-mini-starter", + "plugin-mini-statusline": "plugin-mini-statusline", "plugin-minimap-vim": "plugin-minimap-vim", "plugin-modes-nvim": "plugin-modes-nvim", "plugin-neo-tree-nvim": "plugin-neo-tree-nvim", diff --git a/flake.nix b/flake.nix index 716c1247a..83a9d88ac 100644 --- a/flake.nix +++ b/flake.nix @@ -915,5 +915,10 @@ url = "github:echasnovski/mini.starter"; flake = false; }; + + plugin-mini-statusline = { + url = "github:echasnovski/mini.statusline"; + flake = false; + }; }; } diff --git a/modules/plugins/mini/default.nix b/modules/plugins/mini/default.nix index 8cc30c8a4..d68660fd2 100644 --- a/modules/plugins/mini/default.nix +++ b/modules/plugins/mini/default.nix @@ -34,5 +34,6 @@ ./snippets ./splitjoin ./starter + ./statusline ]; } diff --git a/modules/plugins/mini/statusline/config.nix b/modules/plugins/mini/statusline/config.nix new file mode 100644 index 000000000..9f89b8a49 --- /dev/null +++ b/modules/plugins/mini/statusline/config.nix @@ -0,0 +1,19 @@ +{ + config, + lib, + ... +}: let + inherit (lib.modules) mkIf; + inherit (lib.nvim.dag) entryAnywhere; + inherit (lib.nvim.lua) toLuaObject; + + cfg = config.vim.mini.statusline; +in { + vim = mkIf cfg.enable { + startPlugins = ["mini-statusline"]; + + pluginRC.mini-statusline = entryAnywhere '' + require("mini.statusline").setup(${toLuaObject cfg.setupOpts}) + ''; + }; +} diff --git a/modules/plugins/mini/statusline/default.nix b/modules/plugins/mini/statusline/default.nix new file mode 100644 index 000000000..9fd274e21 --- /dev/null +++ b/modules/plugins/mini/statusline/default.nix @@ -0,0 +1,6 @@ +{ + imports = [ + ./statusline.nix + ./config.nix + ]; +} diff --git a/modules/plugins/mini/statusline/statusline.nix b/modules/plugins/mini/statusline/statusline.nix new file mode 100644 index 000000000..9e1301cf6 --- /dev/null +++ b/modules/plugins/mini/statusline/statusline.nix @@ -0,0 +1,13 @@ +{ + config, + lib, + ... +}: let + inherit (lib.options) mkEnableOption mkOption; + inherit (lib.nvim.types) mkPluginSetupOption; +in { + options.vim.mini.statusline = { + enable = mkEnableOption "mini.statusline"; + setupOpts = mkPluginSetupOption "mini.statusline" {}; + }; +} From 8809ecd689071dc2eb39aebd45ea3576fd0360e4 Mon Sep 17 00:00:00 2001 From: LilleAila Date: Fri, 17 Jan 2025 21:18:42 +0100 Subject: [PATCH 38/54] mini/surround: init --- docs/release-notes/rl-0.8.md | 1 + flake.lock | 17 +++++++++++++++++ flake.nix | 5 +++++ modules/plugins/mini/default.nix | 1 + modules/plugins/mini/surround/config.nix | 19 +++++++++++++++++++ modules/plugins/mini/surround/default.nix | 6 ++++++ modules/plugins/mini/surround/surround.nix | 13 +++++++++++++ 7 files changed, 62 insertions(+) create mode 100644 modules/plugins/mini/surround/config.nix create mode 100644 modules/plugins/mini/surround/default.nix create mode 100644 modules/plugins/mini/surround/surround.nix diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md index 54ff3b0cf..0c38c1add 100644 --- a/docs/release-notes/rl-0.8.md +++ b/docs/release-notes/rl-0.8.md @@ -89,6 +89,7 @@ - `mini.splitjoin` - `mini.starter` - `mini.statusline` + - `mini.surround` [kaktu5](https://github.com/kaktu5): diff --git a/flake.lock b/flake.lock index cd751c01f..3c754e31a 100644 --- a/flake.lock +++ b/flake.lock @@ -1496,6 +1496,22 @@ "type": "github" } }, + "plugin-mini-surround": { + "flake": false, + "locked": { + "lastModified": 1733662812, + "narHash": "sha256-okWJlG0KOdg1ShvkIIMnPSoOzGd7K84eDcp5kx6eVP8=", + "owner": "echasnovski", + "repo": "mini.surround", + "rev": "aa5e245829dd12d8ff0c96ef11da28681d6049aa", + "type": "github" + }, + "original": { + "owner": "echasnovski", + "repo": "mini.surround", + "type": "github" + } + }, "plugin-minimap-vim": { "flake": false, "locked": { @@ -2727,6 +2743,7 @@ "plugin-mini-splitjoin": "plugin-mini-splitjoin", "plugin-mini-starter": "plugin-mini-starter", "plugin-mini-statusline": "plugin-mini-statusline", + "plugin-mini-surround": "plugin-mini-surround", "plugin-minimap-vim": "plugin-minimap-vim", "plugin-modes-nvim": "plugin-modes-nvim", "plugin-neo-tree-nvim": "plugin-neo-tree-nvim", diff --git a/flake.nix b/flake.nix index 83a9d88ac..0c030c5f2 100644 --- a/flake.nix +++ b/flake.nix @@ -920,5 +920,10 @@ url = "github:echasnovski/mini.statusline"; flake = false; }; + + plugin-mini-surround = { + url = "github:echasnovski/mini.surround"; + flake = false; + }; }; } diff --git a/modules/plugins/mini/default.nix b/modules/plugins/mini/default.nix index d68660fd2..0acb6344d 100644 --- a/modules/plugins/mini/default.nix +++ b/modules/plugins/mini/default.nix @@ -35,5 +35,6 @@ ./splitjoin ./starter ./statusline + ./surround ]; } diff --git a/modules/plugins/mini/surround/config.nix b/modules/plugins/mini/surround/config.nix new file mode 100644 index 000000000..a02646852 --- /dev/null +++ b/modules/plugins/mini/surround/config.nix @@ -0,0 +1,19 @@ +{ + config, + lib, + ... +}: let + inherit (lib.modules) mkIf; + inherit (lib.nvim.dag) entryAnywhere; + inherit (lib.nvim.lua) toLuaObject; + + cfg = config.vim.mini.surround; +in { + vim = mkIf cfg.enable { + startPlugins = ["mini-surround"]; + + pluginRC.mini-surround = entryAnywhere '' + require("mini.surround").setup(${toLuaObject cfg.setupOpts}) + ''; + }; +} diff --git a/modules/plugins/mini/surround/default.nix b/modules/plugins/mini/surround/default.nix new file mode 100644 index 000000000..95d7a2f54 --- /dev/null +++ b/modules/plugins/mini/surround/default.nix @@ -0,0 +1,6 @@ +{ + imports = [ + ./surround.nix + ./config.nix + ]; +} diff --git a/modules/plugins/mini/surround/surround.nix b/modules/plugins/mini/surround/surround.nix new file mode 100644 index 000000000..f4c1c199d --- /dev/null +++ b/modules/plugins/mini/surround/surround.nix @@ -0,0 +1,13 @@ +{ + config, + lib, + ... +}: let + inherit (lib.options) mkEnableOption mkOption; + inherit (lib.nvim.types) mkPluginSetupOption; +in { + options.vim.mini.surround = { + enable = mkEnableOption "mini.surround"; + setupOpts = mkPluginSetupOption "mini.surround" {}; + }; +} From 400c7b84e36d8e187deddc20ecd861941357865c Mon Sep 17 00:00:00 2001 From: LilleAila Date: Fri, 17 Jan 2025 21:20:20 +0100 Subject: [PATCH 39/54] mini/tabline: init --- docs/release-notes/rl-0.8.md | 1 + flake.lock | 17 +++++++++++++++++ flake.nix | 5 +++++ modules/plugins/mini/default.nix | 1 + modules/plugins/mini/tabline/config.nix | 19 +++++++++++++++++++ modules/plugins/mini/tabline/default.nix | 6 ++++++ modules/plugins/mini/tabline/tabline.nix | 13 +++++++++++++ 7 files changed, 62 insertions(+) create mode 100644 modules/plugins/mini/tabline/config.nix create mode 100644 modules/plugins/mini/tabline/default.nix create mode 100644 modules/plugins/mini/tabline/tabline.nix diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md index 0c38c1add..313d2e417 100644 --- a/docs/release-notes/rl-0.8.md +++ b/docs/release-notes/rl-0.8.md @@ -90,6 +90,7 @@ - `mini.starter` - `mini.statusline` - `mini.surround` + - `mini.tabline` [kaktu5](https://github.com/kaktu5): diff --git a/flake.lock b/flake.lock index 3c754e31a..a19965720 100644 --- a/flake.lock +++ b/flake.lock @@ -1512,6 +1512,22 @@ "type": "github" } }, + "plugin-mini-tabline": { + "flake": false, + "locked": { + "lastModified": 1729176541, + "narHash": "sha256-nucUqSN8w2xBnDp1dFBgRVVvfVoqZMdx7Zj78wdFAP0=", + "owner": "echasnovski", + "repo": "mini.tabline", + "rev": "06ef4ecaeca2e362c7d31113435d86d144b3cbbe", + "type": "github" + }, + "original": { + "owner": "echasnovski", + "repo": "mini.tabline", + "type": "github" + } + }, "plugin-minimap-vim": { "flake": false, "locked": { @@ -2744,6 +2760,7 @@ "plugin-mini-starter": "plugin-mini-starter", "plugin-mini-statusline": "plugin-mini-statusline", "plugin-mini-surround": "plugin-mini-surround", + "plugin-mini-tabline": "plugin-mini-tabline", "plugin-minimap-vim": "plugin-minimap-vim", "plugin-modes-nvim": "plugin-modes-nvim", "plugin-neo-tree-nvim": "plugin-neo-tree-nvim", diff --git a/flake.nix b/flake.nix index 0c030c5f2..d81a87d45 100644 --- a/flake.nix +++ b/flake.nix @@ -925,5 +925,10 @@ url = "github:echasnovski/mini.surround"; flake = false; }; + + plugin-mini-tabline = { + url = "github:echasnovski/mini.tabline"; + flake = false; + }; }; } diff --git a/modules/plugins/mini/default.nix b/modules/plugins/mini/default.nix index 0acb6344d..e18ecbbac 100644 --- a/modules/plugins/mini/default.nix +++ b/modules/plugins/mini/default.nix @@ -36,5 +36,6 @@ ./starter ./statusline ./surround + ./tabline ]; } diff --git a/modules/plugins/mini/tabline/config.nix b/modules/plugins/mini/tabline/config.nix new file mode 100644 index 000000000..b807e5634 --- /dev/null +++ b/modules/plugins/mini/tabline/config.nix @@ -0,0 +1,19 @@ +{ + config, + lib, + ... +}: let + inherit (lib.modules) mkIf; + inherit (lib.nvim.dag) entryAnywhere; + inherit (lib.nvim.lua) toLuaObject; + + cfg = config.vim.mini.tabline; +in { + vim = mkIf cfg.enable { + startPlugins = ["mini-tabline"]; + + pluginRC.mini-tabline = entryAnywhere '' + require("mini.tabline").setup(${toLuaObject cfg.setupOpts}) + ''; + }; +} diff --git a/modules/plugins/mini/tabline/default.nix b/modules/plugins/mini/tabline/default.nix new file mode 100644 index 000000000..38462e0f6 --- /dev/null +++ b/modules/plugins/mini/tabline/default.nix @@ -0,0 +1,6 @@ +{ + imports = [ + ./tabline.nix + ./config.nix + ]; +} diff --git a/modules/plugins/mini/tabline/tabline.nix b/modules/plugins/mini/tabline/tabline.nix new file mode 100644 index 000000000..7dc48222a --- /dev/null +++ b/modules/plugins/mini/tabline/tabline.nix @@ -0,0 +1,13 @@ +{ + config, + lib, + ... +}: let + inherit (lib.options) mkEnableOption mkOption; + inherit (lib.nvim.types) mkPluginSetupOption; +in { + options.vim.mini.tabline = { + enable = mkEnableOption "mini.tabline"; + setupOpts = mkPluginSetupOption "mini.tabline" {}; + }; +} From ae767781869c1484a166db7cc44d5c4a7f7a0f85 Mon Sep 17 00:00:00 2001 From: LilleAila Date: Fri, 17 Jan 2025 21:22:23 +0100 Subject: [PATCH 40/54] mini/test: init --- docs/release-notes/rl-0.8.md | 1 + flake.lock | 17 +++++++++++++++++ flake.nix | 5 +++++ modules/plugins/mini/default.nix | 1 + modules/plugins/mini/test/config.nix | 19 +++++++++++++++++++ modules/plugins/mini/test/default.nix | 6 ++++++ modules/plugins/mini/test/test.nix | 13 +++++++++++++ 7 files changed, 62 insertions(+) create mode 100644 modules/plugins/mini/test/config.nix create mode 100644 modules/plugins/mini/test/default.nix create mode 100644 modules/plugins/mini/test/test.nix diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md index 313d2e417..379195b72 100644 --- a/docs/release-notes/rl-0.8.md +++ b/docs/release-notes/rl-0.8.md @@ -91,6 +91,7 @@ - `mini.statusline` - `mini.surround` - `mini.tabline` + - `mini.test` [kaktu5](https://github.com/kaktu5): diff --git a/flake.lock b/flake.lock index a19965720..fb274a3ec 100644 --- a/flake.lock +++ b/flake.lock @@ -1528,6 +1528,22 @@ "type": "github" } }, + "plugin-mini-test": { + "flake": false, + "locked": { + "lastModified": 1729520957, + "narHash": "sha256-NtsX441k84owAAJywq4G2rMvV6d7UR2K75G8oKam+gs=", + "owner": "echasnovski", + "repo": "mini.test", + "rev": "86a64d5a4bf9d73ebf5875edaae0d878f64f5e48", + "type": "github" + }, + "original": { + "owner": "echasnovski", + "repo": "mini.test", + "type": "github" + } + }, "plugin-minimap-vim": { "flake": false, "locked": { @@ -2761,6 +2777,7 @@ "plugin-mini-statusline": "plugin-mini-statusline", "plugin-mini-surround": "plugin-mini-surround", "plugin-mini-tabline": "plugin-mini-tabline", + "plugin-mini-test": "plugin-mini-test", "plugin-minimap-vim": "plugin-minimap-vim", "plugin-modes-nvim": "plugin-modes-nvim", "plugin-neo-tree-nvim": "plugin-neo-tree-nvim", diff --git a/flake.nix b/flake.nix index d81a87d45..b62626533 100644 --- a/flake.nix +++ b/flake.nix @@ -930,5 +930,10 @@ url = "github:echasnovski/mini.tabline"; flake = false; }; + + plugin-mini-test = { + url = "github:echasnovski/mini.test"; + flake = false; + }; }; } diff --git a/modules/plugins/mini/default.nix b/modules/plugins/mini/default.nix index e18ecbbac..1025a927b 100644 --- a/modules/plugins/mini/default.nix +++ b/modules/plugins/mini/default.nix @@ -37,5 +37,6 @@ ./statusline ./surround ./tabline + ./test ]; } diff --git a/modules/plugins/mini/test/config.nix b/modules/plugins/mini/test/config.nix new file mode 100644 index 000000000..bff429660 --- /dev/null +++ b/modules/plugins/mini/test/config.nix @@ -0,0 +1,19 @@ +{ + config, + lib, + ... +}: let + inherit (lib.modules) mkIf; + inherit (lib.nvim.dag) entryAnywhere; + inherit (lib.nvim.lua) toLuaObject; + + cfg = config.vim.mini.test; +in { + vim = mkIf cfg.enable { + startPlugins = ["mini-test"]; + + pluginRC.mini-test = entryAnywhere '' + require("mini.test").setup(${toLuaObject cfg.setupOpts}) + ''; + }; +} diff --git a/modules/plugins/mini/test/default.nix b/modules/plugins/mini/test/default.nix new file mode 100644 index 000000000..e78c72509 --- /dev/null +++ b/modules/plugins/mini/test/default.nix @@ -0,0 +1,6 @@ +{ + imports = [ + ./test.nix + ./config.nix + ]; +} diff --git a/modules/plugins/mini/test/test.nix b/modules/plugins/mini/test/test.nix new file mode 100644 index 000000000..fba4db0bd --- /dev/null +++ b/modules/plugins/mini/test/test.nix @@ -0,0 +1,13 @@ +{ + config, + lib, + ... +}: let + inherit (lib.options) mkEnableOption mkOption; + inherit (lib.nvim.types) mkPluginSetupOption; +in { + options.vim.mini.test = { + enable = mkEnableOption "mini.test"; + setupOpts = mkPluginSetupOption "mini.test" {}; + }; +} From 0994337d02996490c990c5ae9dc931134fbbb4b1 Mon Sep 17 00:00:00 2001 From: LilleAila Date: Fri, 17 Jan 2025 21:23:56 +0100 Subject: [PATCH 41/54] mini/trailspace: init --- docs/release-notes/rl-0.8.md | 1 + flake.lock | 17 +++++++++++++++++ flake.nix | 5 +++++ modules/plugins/mini/default.nix | 1 + modules/plugins/mini/trailspace/config.nix | 19 +++++++++++++++++++ modules/plugins/mini/trailspace/default.nix | 6 ++++++ .../plugins/mini/trailspace/trailspace.nix | 13 +++++++++++++ 7 files changed, 62 insertions(+) create mode 100644 modules/plugins/mini/trailspace/config.nix create mode 100644 modules/plugins/mini/trailspace/default.nix create mode 100644 modules/plugins/mini/trailspace/trailspace.nix diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md index 379195b72..1d683202b 100644 --- a/docs/release-notes/rl-0.8.md +++ b/docs/release-notes/rl-0.8.md @@ -92,6 +92,7 @@ - `mini.surround` - `mini.tabline` - `mini.test` + - `mini.trailspace` [kaktu5](https://github.com/kaktu5): diff --git a/flake.lock b/flake.lock index fb274a3ec..c7a574996 100644 --- a/flake.lock +++ b/flake.lock @@ -1544,6 +1544,22 @@ "type": "github" } }, + "plugin-mini-trailspace": { + "flake": false, + "locked": { + "lastModified": 1725613928, + "narHash": "sha256-JKYvFz8g8kVZvxE44RhwoHXQykghXx7ebW/Mj1ZdJIw=", + "owner": "echasnovski", + "repo": "mini.trailspace", + "rev": "3a328e62559c33014e422fb9ae97afc4208208b1", + "type": "github" + }, + "original": { + "owner": "echasnovski", + "repo": "mini.trailspace", + "type": "github" + } + }, "plugin-minimap-vim": { "flake": false, "locked": { @@ -2778,6 +2794,7 @@ "plugin-mini-surround": "plugin-mini-surround", "plugin-mini-tabline": "plugin-mini-tabline", "plugin-mini-test": "plugin-mini-test", + "plugin-mini-trailspace": "plugin-mini-trailspace", "plugin-minimap-vim": "plugin-minimap-vim", "plugin-modes-nvim": "plugin-modes-nvim", "plugin-neo-tree-nvim": "plugin-neo-tree-nvim", diff --git a/flake.nix b/flake.nix index b62626533..106d2bdd4 100644 --- a/flake.nix +++ b/flake.nix @@ -935,5 +935,10 @@ url = "github:echasnovski/mini.test"; flake = false; }; + + plugin-mini-trailspace = { + url = "github:echasnovski/mini.trailspace"; + flake = false; + }; }; } diff --git a/modules/plugins/mini/default.nix b/modules/plugins/mini/default.nix index 1025a927b..89d289993 100644 --- a/modules/plugins/mini/default.nix +++ b/modules/plugins/mini/default.nix @@ -38,5 +38,6 @@ ./surround ./tabline ./test + ./trailspace ]; } diff --git a/modules/plugins/mini/trailspace/config.nix b/modules/plugins/mini/trailspace/config.nix new file mode 100644 index 000000000..6ed9ba8a6 --- /dev/null +++ b/modules/plugins/mini/trailspace/config.nix @@ -0,0 +1,19 @@ +{ + config, + lib, + ... +}: let + inherit (lib.modules) mkIf; + inherit (lib.nvim.dag) entryAnywhere; + inherit (lib.nvim.lua) toLuaObject; + + cfg = config.vim.mini.trailspace; +in { + vim = mkIf cfg.enable { + startPlugins = ["mini-trailspace"]; + + pluginRC.mini-trailspace = entryAnywhere '' + require("mini.trailspace").setup(${toLuaObject cfg.setupOpts}) + ''; + }; +} diff --git a/modules/plugins/mini/trailspace/default.nix b/modules/plugins/mini/trailspace/default.nix new file mode 100644 index 000000000..7e9adcba8 --- /dev/null +++ b/modules/plugins/mini/trailspace/default.nix @@ -0,0 +1,6 @@ +{ + imports = [ + ./trailspace.nix + ./config.nix + ]; +} diff --git a/modules/plugins/mini/trailspace/trailspace.nix b/modules/plugins/mini/trailspace/trailspace.nix new file mode 100644 index 000000000..003e159c8 --- /dev/null +++ b/modules/plugins/mini/trailspace/trailspace.nix @@ -0,0 +1,13 @@ +{ + config, + lib, + ... +}: let + inherit (lib.options) mkEnableOption mkOption; + inherit (lib.nvim.types) mkPluginSetupOption; +in { + options.vim.mini.trailspace = { + enable = mkEnableOption "mini.trailspace"; + setupOpts = mkPluginSetupOption "mini.trailspace" {}; + }; +} From e8e5594fb9a9b68a5b42062318c88bc9aaf2dfa6 Mon Sep 17 00:00:00 2001 From: LilleAila Date: Fri, 17 Jan 2025 21:25:28 +0100 Subject: [PATCH 42/54] mini/visits: init --- docs/release-notes/rl-0.8.md | 1 + flake.lock | 17 +++++++++++++++++ flake.nix | 5 +++++ modules/plugins/mini/default.nix | 1 + modules/plugins/mini/visits/config.nix | 19 +++++++++++++++++++ modules/plugins/mini/visits/default.nix | 6 ++++++ modules/plugins/mini/visits/visits.nix | 13 +++++++++++++ 7 files changed, 62 insertions(+) create mode 100644 modules/plugins/mini/visits/config.nix create mode 100644 modules/plugins/mini/visits/default.nix create mode 100644 modules/plugins/mini/visits/visits.nix diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md index 1d683202b..421b79163 100644 --- a/docs/release-notes/rl-0.8.md +++ b/docs/release-notes/rl-0.8.md @@ -93,6 +93,7 @@ - `mini.tabline` - `mini.test` - `mini.trailspace` + - `mini.visits` [kaktu5](https://github.com/kaktu5): diff --git a/flake.lock b/flake.lock index c7a574996..148cc4e1d 100644 --- a/flake.lock +++ b/flake.lock @@ -1560,6 +1560,22 @@ "type": "github" } }, + "plugin-mini-visits": { + "flake": false, + "locked": { + "lastModified": 1737036221, + "narHash": "sha256-Q+m1gZ5Obu6Zzo87Djt6VCX76ZjdOiLb0j771jP8uQE=", + "owner": "echasnovski", + "repo": "mini.visits", + "rev": "90f20ba6ab7d3d7cb984fffddd82f5f6c7a6bea7", + "type": "github" + }, + "original": { + "owner": "echasnovski", + "repo": "mini.visits", + "type": "github" + } + }, "plugin-minimap-vim": { "flake": false, "locked": { @@ -2795,6 +2811,7 @@ "plugin-mini-tabline": "plugin-mini-tabline", "plugin-mini-test": "plugin-mini-test", "plugin-mini-trailspace": "plugin-mini-trailspace", + "plugin-mini-visits": "plugin-mini-visits", "plugin-minimap-vim": "plugin-minimap-vim", "plugin-modes-nvim": "plugin-modes-nvim", "plugin-neo-tree-nvim": "plugin-neo-tree-nvim", diff --git a/flake.nix b/flake.nix index 106d2bdd4..99eeada42 100644 --- a/flake.nix +++ b/flake.nix @@ -940,5 +940,10 @@ url = "github:echasnovski/mini.trailspace"; flake = false; }; + + plugin-mini-visits = { + url = "github:echasnovski/mini.visits"; + flake = false; + }; }; } diff --git a/modules/plugins/mini/default.nix b/modules/plugins/mini/default.nix index 89d289993..8f035285d 100644 --- a/modules/plugins/mini/default.nix +++ b/modules/plugins/mini/default.nix @@ -39,5 +39,6 @@ ./tabline ./test ./trailspace + ./visits ]; } diff --git a/modules/plugins/mini/visits/config.nix b/modules/plugins/mini/visits/config.nix new file mode 100644 index 000000000..424a81c28 --- /dev/null +++ b/modules/plugins/mini/visits/config.nix @@ -0,0 +1,19 @@ +{ + config, + lib, + ... +}: let + inherit (lib.modules) mkIf; + inherit (lib.nvim.dag) entryAnywhere; + inherit (lib.nvim.lua) toLuaObject; + + cfg = config.vim.mini.visits; +in { + vim = mkIf cfg.enable { + startPlugins = ["mini-visits"]; + + pluginRC.mini-visits = entryAnywhere '' + require("mini.visits").setup(${toLuaObject cfg.setupOpts}) + ''; + }; +} diff --git a/modules/plugins/mini/visits/default.nix b/modules/plugins/mini/visits/default.nix new file mode 100644 index 000000000..192eca9e0 --- /dev/null +++ b/modules/plugins/mini/visits/default.nix @@ -0,0 +1,6 @@ +{ + imports = [ + ./visits.nix + ./config.nix + ]; +} diff --git a/modules/plugins/mini/visits/visits.nix b/modules/plugins/mini/visits/visits.nix new file mode 100644 index 000000000..0560533e8 --- /dev/null +++ b/modules/plugins/mini/visits/visits.nix @@ -0,0 +1,13 @@ +{ + config, + lib, + ... +}: let + inherit (lib.options) mkEnableOption mkOption; + inherit (lib.nvim.types) mkPluginSetupOption; +in { + options.vim.mini.visits = { + enable = mkEnableOption "mini.visits"; + setupOpts = mkPluginSetupOption "mini.visits" {}; + }; +} From f1f89a5c490d7ffaaff65d64632bc949c4e8de47 Mon Sep 17 00:00:00 2001 From: LilleAila Date: Fri, 17 Jan 2025 21:29:48 +0100 Subject: [PATCH 43/54] mini/*: remove unused inherits --- modules/plugins/mini/ai/ai.nix | 2 +- modules/plugins/mini/align/align.nix | 2 +- modules/plugins/mini/animate/animate.nix | 2 +- modules/plugins/mini/basics/basics.nix | 2 +- modules/plugins/mini/bracketed/bracketed.nix | 2 +- modules/plugins/mini/bufremove/bufremove.nix | 2 +- modules/plugins/mini/clue/clue.nix | 2 +- modules/plugins/mini/colors/colors.nix | 2 +- modules/plugins/mini/comment/comment.nix | 2 +- modules/plugins/mini/completion/completion.nix | 2 +- modules/plugins/mini/diff/diff.nix | 2 +- modules/plugins/mini/doc/doc.nix | 2 +- modules/plugins/mini/extra/extra.nix | 2 +- modules/plugins/mini/files/files.nix | 2 +- modules/plugins/mini/fuzzy/fuzzy.nix | 2 +- modules/plugins/mini/git/git.nix | 2 +- modules/plugins/mini/hipatterns/hipatterns.nix | 2 +- modules/plugins/mini/icons/icons.nix | 2 +- modules/plugins/mini/indentscope/indentscope.nix | 2 +- modules/plugins/mini/jump/jump.nix | 2 +- modules/plugins/mini/jump2d/jump2d.nix | 2 +- modules/plugins/mini/map/map.nix | 2 +- modules/plugins/mini/misc/misc.nix | 2 +- modules/plugins/mini/move/move.nix | 2 +- modules/plugins/mini/notify/notify.nix | 2 +- modules/plugins/mini/operators/operators.nix | 2 +- modules/plugins/mini/pairs/pairs.nix | 2 +- modules/plugins/mini/pick/pick.nix | 2 +- modules/plugins/mini/sessions/sessions.nix | 2 +- modules/plugins/mini/snippets/snippets.nix | 2 +- modules/plugins/mini/splitjoin/splitjoin.nix | 2 +- modules/plugins/mini/starter/starter.nix | 2 +- modules/plugins/mini/statusline/statusline.nix | 2 +- modules/plugins/mini/surround/surround.nix | 2 +- modules/plugins/mini/tabline/tabline.nix | 2 +- modules/plugins/mini/test/test.nix | 2 +- modules/plugins/mini/trailspace/trailspace.nix | 2 +- modules/plugins/mini/visits/visits.nix | 2 +- 38 files changed, 38 insertions(+), 38 deletions(-) diff --git a/modules/plugins/mini/ai/ai.nix b/modules/plugins/mini/ai/ai.nix index c8e60b8e2..d0da31d7e 100644 --- a/modules/plugins/mini/ai/ai.nix +++ b/modules/plugins/mini/ai/ai.nix @@ -3,7 +3,7 @@ lib, ... }: let - inherit (lib.options) mkEnableOption mkOption; + inherit (lib.options) mkEnableOption; inherit (lib.nvim.types) mkPluginSetupOption; in { options.vim.mini.ai = { diff --git a/modules/plugins/mini/align/align.nix b/modules/plugins/mini/align/align.nix index c21e9532d..96c829470 100644 --- a/modules/plugins/mini/align/align.nix +++ b/modules/plugins/mini/align/align.nix @@ -3,7 +3,7 @@ lib, ... }: let - inherit (lib.options) mkEnableOption mkOption; + inherit (lib.options) mkEnableOption; inherit (lib.nvim.types) mkPluginSetupOption; in { options.vim.mini.align = { diff --git a/modules/plugins/mini/animate/animate.nix b/modules/plugins/mini/animate/animate.nix index 6be633b58..fb17c0bd6 100644 --- a/modules/plugins/mini/animate/animate.nix +++ b/modules/plugins/mini/animate/animate.nix @@ -3,7 +3,7 @@ lib, ... }: let - inherit (lib.options) mkEnableOption mkOption; + inherit (lib.options) mkEnableOption; inherit (lib.nvim.types) mkPluginSetupOption; in { options.vim.mini.animate = { diff --git a/modules/plugins/mini/basics/basics.nix b/modules/plugins/mini/basics/basics.nix index b2a4ff307..e855caa65 100644 --- a/modules/plugins/mini/basics/basics.nix +++ b/modules/plugins/mini/basics/basics.nix @@ -3,7 +3,7 @@ lib, ... }: let - inherit (lib.options) mkEnableOption mkOption; + inherit (lib.options) mkEnableOption; inherit (lib.nvim.types) mkPluginSetupOption; in { options.vim.mini.basics = { diff --git a/modules/plugins/mini/bracketed/bracketed.nix b/modules/plugins/mini/bracketed/bracketed.nix index 950f4e7fd..3152f0468 100644 --- a/modules/plugins/mini/bracketed/bracketed.nix +++ b/modules/plugins/mini/bracketed/bracketed.nix @@ -3,7 +3,7 @@ lib, ... }: let - inherit (lib.options) mkEnableOption mkOption; + inherit (lib.options) mkEnableOption; inherit (lib.nvim.types) mkPluginSetupOption; in { options.vim.mini.bracketed = { diff --git a/modules/plugins/mini/bufremove/bufremove.nix b/modules/plugins/mini/bufremove/bufremove.nix index 79b849367..5e04609d9 100644 --- a/modules/plugins/mini/bufremove/bufremove.nix +++ b/modules/plugins/mini/bufremove/bufremove.nix @@ -3,7 +3,7 @@ lib, ... }: let - inherit (lib.options) mkEnableOption mkOption; + inherit (lib.options) mkEnableOption; inherit (lib.nvim.types) mkPluginSetupOption; in { options.vim.mini.bufremove = { diff --git a/modules/plugins/mini/clue/clue.nix b/modules/plugins/mini/clue/clue.nix index de4cf2ee1..50d33c655 100644 --- a/modules/plugins/mini/clue/clue.nix +++ b/modules/plugins/mini/clue/clue.nix @@ -3,7 +3,7 @@ lib, ... }: let - inherit (lib.options) mkEnableOption mkOption; + inherit (lib.options) mkEnableOption; inherit (lib.nvim.types) mkPluginSetupOption; in { options.vim.mini.clue = { diff --git a/modules/plugins/mini/colors/colors.nix b/modules/plugins/mini/colors/colors.nix index 81fe58404..7d56cd491 100644 --- a/modules/plugins/mini/colors/colors.nix +++ b/modules/plugins/mini/colors/colors.nix @@ -3,7 +3,7 @@ lib, ... }: let - inherit (lib.options) mkEnableOption mkOption; + inherit (lib.options) mkEnableOption; in { options.vim.mini.colors = { enable = mkEnableOption "mini.colors"; diff --git a/modules/plugins/mini/comment/comment.nix b/modules/plugins/mini/comment/comment.nix index 2231a3600..c46c0a58d 100644 --- a/modules/plugins/mini/comment/comment.nix +++ b/modules/plugins/mini/comment/comment.nix @@ -3,7 +3,7 @@ lib, ... }: let - inherit (lib.options) mkEnableOption mkOption; + inherit (lib.options) mkEnableOption; inherit (lib.nvim.types) mkPluginSetupOption; in { options.vim.mini.comment = { diff --git a/modules/plugins/mini/completion/completion.nix b/modules/plugins/mini/completion/completion.nix index a5f8caa57..fc36ed840 100644 --- a/modules/plugins/mini/completion/completion.nix +++ b/modules/plugins/mini/completion/completion.nix @@ -3,7 +3,7 @@ lib, ... }: let - inherit (lib.options) mkEnableOption mkOption; + inherit (lib.options) mkEnableOption; inherit (lib.nvim.types) mkPluginSetupOption; in { options.vim.mini.completion = { diff --git a/modules/plugins/mini/diff/diff.nix b/modules/plugins/mini/diff/diff.nix index 8438cec92..4a72fda28 100644 --- a/modules/plugins/mini/diff/diff.nix +++ b/modules/plugins/mini/diff/diff.nix @@ -3,7 +3,7 @@ lib, ... }: let - inherit (lib.options) mkEnableOption mkOption; + inherit (lib.options) mkEnableOption; inherit (lib.nvim.types) mkPluginSetupOption; in { options.vim.mini.diff = { diff --git a/modules/plugins/mini/doc/doc.nix b/modules/plugins/mini/doc/doc.nix index f1e65730b..8699fa112 100644 --- a/modules/plugins/mini/doc/doc.nix +++ b/modules/plugins/mini/doc/doc.nix @@ -3,7 +3,7 @@ lib, ... }: let - inherit (lib.options) mkEnableOption mkOption; + inherit (lib.options) mkEnableOption; inherit (lib.nvim.types) mkPluginSetupOption; in { options.vim.mini.doc = { diff --git a/modules/plugins/mini/extra/extra.nix b/modules/plugins/mini/extra/extra.nix index c57e6cdca..c697fdd66 100644 --- a/modules/plugins/mini/extra/extra.nix +++ b/modules/plugins/mini/extra/extra.nix @@ -3,7 +3,7 @@ lib, ... }: let - inherit (lib.options) mkEnableOption mkOption; + inherit (lib.options) mkEnableOption; in { options.vim.mini.extra = { enable = mkEnableOption "mini.extra"; diff --git a/modules/plugins/mini/files/files.nix b/modules/plugins/mini/files/files.nix index f9c3f8ca6..4ba5fcc49 100644 --- a/modules/plugins/mini/files/files.nix +++ b/modules/plugins/mini/files/files.nix @@ -3,7 +3,7 @@ lib, ... }: let - inherit (lib.options) mkEnableOption mkOption; + inherit (lib.options) mkEnableOption; inherit (lib.nvim.types) mkPluginSetupOption; in { options.vim.mini.files = { diff --git a/modules/plugins/mini/fuzzy/fuzzy.nix b/modules/plugins/mini/fuzzy/fuzzy.nix index c5c486fc9..977a17638 100644 --- a/modules/plugins/mini/fuzzy/fuzzy.nix +++ b/modules/plugins/mini/fuzzy/fuzzy.nix @@ -3,7 +3,7 @@ lib, ... }: let - inherit (lib.options) mkEnableOption mkOption; + inherit (lib.options) mkEnableOption; inherit (lib.nvim.types) mkPluginSetupOption; in { options.vim.mini.fuzzy = { diff --git a/modules/plugins/mini/git/git.nix b/modules/plugins/mini/git/git.nix index f77a7502e..ebbf42822 100644 --- a/modules/plugins/mini/git/git.nix +++ b/modules/plugins/mini/git/git.nix @@ -3,7 +3,7 @@ lib, ... }: let - inherit (lib.options) mkEnableOption mkOption; + inherit (lib.options) mkEnableOption; inherit (lib.nvim.types) mkPluginSetupOption; in { options.vim.mini.git = { diff --git a/modules/plugins/mini/hipatterns/hipatterns.nix b/modules/plugins/mini/hipatterns/hipatterns.nix index 31921a898..019626cf9 100644 --- a/modules/plugins/mini/hipatterns/hipatterns.nix +++ b/modules/plugins/mini/hipatterns/hipatterns.nix @@ -3,7 +3,7 @@ lib, ... }: let - inherit (lib.options) mkEnableOption mkOption; + inherit (lib.options) mkEnableOption; inherit (lib.nvim.types) mkPluginSetupOption; in { options.vim.mini.hipatterns = { diff --git a/modules/plugins/mini/icons/icons.nix b/modules/plugins/mini/icons/icons.nix index 096fa9c21..27928a93f 100644 --- a/modules/plugins/mini/icons/icons.nix +++ b/modules/plugins/mini/icons/icons.nix @@ -3,7 +3,7 @@ lib, ... }: let - inherit (lib.options) mkEnableOption mkOption; + inherit (lib.options) mkEnableOption; inherit (lib.nvim.types) mkPluginSetupOption; in { options.vim.mini.icons = { diff --git a/modules/plugins/mini/indentscope/indentscope.nix b/modules/plugins/mini/indentscope/indentscope.nix index 8307a88cd..6feffaee9 100644 --- a/modules/plugins/mini/indentscope/indentscope.nix +++ b/modules/plugins/mini/indentscope/indentscope.nix @@ -3,7 +3,7 @@ lib, ... }: let - inherit (lib.options) mkEnableOption mkOption; + inherit (lib.options) mkEnableOption; inherit (lib.nvim.types) mkPluginSetupOption; in { options.vim.mini.indentscope = { diff --git a/modules/plugins/mini/jump/jump.nix b/modules/plugins/mini/jump/jump.nix index ca9563d3c..1e16ae7a2 100644 --- a/modules/plugins/mini/jump/jump.nix +++ b/modules/plugins/mini/jump/jump.nix @@ -3,7 +3,7 @@ lib, ... }: let - inherit (lib.options) mkEnableOption mkOption; + inherit (lib.options) mkEnableOption; inherit (lib.nvim.types) mkPluginSetupOption; in { options.vim.mini.jump = { diff --git a/modules/plugins/mini/jump2d/jump2d.nix b/modules/plugins/mini/jump2d/jump2d.nix index c25c69025..59f7c2bad 100644 --- a/modules/plugins/mini/jump2d/jump2d.nix +++ b/modules/plugins/mini/jump2d/jump2d.nix @@ -3,7 +3,7 @@ lib, ... }: let - inherit (lib.options) mkEnableOption mkOption; + inherit (lib.options) mkEnableOption; inherit (lib.nvim.types) mkPluginSetupOption; in { options.vim.mini.jump2d = { diff --git a/modules/plugins/mini/map/map.nix b/modules/plugins/mini/map/map.nix index 554e20723..2d42fe701 100644 --- a/modules/plugins/mini/map/map.nix +++ b/modules/plugins/mini/map/map.nix @@ -3,7 +3,7 @@ lib, ... }: let - inherit (lib.options) mkEnableOption mkOption; + inherit (lib.options) mkEnableOption; inherit (lib.nvim.types) mkPluginSetupOption; in { options.vim.mini.map = { diff --git a/modules/plugins/mini/misc/misc.nix b/modules/plugins/mini/misc/misc.nix index 7b36e9fdc..1f4dcf550 100644 --- a/modules/plugins/mini/misc/misc.nix +++ b/modules/plugins/mini/misc/misc.nix @@ -3,7 +3,7 @@ lib, ... }: let - inherit (lib.options) mkEnableOption mkOption; + inherit (lib.options) mkEnableOption; inherit (lib.nvim.types) mkPluginSetupOption; in { options.vim.mini.misc = { diff --git a/modules/plugins/mini/move/move.nix b/modules/plugins/mini/move/move.nix index e97e837b3..ec9eccac9 100644 --- a/modules/plugins/mini/move/move.nix +++ b/modules/plugins/mini/move/move.nix @@ -3,7 +3,7 @@ lib, ... }: let - inherit (lib.options) mkEnableOption mkOption; + inherit (lib.options) mkEnableOption; inherit (lib.nvim.types) mkPluginSetupOption; in { options.vim.mini.move = { diff --git a/modules/plugins/mini/notify/notify.nix b/modules/plugins/mini/notify/notify.nix index 76e8c135e..e98f6e713 100644 --- a/modules/plugins/mini/notify/notify.nix +++ b/modules/plugins/mini/notify/notify.nix @@ -3,7 +3,7 @@ lib, ... }: let - inherit (lib.options) mkEnableOption mkOption; + inherit (lib.options) mkEnableOption; inherit (lib.nvim.types) mkPluginSetupOption; in { options.vim.mini.notify = { diff --git a/modules/plugins/mini/operators/operators.nix b/modules/plugins/mini/operators/operators.nix index c60ad6b51..639229bfe 100644 --- a/modules/plugins/mini/operators/operators.nix +++ b/modules/plugins/mini/operators/operators.nix @@ -3,7 +3,7 @@ lib, ... }: let - inherit (lib.options) mkEnableOption mkOption; + inherit (lib.options) mkEnableOption; inherit (lib.nvim.types) mkPluginSetupOption; in { options.vim.mini.operators = { diff --git a/modules/plugins/mini/pairs/pairs.nix b/modules/plugins/mini/pairs/pairs.nix index db43027b2..926c93d38 100644 --- a/modules/plugins/mini/pairs/pairs.nix +++ b/modules/plugins/mini/pairs/pairs.nix @@ -3,7 +3,7 @@ lib, ... }: let - inherit (lib.options) mkEnableOption mkOption; + inherit (lib.options) mkEnableOption; inherit (lib.nvim.types) mkPluginSetupOption; in { options.vim.mini.pairs = { diff --git a/modules/plugins/mini/pick/pick.nix b/modules/plugins/mini/pick/pick.nix index 8f93ac35f..d8ccbfd50 100644 --- a/modules/plugins/mini/pick/pick.nix +++ b/modules/plugins/mini/pick/pick.nix @@ -3,7 +3,7 @@ lib, ... }: let - inherit (lib.options) mkEnableOption mkOption; + inherit (lib.options) mkEnableOption; inherit (lib.nvim.types) mkPluginSetupOption; in { options.vim.mini.pick = { diff --git a/modules/plugins/mini/sessions/sessions.nix b/modules/plugins/mini/sessions/sessions.nix index 9a3737d6f..0ceba5955 100644 --- a/modules/plugins/mini/sessions/sessions.nix +++ b/modules/plugins/mini/sessions/sessions.nix @@ -3,7 +3,7 @@ lib, ... }: let - inherit (lib.options) mkEnableOption mkOption; + inherit (lib.options) mkEnableOption; inherit (lib.nvim.types) mkPluginSetupOption; in { options.vim.mini.sessions = { diff --git a/modules/plugins/mini/snippets/snippets.nix b/modules/plugins/mini/snippets/snippets.nix index 5dbb15576..d7f0355cd 100644 --- a/modules/plugins/mini/snippets/snippets.nix +++ b/modules/plugins/mini/snippets/snippets.nix @@ -3,7 +3,7 @@ lib, ... }: let - inherit (lib.options) mkEnableOption mkOption; + inherit (lib.options) mkEnableOption; inherit (lib.nvim.types) mkPluginSetupOption; in { options.vim.mini.snippets = { diff --git a/modules/plugins/mini/splitjoin/splitjoin.nix b/modules/plugins/mini/splitjoin/splitjoin.nix index ae4f94209..44b2f23f0 100644 --- a/modules/plugins/mini/splitjoin/splitjoin.nix +++ b/modules/plugins/mini/splitjoin/splitjoin.nix @@ -3,7 +3,7 @@ lib, ... }: let - inherit (lib.options) mkEnableOption mkOption; + inherit (lib.options) mkEnableOption; inherit (lib.nvim.types) mkPluginSetupOption; in { options.vim.mini.splitjoin = { diff --git a/modules/plugins/mini/starter/starter.nix b/modules/plugins/mini/starter/starter.nix index cb42061df..df5508579 100644 --- a/modules/plugins/mini/starter/starter.nix +++ b/modules/plugins/mini/starter/starter.nix @@ -3,7 +3,7 @@ lib, ... }: let - inherit (lib.options) mkEnableOption mkOption; + inherit (lib.options) mkEnableOption; inherit (lib.nvim.types) mkPluginSetupOption; in { options.vim.mini.starter = { diff --git a/modules/plugins/mini/statusline/statusline.nix b/modules/plugins/mini/statusline/statusline.nix index 9e1301cf6..2c850ae18 100644 --- a/modules/plugins/mini/statusline/statusline.nix +++ b/modules/plugins/mini/statusline/statusline.nix @@ -3,7 +3,7 @@ lib, ... }: let - inherit (lib.options) mkEnableOption mkOption; + inherit (lib.options) mkEnableOption; inherit (lib.nvim.types) mkPluginSetupOption; in { options.vim.mini.statusline = { diff --git a/modules/plugins/mini/surround/surround.nix b/modules/plugins/mini/surround/surround.nix index f4c1c199d..726bf3f9b 100644 --- a/modules/plugins/mini/surround/surround.nix +++ b/modules/plugins/mini/surround/surround.nix @@ -3,7 +3,7 @@ lib, ... }: let - inherit (lib.options) mkEnableOption mkOption; + inherit (lib.options) mkEnableOption; inherit (lib.nvim.types) mkPluginSetupOption; in { options.vim.mini.surround = { diff --git a/modules/plugins/mini/tabline/tabline.nix b/modules/plugins/mini/tabline/tabline.nix index 7dc48222a..936273db0 100644 --- a/modules/plugins/mini/tabline/tabline.nix +++ b/modules/plugins/mini/tabline/tabline.nix @@ -3,7 +3,7 @@ lib, ... }: let - inherit (lib.options) mkEnableOption mkOption; + inherit (lib.options) mkEnableOption; inherit (lib.nvim.types) mkPluginSetupOption; in { options.vim.mini.tabline = { diff --git a/modules/plugins/mini/test/test.nix b/modules/plugins/mini/test/test.nix index fba4db0bd..28135a26c 100644 --- a/modules/plugins/mini/test/test.nix +++ b/modules/plugins/mini/test/test.nix @@ -3,7 +3,7 @@ lib, ... }: let - inherit (lib.options) mkEnableOption mkOption; + inherit (lib.options) mkEnableOption; inherit (lib.nvim.types) mkPluginSetupOption; in { options.vim.mini.test = { diff --git a/modules/plugins/mini/trailspace/trailspace.nix b/modules/plugins/mini/trailspace/trailspace.nix index 003e159c8..19757bfb5 100644 --- a/modules/plugins/mini/trailspace/trailspace.nix +++ b/modules/plugins/mini/trailspace/trailspace.nix @@ -3,7 +3,7 @@ lib, ... }: let - inherit (lib.options) mkEnableOption mkOption; + inherit (lib.options) mkEnableOption; inherit (lib.nvim.types) mkPluginSetupOption; in { options.vim.mini.trailspace = { diff --git a/modules/plugins/mini/visits/visits.nix b/modules/plugins/mini/visits/visits.nix index 0560533e8..c01e8ebf4 100644 --- a/modules/plugins/mini/visits/visits.nix +++ b/modules/plugins/mini/visits/visits.nix @@ -3,7 +3,7 @@ lib, ... }: let - inherit (lib.options) mkEnableOption mkOption; + inherit (lib.options) mkEnableOption; inherit (lib.nvim.types) mkPluginSetupOption; in { options.vim.mini.visits = { From 5f00d7d0d216c4f49e7e96b65232d0b64665dc93 Mon Sep 17 00:00:00 2001 From: LilleAila Date: Fri, 17 Jan 2025 21:32:36 +0100 Subject: [PATCH 44/54] mini/deps: add missing changelog entry --- docs/release-notes/rl-0.8.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md index 421b79163..b75fc4109 100644 --- a/docs/release-notes/rl-0.8.md +++ b/docs/release-notes/rl-0.8.md @@ -65,6 +65,7 @@ - `mini.colors` - `mini.comment` - `mini.completion` + - `mini.deps` - `mini.diff` - `mini.doc` - `mini.extra` From f279e3a5856fb090b28f5ff69b8ce09e51349b67 Mon Sep 17 00:00:00 2001 From: LilleAila Date: Fri, 17 Jan 2025 21:53:44 +0100 Subject: [PATCH 45/54] utility/fzf-lua: init --- flake.lock | 17 +++++++++++++++++ flake.nix | 7 ++++++- modules/plugins/utility/default.nix | 1 + modules/plugins/utility/fzf-lua/config.nix | 16 ++++++++++++++++ modules/plugins/utility/fzf-lua/default.nix | 6 ++++++ modules/plugins/utility/fzf-lua/fzf-lua.nix | 18 ++++++++++++++++++ 6 files changed, 64 insertions(+), 1 deletion(-) create mode 100644 modules/plugins/utility/fzf-lua/config.nix create mode 100644 modules/plugins/utility/fzf-lua/default.nix create mode 100644 modules/plugins/utility/fzf-lua/fzf-lua.nix diff --git a/flake.lock b/flake.lock index 918b0ce10..e28d03b5d 100644 --- a/flake.lock +++ b/flake.lock @@ -599,6 +599,22 @@ "type": "github" } }, + "plugin-fzf-lua": { + "flake": false, + "locked": { + "lastModified": 1737131132, + "narHash": "sha256-0IdADUsIr+SZ0ort92jPPfGIH1EdcwELYz+TCmDCPPI=", + "owner": "ibhagwan", + "repo": "fzf-lua", + "rev": "fbe21aeb147b3dc8b188b5753a8e288ecedcee5e", + "type": "github" + }, + "original": { + "owner": "ibhagwan", + "repo": "fzf-lua", + "type": "github" + } + }, "plugin-gesture-nvim": { "flake": false, "locked": { @@ -2127,6 +2143,7 @@ "plugin-fidget-nvim": "plugin-fidget-nvim", "plugin-flutter-tools": "plugin-flutter-tools", "plugin-friendly-snippets": "plugin-friendly-snippets", + "plugin-fzf-lua": "plugin-fzf-lua", "plugin-gesture-nvim": "plugin-gesture-nvim", "plugin-gitsigns-nvim": "plugin-gitsigns-nvim", "plugin-glow-nvim": "plugin-glow-nvim", diff --git a/flake.nix b/flake.nix index 02ceb667b..194438137 100644 --- a/flake.nix +++ b/flake.nix @@ -236,12 +236,17 @@ flake = false; }; - # Telescope + # Pickers plugin-telescope = { url = "github:nvim-telescope/telescope.nvim"; flake = false; }; + plugin-fzf-lua = { + url = "github:ibhagwan/fzf-lua"; + flake = false; + }; + # Runners plugin-run-nvim = { url = "github:diniamo/run.nvim"; diff --git a/modules/plugins/utility/default.nix b/modules/plugins/utility/default.nix index 686295e27..8b25ea8f4 100644 --- a/modules/plugins/utility/default.nix +++ b/modules/plugins/utility/default.nix @@ -14,5 +14,6 @@ ./wakatime ./surround ./preview + ./fzf-lua ]; } diff --git a/modules/plugins/utility/fzf-lua/config.nix b/modules/plugins/utility/fzf-lua/config.nix new file mode 100644 index 000000000..558f3cd18 --- /dev/null +++ b/modules/plugins/utility/fzf-lua/config.nix @@ -0,0 +1,16 @@ +{ + config, + lib, + ... +}: let + inherit (lib.modules) mkIf; + + cfg = config.vim.fzf-lua; +in { + vim.lazy.plugins."fzf-lua" = mkIf cfg.enable { + package = "fzf-lua"; + cmd = ["FzfLua"]; + setupModule = "fzf-lua"; + inherit (cfg) setupOpts; + }; +} diff --git a/modules/plugins/utility/fzf-lua/default.nix b/modules/plugins/utility/fzf-lua/default.nix new file mode 100644 index 000000000..e5147e44c --- /dev/null +++ b/modules/plugins/utility/fzf-lua/default.nix @@ -0,0 +1,6 @@ +{ + imports = [ + ./fzf-lua.nix + ./config.nix + ]; +} diff --git a/modules/plugins/utility/fzf-lua/fzf-lua.nix b/modules/plugins/utility/fzf-lua/fzf-lua.nix new file mode 100644 index 000000000..099911bee --- /dev/null +++ b/modules/plugins/utility/fzf-lua/fzf-lua.nix @@ -0,0 +1,18 @@ +{ + config, + lib, + ... +}: let + inherit (lib.options) mkEnableOption mkOption; + inherit (lib.nvim.types) mkPluginSetupOption borderType; +in { + options.vim.fzf-lua = { + enable = mkEnableOption "fzf-lua"; + setupOpts = mkPluginSetupOption "mini.ai" { + winopts.border = mkOption { + type = borderType; + default = config.vim.ui.borders.globalStyle; + }; + }; + }; +} From ce7017cf5ba6ea53359d002c8433e18b1a6dd83b Mon Sep 17 00:00:00 2001 From: LilleAila Date: Fri, 17 Jan 2025 21:55:06 +0100 Subject: [PATCH 46/54] utility/fzf-lua: add changelog --- docs/release-notes/rl-0.8.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md index e854eebc6..9271e7962 100644 --- a/docs/release-notes/rl-0.8.md +++ b/docs/release-notes/rl-0.8.md @@ -59,6 +59,7 @@ - Add `vim.snippets.luasnip.setupOpts`, which was previously missing. - Add `"prettierd"` as a formatter option in `vim.languages.markdown.format.type`. +- Add [fzf-lua](https://github.com/ibhagwan/fzf-lua) in `vim.fzf-lua` [kaktu5](https://github.com/kaktu5): From 775963dd9dcd3b82746a558b12dad445288ecc9e Mon Sep 17 00:00:00 2001 From: LilleAila Date: Fri, 17 Jan 2025 22:02:25 +0100 Subject: [PATCH 47/54] utility/fzf-lua: add border option description --- modules/plugins/utility/fzf-lua/fzf-lua.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/plugins/utility/fzf-lua/fzf-lua.nix b/modules/plugins/utility/fzf-lua/fzf-lua.nix index 099911bee..3b45ab022 100644 --- a/modules/plugins/utility/fzf-lua/fzf-lua.nix +++ b/modules/plugins/utility/fzf-lua/fzf-lua.nix @@ -12,6 +12,7 @@ in { winopts.border = mkOption { type = borderType; default = config.vim.ui.borders.globalStyle; + description = "Border type for the fzf-lua picker window"; }; }; }; From ba55a1b54a5b5c4d0cc0d035132a9bc9c0733db6 Mon Sep 17 00:00:00 2001 From: LilleAila Date: Sat, 18 Jan 2025 10:10:59 +0100 Subject: [PATCH 48/54] utility/fzf-lua: add profile option, fix name --- modules/plugins/utility/fzf-lua/config.nix | 2 +- modules/plugins/utility/fzf-lua/fzf-lua.nix | 20 +++++++++++++++++++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/modules/plugins/utility/fzf-lua/config.nix b/modules/plugins/utility/fzf-lua/config.nix index 558f3cd18..85425fc7e 100644 --- a/modules/plugins/utility/fzf-lua/config.nix +++ b/modules/plugins/utility/fzf-lua/config.nix @@ -11,6 +11,6 @@ in { package = "fzf-lua"; cmd = ["FzfLua"]; setupModule = "fzf-lua"; - inherit (cfg) setupOpts; + setupOpts = cfg.setupOpts // {"@1" = cfg.profile;}; }; } diff --git a/modules/plugins/utility/fzf-lua/fzf-lua.nix b/modules/plugins/utility/fzf-lua/fzf-lua.nix index 3b45ab022..5657f6664 100644 --- a/modules/plugins/utility/fzf-lua/fzf-lua.nix +++ b/modules/plugins/utility/fzf-lua/fzf-lua.nix @@ -3,17 +3,35 @@ lib, ... }: let + inherit (lib.types) nullOr enum; inherit (lib.options) mkEnableOption mkOption; inherit (lib.nvim.types) mkPluginSetupOption borderType; in { options.vim.fzf-lua = { enable = mkEnableOption "fzf-lua"; - setupOpts = mkPluginSetupOption "mini.ai" { + setupOpts = mkPluginSetupOption "fzf-lua" { winopts.border = mkOption { type = borderType; default = config.vim.ui.borders.globalStyle; description = "Border type for the fzf-lua picker window"; }; }; + profile = mkOption { + type = enum [ + "default" + "default-title" + "fzf-native" + "fzf-tmux" + "fzf-vim" + "max-perf" + "telescope" + "skim" + "borderless" + "borderless-full" + "border-fused" + ]; + default = "default"; + description = "The configuration profile ot use"; + }; }; } From f338fd3411589b16340b7560eb7476f1438fa536 Mon Sep 17 00:00:00 2001 From: LilleAila Date: Sat, 18 Jan 2025 10:12:33 +0100 Subject: [PATCH 49/54] utility/fzf-lua: fix typo in profile description --- modules/plugins/utility/fzf-lua/fzf-lua.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/plugins/utility/fzf-lua/fzf-lua.nix b/modules/plugins/utility/fzf-lua/fzf-lua.nix index 5657f6664..c700add7b 100644 --- a/modules/plugins/utility/fzf-lua/fzf-lua.nix +++ b/modules/plugins/utility/fzf-lua/fzf-lua.nix @@ -31,7 +31,7 @@ in { "border-fused" ]; default = "default"; - description = "The configuration profile ot use"; + description = "The configuration profile to use"; }; }; } From ae81ab2c5f1ead51b79510fef46f96f8f76cb5f5 Mon Sep 17 00:00:00 2001 From: LilleAila Date: Sun, 19 Jan 2025 10:15:51 +0100 Subject: [PATCH 50/54] mini/notify: set vim.notify, assert nvim-notify --- modules/plugins/mini/notify/config.nix | 7 +++--- modules/plugins/mini/notify/notify.nix | 34 +++++++++++++++++++++++--- 2 files changed, 35 insertions(+), 6 deletions(-) diff --git a/modules/plugins/mini/notify/config.nix b/modules/plugins/mini/notify/config.nix index 2a5ff46e7..6872092c3 100644 --- a/modules/plugins/mini/notify/config.nix +++ b/modules/plugins/mini/notify/config.nix @@ -3,17 +3,18 @@ lib, ... }: let - inherit (lib.modules) mkIf; + inherit (lib.modules) mkIf mkAssert; inherit (lib.nvim.dag) entryAnywhere; inherit (lib.nvim.lua) toLuaObject; cfg = config.vim.mini.notify; in { - vim = mkIf cfg.enable { + vim = mkIf cfg.enable (mkAssert (!config.vim.notify.nvim-notify.enable) "Mini.notify is incompatible with nvim-notify!" { startPlugins = ["mini-notify"]; pluginRC.mini-notify = entryAnywhere '' require("mini.notify").setup(${toLuaObject cfg.setupOpts}) + vim.notify = MiniNotify.make_notify(${toLuaObject cfg.notifyOpts}) ''; - }; + }); } diff --git a/modules/plugins/mini/notify/notify.nix b/modules/plugins/mini/notify/notify.nix index e98f6e713..628be47a0 100644 --- a/modules/plugins/mini/notify/notify.nix +++ b/modules/plugins/mini/notify/notify.nix @@ -3,11 +3,39 @@ lib, ... }: let - inherit (lib.options) mkEnableOption; - inherit (lib.nvim.types) mkPluginSetupOption; + inherit (lib.options) mkEnableOption mkOption; + inherit (lib.types) int str; + inherit (lib.nvim.types) mkPluginSetupOption borderType; + + mkNotifyOpt = name: duration: hl_group: { + duration = mkOption { + type = int; + default = duration; + description = "The duration of the ${name} notification"; + }; + hl_group = mkOption { + type = str; + default = hl_group; + description = "The highlight group of the ${name} notification"; + }; + }; in { options.vim.mini.notify = { enable = mkEnableOption "mini.notify"; - setupOpts = mkPluginSetupOption "mini.notify" {}; + setupOpts = mkPluginSetupOption "mini.notify" { + window.config.border = mkOption { + type = borderType; + default = config.vim.ui.borders.globalStyle; + description = "The border type for the mini.notify-notifications"; + }; + }; + notifyOpts = mkPluginSetupOption "mini.notify notifications" { + ERROR = mkNotifyOpt "error" 5000 "DiagnosticError"; + WARN = mkNotifyOpt "warn" 5000 "DiagnosticWarn"; + INFO = mkNotifyOpt "info" 5000 "DiagnosticInfo"; + DEBUG = mkNotifyOpt "debug" 0 "DiagnosticHint"; + TRACE = mkNotifyOpt "trace" 0 "DiagnosticOk"; + OFF = mkNotifyOpt "off" 0 "MiniNotifyNormal"; + }; }; } From e331f009d5e43339815331c0f02906b3e4039190 Mon Sep 17 00:00:00 2001 From: LilleAila Date: Sun, 19 Jan 2025 10:19:34 +0100 Subject: [PATCH 51/54] mini/hues: more descriptive color options --- modules/plugins/mini/hues/hues.nix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/modules/plugins/mini/hues/hues.nix b/modules/plugins/mini/hues/hues.nix index f848923a1..13de5116f 100644 --- a/modules/plugins/mini/hues/hues.nix +++ b/modules/plugins/mini/hues/hues.nix @@ -12,21 +12,13 @@ in { enable = mkEnableOption "mini.hues"; setupOpts = mkPluginSetupOption "mini.hues" { background = mkOption { - description = "The background color to use"; + description = "The hex color for the background color of the color scheme, prefixed with #"; type = hexColor; - apply = v: - if hasPrefix "#" v - then v - else "#${v}"; }; foreground = mkOption { - description = "The foreground color to use"; + description = "The hex color for the foreground color of the color scheme, prefixed with #"; type = hexColor; - apply = v: - if hasPrefix "#" v - then v - else "#${v}"; }; }; }; From abd9176a2ad6eaa0ad6fff3ae2cee9c7c5f8dd0e Mon Sep 17 00:00:00 2001 From: NotAShelf Date: Sun, 19 Jan 2025 13:09:47 +0300 Subject: [PATCH 52/54] ci/docs-preview: use `pull_request_target` Run code with access to the tokens on the target branch, *after* approval. --- .github/workflows/docs-preview.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docs-preview.yml b/.github/workflows/docs-preview.yml index c38be9da8..e6d2e6621 100644 --- a/.github/workflows/docs-preview.yml +++ b/.github/workflows/docs-preview.yml @@ -2,7 +2,7 @@ name: Build and Preview Manual on: workflow_dispatch: - pull_request: + pull_request_target: types: [opened, synchronize, reopened, closed] paths: - ".github/workflows/docs-preview.yml" From db8a586b7ed5a59995e13e5dab63b39a204946a3 Mon Sep 17 00:00:00 2001 From: NotAShelf Date: Sun, 19 Jan 2025 13:21:51 +0300 Subject: [PATCH 53/54] neovim/init: enable `preventJunkFiles` by default --- modules/neovim/init/basic.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/modules/neovim/init/basic.nix b/modules/neovim/init/basic.nix index 532ebceaa..b4677de9a 100644 --- a/modules/neovim/init/basic.nix +++ b/modules/neovim/init/basic.nix @@ -55,8 +55,14 @@ in { preventJunkFiles = mkOption { type = bool; - default = false; - description = "Prevent swapfile and backupfile from being created"; + default = true; + example = false; + description = '' + Prevent swapfile and backupfile from being created. + + `false` is the default Neovim behaviour. If you wish to create + backup and swapfiles, set this option to `false`. + ''; }; bell = mkOption { From dfd4dc8494be4f09076ce8b1239177c8a5d10420 Mon Sep 17 00:00:00 2001 From: LilleAila Date: Sun, 19 Jan 2025 12:52:45 +0100 Subject: [PATCH 54/54] visuals/rainbow-delimiters: init --- docs/release-notes/rl-0.8.md | 1 + flake.lock | 17 +++++++++++++++++ flake.nix | 5 +++++ modules/plugins/visuals/default.nix | 1 + .../visuals/rainbow-delimiters/config.nix | 18 ++++++++++++++++++ .../visuals/rainbow-delimiters/default.nix | 6 ++++++ .../rainbow-delimiters/rainbow-delimiters.nix | 13 +++++++++++++ 7 files changed, 61 insertions(+) create mode 100644 modules/plugins/visuals/rainbow-delimiters/config.nix create mode 100644 modules/plugins/visuals/rainbow-delimiters/default.nix create mode 100644 modules/plugins/visuals/rainbow-delimiters/rainbow-delimiters.nix diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md index 42927bafc..a164d7764 100644 --- a/docs/release-notes/rl-0.8.md +++ b/docs/release-notes/rl-0.8.md @@ -102,6 +102,7 @@ - `mini.trailspace` - `mini.visits` - Add [fzf-lua](https://github.com/ibhagwan/fzf-lua) in `vim.fzf-lua` +- Add [rainbow-delimiters](https://github.com/HiPhish/rainbow-delimiters.nvim) in `vim.visuals.rainbow-delimiters` [kaktu5](https://github.com/kaktu5): diff --git a/flake.lock b/flake.lock index 7b7f0bab6..c328bda1d 100644 --- a/flake.lock +++ b/flake.lock @@ -2361,6 +2361,22 @@ "type": "github" } }, + "plugin-rainbow-delimiters": { + "flake": false, + "locked": { + "lastModified": 1736686348, + "narHash": "sha256-zWHXYs3XdnoszqOFY3hA2L5mNn1a44OAeKv3lL3EMEw=", + "owner": "HiPhish", + "repo": "rainbow-delimiters.nvim", + "rev": "85b80abaa09cbbc039e3095b2f515b3cf8cadd11", + "type": "github" + }, + "original": { + "owner": "HiPhish", + "repo": "rainbow-delimiters.nvim", + "type": "github" + } + }, "plugin-registers": { "flake": false, "locked": { @@ -2893,6 +2909,7 @@ "plugin-precognition-nvim": "plugin-precognition-nvim", "plugin-project-nvim": "plugin-project-nvim", "plugin-promise-async": "plugin-promise-async", + "plugin-rainbow-delimiters": "plugin-rainbow-delimiters", "plugin-registers": "plugin-registers", "plugin-render-markdown-nvim": "plugin-render-markdown-nvim", "plugin-rose-pine": "plugin-rose-pine", diff --git a/flake.nix b/flake.nix index 05b6fc4b6..5d4728f66 100644 --- a/flake.nix +++ b/flake.nix @@ -502,6 +502,11 @@ flake = false; }; + plugin-rainbow-delimiters = { + url = "github:HiPhish/rainbow-delimiters.nvim"; + flake = false; + }; + # Minimap plugin-minimap-vim = { url = "github:wfxr/minimap.vim"; diff --git a/modules/plugins/visuals/default.nix b/modules/plugins/visuals/default.nix index 0843654e3..3a44aa45f 100644 --- a/modules/plugins/visuals/default.nix +++ b/modules/plugins/visuals/default.nix @@ -15,6 +15,7 @@ in { ./nvim-cursorline ./nvim-scrollbar ./nvim-web-devicons + ./rainbow-delimiters ./tiny-devicons-auto-colors ]; } diff --git a/modules/plugins/visuals/rainbow-delimiters/config.nix b/modules/plugins/visuals/rainbow-delimiters/config.nix new file mode 100644 index 000000000..361a04267 --- /dev/null +++ b/modules/plugins/visuals/rainbow-delimiters/config.nix @@ -0,0 +1,18 @@ +{ + config, + lib, + ... +}: let + inherit (lib.modules) mkIf; + inherit (lib.nvim.dag) entryAnywhere; + inherit (lib.nvim.lua) toLuaObject; + cfg = config.vim.visuals.rainbow-delimiters; +in { + vim = mkIf cfg.enable { + startPlugins = ["rainbow-delimiters"]; + + pluginRC.rainbow-delimiters = entryAnywhere '' + vim.g.rainbow_delimiters = ${toLuaObject cfg.setupOpts} + ''; + }; +} diff --git a/modules/plugins/visuals/rainbow-delimiters/default.nix b/modules/plugins/visuals/rainbow-delimiters/default.nix new file mode 100644 index 000000000..50aaad0ed --- /dev/null +++ b/modules/plugins/visuals/rainbow-delimiters/default.nix @@ -0,0 +1,6 @@ +{ + imports = [ + ./rainbow-delimiters.nix + ./config.nix + ]; +} diff --git a/modules/plugins/visuals/rainbow-delimiters/rainbow-delimiters.nix b/modules/plugins/visuals/rainbow-delimiters/rainbow-delimiters.nix new file mode 100644 index 000000000..3fed4a646 --- /dev/null +++ b/modules/plugins/visuals/rainbow-delimiters/rainbow-delimiters.nix @@ -0,0 +1,13 @@ +{ + config, + lib, + ... +}: let + inherit (lib.options) mkEnableOption; + inherit (lib.nvim.types) mkPluginSetupOption; +in { + options.vim.visuals.rainbow-delimiters = { + enable = mkEnableOption "rainbow-delimiters"; + setupOpts = mkPluginSetupOption "rainbow-delimiters" {}; + }; +}