From a827e229552ad1e51aa3f40cef64f0c09aa81d77 Mon Sep 17 00:00:00 2001 From: triethyl Date: Wed, 16 Jul 2025 19:34:40 -0400 Subject: added mini plugins --- pkgs/custom-neovim/config/init.lua | 3 ++ .../custom-neovim/config/lua/plugins/mini/clue.lua | 44 ++++++++++++++++++++++ .../config/lua/plugins/mini/indentscope.lua | 1 + .../config/lua/plugins/mini/notify.lua | 1 + pkgs/custom-neovim/default.nix | 23 ++--------- 5 files changed, 53 insertions(+), 19 deletions(-) create mode 100644 pkgs/custom-neovim/config/lua/plugins/mini/clue.lua create mode 100644 pkgs/custom-neovim/config/lua/plugins/mini/indentscope.lua create mode 100644 pkgs/custom-neovim/config/lua/plugins/mini/notify.lua (limited to 'pkgs') diff --git a/pkgs/custom-neovim/config/init.lua b/pkgs/custom-neovim/config/init.lua index 41b518b..6bca6e5 100644 --- a/pkgs/custom-neovim/config/init.lua +++ b/pkgs/custom-neovim/config/init.lua @@ -15,6 +15,9 @@ require("plugins.tabby") require("plugins.which-key") require("plugins.snacks") -- require("plugins.alpha") +require("plugins.mini.clue") +require("plugins.mini.indentscope") +require("plugins.mini.notify") -- LSP Plugins: require("plugins.lspconfig") diff --git a/pkgs/custom-neovim/config/lua/plugins/mini/clue.lua b/pkgs/custom-neovim/config/lua/plugins/mini/clue.lua new file mode 100644 index 0000000..3d213f9 --- /dev/null +++ b/pkgs/custom-neovim/config/lua/plugins/mini/clue.lua @@ -0,0 +1,44 @@ +local miniclue = require('mini.clue') +miniclue.setup({ + triggers = { + -- Leader triggers + { mode = 'n', keys = '' }, + { mode = 'x', keys = '' }, + + -- Built-in completion + { mode = 'i', keys = '' }, + + -- `g` key + { mode = 'n', keys = 'g' }, + { mode = 'x', keys = 'g' }, + + -- Marks + { mode = 'n', keys = "'" }, + { mode = 'n', keys = '`' }, + { mode = 'x', keys = "'" }, + { mode = 'x', keys = '`' }, + + -- Registers + { mode = 'n', keys = '"' }, + { mode = 'x', keys = '"' }, + { mode = 'i', keys = '' }, + { mode = 'c', keys = '' }, + + -- Window commands + { mode = 'n', keys = '' }, + + -- `z` key + { mode = 'n', keys = 'z' }, + { mode = 'x', keys = 'z' }, + }, + + clues = { + -- Enhance this by adding descriptions for mapping groups + miniclue.gen_clues.builtin_completion(), + miniclue.gen_clues.g(), + miniclue.gen_clues.marks(), + miniclue.gen_clues.registers(), + miniclue.gen_clues.windows(), + miniclue.gen_clues.z(), + }, +}) diff --git a/pkgs/custom-neovim/config/lua/plugins/mini/indentscope.lua b/pkgs/custom-neovim/config/lua/plugins/mini/indentscope.lua new file mode 100644 index 0000000..86dd9f1 --- /dev/null +++ b/pkgs/custom-neovim/config/lua/plugins/mini/indentscope.lua @@ -0,0 +1 @@ +require("mini.indentscope").setup() diff --git a/pkgs/custom-neovim/config/lua/plugins/mini/notify.lua b/pkgs/custom-neovim/config/lua/plugins/mini/notify.lua new file mode 100644 index 0000000..8c4d63c --- /dev/null +++ b/pkgs/custom-neovim/config/lua/plugins/mini/notify.lua @@ -0,0 +1 @@ +require("mini.notify").setup() diff --git a/pkgs/custom-neovim/default.nix b/pkgs/custom-neovim/default.nix index 860e476..27a195c 100644 --- a/pkgs/custom-neovim/default.nix +++ b/pkgs/custom-neovim/default.nix @@ -2,24 +2,7 @@ pkgs, inputs, }: let - plenary-nvim-git = pkgs.vimPlugins.plenary-nvim.overrideAttrs (old: { - version = "git"; - src = pkgs.fetchFromGitHub { - owner = "emmanueltouzery"; - repo = "plenary.nvim"; - rev = "7750bc895a1f06aa7a940f5aea43671a74143be0"; - sha256 = "sha256-9Un7ekhBxcnmFE1xjCCFTZ7eqIbmXvQexpnhduAg4M0="; - }; - }); # go back to regular plenary when this commit is merged: https://github.com/nvim-lua/plenary.nvim/pull/649 - which-key-nvim-git = pkgs.vimPlugins.which-key-nvim.overrideAttrs (old: { - version = "git"; - src = pkgs.fetchFromGitHub { - owner = "cameronr"; - repo = "which-key.nvim"; - rev = "ab1a3b0d3005a95507ba6c18b96531d430370885"; - sha256 = "sha256-Zbs+Xd6kGfR+s/f6xhxXBdKJA2N4WqcJDPWVkGaM7S0="; - }; - }); # go back to regular which-key when this commit is merged: https://github.com/folke/which-key.nvim/pull/974 + git-plugins = import ./git-plugins.nix {inherit pkgs;}; in inputs.mnw.lib.wrap pkgs { neovim = pkgs.neovim-unwrapped; @@ -39,7 +22,7 @@ in # plenary-nvim-git alpha-nvim # Dashboard. persisted-nvim # Session manager. - which-key-nvim-git + git-plugins.which-key-nvim-git snacks-nvim # Colorschemes @@ -48,6 +31,8 @@ in kanagawa-nvim # Kanagawa themes. everforest # Green themes. nordic-nvim # Warm dark nordic theme. + tokyonight-nvim + nightfox-nvim # Miscellaneous Plugins presence-nvim # Discord RPC for nvim. -- cgit v1.2.3