diff --git a/flake.lock b/flake.lock index 448bd8b2..da38b967 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 4d6873ea..89690cad 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 19860884..6e05c592 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 7f5524a6..00000000 --- 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 c04c8191..00000000 --- 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 91faca27..00000000 --- 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 b9764eed..00000000 --- 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; - }; - } - ''; - }; - }; -}