diff options
Diffstat (limited to 'pkgs/custom-neovim/config/lua/plugins')
8 files changed, 85 insertions, 13 deletions
diff --git a/pkgs/custom-neovim/config/lua/plugins/colorschemes.lua b/pkgs/custom-neovim/config/lua/plugins/colorschemes.lua index 1ca3c7e..a40da32 100644 --- a/pkgs/custom-neovim/config/lua/plugins/colorschemes.lua +++ b/pkgs/custom-neovim/config/lua/plugins/colorschemes.lua @@ -1,18 +1,8 @@ return { { "nightfox.nvim", - -- lazy = false, - event = "VimEnter", + lazy = false, after = function () - require("nightfox").setup { - options = { - module_default = false, - modules = { - "mini", - "treesitter", - }, - }, - } vim.cmd.colorscheme("carbonfox") end }, diff --git a/pkgs/custom-neovim/config/lua/plugins/comment.lua b/pkgs/custom-neovim/config/lua/plugins/comment.lua new file mode 100644 index 0000000..749e622 --- /dev/null +++ b/pkgs/custom-neovim/config/lua/plugins/comment.lua @@ -0,0 +1,7 @@ +return { + "comment.nvim", + lazy = false, + after = function() + require("Comment").setup() + end +} diff --git a/pkgs/custom-neovim/config/lua/plugins/git.lua b/pkgs/custom-neovim/config/lua/plugins/git.lua new file mode 100644 index 0000000..ce60214 --- /dev/null +++ b/pkgs/custom-neovim/config/lua/plugins/git.lua @@ -0,0 +1,26 @@ +return { + { + "mini.git", + lazy = false, + cmd = "Git", + after = function() + require("mini.git").setup() + end + }, + { + "mini.diff", + lazy = false, + after = function() + require("mini.diff").setup() + end + }, + { + "neogit", + lazy = true, + cmd = "Neogit", + after = function() + vim.cmd.packadd("plenary.nvim") + require("neogit").setup() + end + }, +} diff --git a/pkgs/custom-neovim/config/lua/plugins/mini-clue.lua b/pkgs/custom-neovim/config/lua/plugins/mini-clue.lua index 752b001..25c0866 100644 --- a/pkgs/custom-neovim/config/lua/plugins/mini-clue.lua +++ b/pkgs/custom-neovim/config/lua/plugins/mini-clue.lua @@ -1,5 +1,6 @@ return { "mini.clue", + lazy = true, event = "VimEnter", -- Load after everything else to capture all keybinds. after = function() local miniclue = require('mini.clue') @@ -53,5 +54,12 @@ return { scroll_up = "<C-u>", }, }) + -- Make clue appear in mini.files + vim.api.nvim_create_autocmd("User", { + pattern = "MiniFilesWindowOpen", + callback = function() + vim.cmd.lua("MiniClue.ensure_buf_triggers()") + end, + }) end } diff --git a/pkgs/custom-neovim/config/lua/plugins/mini-files.lua b/pkgs/custom-neovim/config/lua/plugins/mini-files.lua index d979221..948fcc4 100644 --- a/pkgs/custom-neovim/config/lua/plugins/mini-files.lua +++ b/pkgs/custom-neovim/config/lua/plugins/mini-files.lua @@ -1,6 +1,14 @@ return { "mini.files", + lazy = true, after = function() - require("mini.files").setup() + require("mini.files").setup { + mappings = { + close = "<esc>", + }, + windows = { + preview = true, + }, + } end } diff --git a/pkgs/custom-neovim/config/lua/plugins/mini-pairs.lua b/pkgs/custom-neovim/config/lua/plugins/mini-pairs.lua new file mode 100644 index 0000000..e799c50 --- /dev/null +++ b/pkgs/custom-neovim/config/lua/plugins/mini-pairs.lua @@ -0,0 +1,8 @@ +return { + "mini.pairs", + lazy = true, + event = "InsertEnter", + after = function() + require("mini.pairs").setup() + end +} diff --git a/pkgs/custom-neovim/config/lua/plugins/mini-pick.lua b/pkgs/custom-neovim/config/lua/plugins/mini-pick.lua index c08c1de..25f88de 100644 --- a/pkgs/custom-neovim/config/lua/plugins/mini-pick.lua +++ b/pkgs/custom-neovim/config/lua/plugins/mini-pick.lua @@ -1,5 +1,6 @@ return { "mini.pick", + lazy = true, cmd = "Pick", after = function() local win_config = function() diff --git a/pkgs/custom-neovim/config/lua/plugins/mini-statusline.lua b/pkgs/custom-neovim/config/lua/plugins/mini-statusline.lua index f3bf10b..36e268d 100644 --- a/pkgs/custom-neovim/config/lua/plugins/mini-statusline.lua +++ b/pkgs/custom-neovim/config/lua/plugins/mini-statusline.lua @@ -2,6 +2,30 @@ return { "mini.statusline", lazy = false, after = function() - require("mini.statusline").setup() + require("mini.statusline").setup { + content = { + active = function() + local mode, mode_hl = MiniStatusline.section_mode({ trunc_width = 120 }) + local git = MiniStatusline.section_git({ trunc_width = 40 }) + local diff = MiniStatusline.section_diff({ trunc_width = 75 }) + local diagnostics = MiniStatusline.section_diagnostics({ trunc_width = 75 }) + local lsp = MiniStatusline.section_lsp({ trunc_width = 75 }) + local filename = MiniStatusline.section_filename({ trunc_width = 140 }) + local fileinfo = MiniStatusline.section_fileinfo({ trunc_width = 120 }) + local location = MiniStatusline.section_location({ trunc_width = 75 }) + local search = MiniStatusline.section_searchcount({ trunc_width = 75 }) + + return MiniStatusline.combine_groups({ + { hl = mode_hl, strings = { mode } }, + { hl = 'MiniStatuslineDevinfo', strings = { git, diff, diagnostics, lsp } }, + '%<', -- Mark general truncate point + { hl = 'MiniStatuslineFilename', strings = { filename } }, + '%=', -- End left alignment + { hl = 'MiniStatuslineFileinfo', strings = { fileinfo } }, + { hl = mode_hl, strings = { search, location } }, + }) + end + }, + } end } |