summaryrefslogtreecommitdiff
path: root/lua/config/plugins
diff options
context:
space:
mode:
Diffstat (limited to 'lua/config/plugins')
-rw-r--r--lua/config/plugins/completion.lua92
-rw-r--r--lua/config/plugins/extra.lua26
-rw-r--r--lua/config/plugins/git.lua118
-rw-r--r--lua/config/plugins/init.lua80
-rw-r--r--lua/config/plugins/leap.lua32
-rw-r--r--lua/config/plugins/mini.lua148
-rw-r--r--lua/config/plugins/telescope.lua52
-rw-r--r--lua/config/plugins/treesitter.lua28
-rw-r--r--lua/config/plugins/ui.lua28
9 files changed, 311 insertions, 293 deletions
diff --git a/lua/config/plugins/completion.lua b/lua/config/plugins/completion.lua
index 5b60993..7c084d0 100644
--- a/lua/config/plugins/completion.lua
+++ b/lua/config/plugins/completion.lua
@@ -1,48 +1,48 @@
return {
- {
- "blink.cmp",
- event = "DeferredUIEnter",
- after = function(_)
- require("blink.cmp").setup({
- appearance = {
- use_nvim_cmp_as_default = false,
- nerd_font_variant = "mono",
- },
-
- completion = {
- documentation = {
- auto_show = true,
- auto_show_delay_ms = 500,
- },
-
- ghost_text = { enabled = true },
- },
-
- sources = { default = { "lsp", "path", "snippets", "buffer" } },
-
- keymap = {
- ["<S-space>"] = { "show", "show_documentation", "hide_documentation" },
- ["<C-e>"] = { "hide", "fallback" },
- ["<CR>"] = { "accept", "fallback" },
-
- ["<Tab>"] = { "snippet_forward", "fallback" },
- ["<S-Tab>"] = { "snippet_backward", "fallback" },
-
- ["<Up>"] = { "select_prev", "fallback" },
- ["<Down>"] = { "select_next", "fallback" },
- ["<C-p>"] = { "select_prev", "fallback_to_mappings" },
- ["<C-n>"] = { "select_next", "fallback_to_mappings" },
-
- ["<C-b>"] = { "scroll_documentation_up", "fallback" },
- ["<C-f>"] = { "scroll_documentation_down", "fallback" },
- },
- })
-
- -- NOTE: this is broken due to something
- -- local client_capabilities = vim.lsp.protocol.make_client_capabilities()
- -- local blink_capabilities = require("blink.cmp").get_lsp_capabilities()
- -- local capabilities = vim.tbl_deep_extend('force', client_capabilities, blink_capabilities)
- -- vim.lsp.config("*", { capabilities = capabilities })
- end,
- }
+ {
+ "blink.cmp",
+ event = "DeferredUIEnter",
+ after = function(_)
+ require("blink.cmp").setup({
+ appearance = {
+ use_nvim_cmp_as_default = false,
+ nerd_font_variant = "mono",
+ },
+
+ completion = {
+ documentation = {
+ auto_show = true,
+ auto_show_delay_ms = 500,
+ },
+
+ ghost_text = { enabled = true },
+ },
+
+ sources = { default = { "lsp", "path", "snippets", "buffer" } },
+
+ keymap = {
+ ["<S-space>"] = { "show", "show_documentation", "hide_documentation" },
+ ["<C-e>"] = { "hide", "fallback" },
+ ["<CR>"] = { "accept", "fallback" },
+
+ ["<Tab>"] = { "snippet_forward", "fallback" },
+ ["<S-Tab>"] = { "snippet_backward", "fallback" },
+
+ ["<Up>"] = { "select_prev", "fallback" },
+ ["<Down>"] = { "select_next", "fallback" },
+ ["<C-p>"] = { "select_prev", "fallback_to_mappings" },
+ ["<C-n>"] = { "select_next", "fallback_to_mappings" },
+
+ ["<C-b>"] = { "scroll_documentation_up", "fallback" },
+ ["<C-f>"] = { "scroll_documentation_down", "fallback" },
+ },
+ })
+
+ -- NOTE: this is broken due to something
+ -- local client_capabilities = vim.lsp.protocol.make_client_capabilities()
+ -- local blink_capabilities = require("blink.cmp").get_lsp_capabilities()
+ -- local capabilities = vim.tbl_deep_extend('force', client_capabilities, blink_capabilities)
+ -- vim.lsp.config("*", { capabilities = capabilities })
+ end,
+ },
}
diff --git a/lua/config/plugins/extra.lua b/lua/config/plugins/extra.lua
index d12e690..d1e1a4e 100644
--- a/lua/config/plugins/extra.lua
+++ b/lua/config/plugins/extra.lua
@@ -1,16 +1,16 @@
return {
- {
- "which-key.nvim",
- event = "DeferredUIEnter",
- after = function(_)
- require("which-key").setup()
+ {
+ "which-key.nvim",
+ event = "DeferredUIEnter",
+ after = function(_)
+ require("which-key").setup()
- require("which-key").add({
- { "<leader>g", group = "git" },
- { "<leader>gh", group = "hunk" },
- { "<leader>s", group = "search" },
- { "<leader>S", group = "surround" },
- })
- end,
- },
+ require("which-key").add({
+ { "<leader>g", group = "git" },
+ { "<leader>gh", group = "hunk" },
+ { "<leader>s", group = "search" },
+ { "<leader>S", group = "surround" },
+ })
+ end,
+ },
}
diff --git a/lua/config/plugins/git.lua b/lua/config/plugins/git.lua
index d82fef3..aaad428 100644
--- a/lua/config/plugins/git.lua
+++ b/lua/config/plugins/git.lua
@@ -1,67 +1,71 @@
return {
- {
- -- NOTE: we could use mini.diff, but it doesn't show staged hunks
- "gitsigns.nvim",
- event = "DeferredUIEnter",
- after = function(_)
- local gs = require("gitsigns")
+ {
+ -- NOTE: we could use mini.diff, but it doesn't show staged hunks
+ "gitsigns.nvim",
+ event = "DeferredUIEnter",
+ after = function(_)
+ local gs = require("gitsigns")
- gs.setup({
- signs = {
- add = { text = "▎" },
- change = { text = "▎" },
- delete = { text = "" },
- topdelete = { text = "" },
- changedelete = { text = "▎" },
- untracked = { text = "▎" },
- },
- signs_staged = {
- add = { text = "▎" },
- change = { text = "▎" },
- delete = { text = "" },
- topdelete = { text = "" },
- changedelete = { text = "▎" },
- },
+ gs.setup({
+ signs = {
+ add = { text = "▎" },
+ change = { text = "▎" },
+ delete = { text = "" },
+ topdelete = { text = "" },
+ changedelete = { text = "▎" },
+ untracked = { text = "▎" },
+ },
+ signs_staged = {
+ add = { text = "▎" },
+ change = { text = "▎" },
+ delete = { text = "" },
+ topdelete = { text = "" },
+ changedelete = { text = "▎" },
+ },
- numhl = true,
+ numhl = true,
- on_attach = function(bufnr)
- local function map(mode, l, r, desc, opts)
- opts = opts or {}
- opts.desc = desc
- opts.buffer = bufnr
- vim.keymap.set(mode, l, r, opts)
- end
+ on_attach = function(bufnr)
+ local function map(mode, l, r, desc, opts)
+ opts = opts or {}
+ opts.desc = desc
+ opts.buffer = bufnr
+ vim.keymap.set(mode, l, r, opts)
+ end
- map("n", "[h", function()
- if vim.wo.diff then
- vim.cmd.normal({"[c", bang = true})
- else
- gs.nav_hunk("prev")
- end
- end, "Prev hunk")
+ map("n", "[h", function()
+ if vim.wo.diff then
+ vim.cmd.normal({ "[c", bang = true })
+ else
+ gs.nav_hunk("prev")
+ end
+ end, "Prev hunk")
- map("n", "]h", function()
- if vim.wo.diff then
- vim.cmd.normal({"]c", bang = true})
- else
- gs.nav_hunk("next")
- end
- end, "Next hunk")
+ map("n", "]h", function()
+ if vim.wo.diff then
+ vim.cmd.normal({ "]c", bang = true })
+ else
+ gs.nav_hunk("next")
+ end
+ end, "Next hunk")
- map("n", "]H", function() gs.nav_hunk("first") end, "First hunk")
- map("n", "]H", function() gs.nav_hunk("last") end, "Last hunk")
+ map("n", "]H", function()
+ gs.nav_hunk("first")
+ end, "First hunk")
+ map("n", "]H", function()
+ gs.nav_hunk("last")
+ end, "Last hunk")
- map("n", "<leader>ghs", gs.stage_hunk, "Stage hunk")
- map("n", "<leader>ghr", gs.reset_hunk, "Reset hunk")
- map("n", "<leader>ghS", gs.stage_buffer, "Stage buffer")
- map("n", "<leader>ghR", gs.reset_buffer, "Reset buffer")
- map("n", "<leader>ghu", gs.undo_stage_hunk, "Undo stage hunk")
+ map("n", "<leader>ghs", gs.stage_hunk, "Stage hunk")
+ map("n", "<leader>ghr", gs.reset_hunk, "Reset hunk")
+ map("n", "<leader>ghS", gs.stage_buffer, "Stage buffer")
+ map("n", "<leader>ghR", gs.reset_buffer, "Reset buffer")
+ map("n", "<leader>ghu", gs.undo_stage_hunk, "Undo stage hunk")
- -- NOTE: if using <Cmd> here, we don't get full hunk in selection
- map({ "o", "x" }, "ih", ":<C-U>Gitsigns select_hunk<CR>", "Hunk")
- end
- })
- end
- }
+ -- NOTE: if using <Cmd> here, we don't get full hunk in selection
+ map({ "o", "x" }, "ih", ":<C-U>Gitsigns select_hunk<CR>", "Hunk")
+ end,
+ })
+ end,
+ },
}
diff --git a/lua/config/plugins/init.lua b/lua/config/plugins/init.lua
index 3ee3fcc..1907418 100644
--- a/lua/config/plugins/init.lua
+++ b/lua/config/plugins/init.lua
@@ -4,46 +4,46 @@ vim.notify.setup()
-- Load "optional" packages
require("lze").load({
- -- Setup colorscheme
- {
- "catppuccin-nvim",
- enabled = nixCats("colorscheme"):find("^catppuccin") ~= nil,
- after = function(_)
- require("catppuccin").setup({
- integrations = {
- -- Enable required integrations
- blink_cmp = true,
- gitsigns = true,
- leap = true,
- mini = true,
- native_lsp = {
- enabled = true,
- underlines = {
- errors = { "undercurl" },
- hints = { "undercurl" },
- warnings = { "undercurl" },
- information = { "undercurl" },
- },
- },
- noice = true,
- treesitter = true,
- treesitter_context = true,
- telescope = { enabled = true },
- which_key = true,
- },
- })
+ -- Setup colorscheme
+ {
+ "catppuccin-nvim",
+ enabled = nixCats("colorscheme"):find("^catppuccin") ~= nil,
+ after = function(_)
+ require("catppuccin").setup({
+ integrations = {
+ -- Enable required integrations
+ blink_cmp = true,
+ gitsigns = true,
+ leap = true,
+ mini = true,
+ native_lsp = {
+ enabled = true,
+ underlines = {
+ errors = { "undercurl" },
+ hints = { "undercurl" },
+ warnings = { "undercurl" },
+ information = { "undercurl" },
+ },
+ },
+ noice = true,
+ treesitter = true,
+ treesitter_context = true,
+ telescope = { enabled = true },
+ which_key = true,
+ },
+ })
- vim.cmd.colorscheme(nixCats("colorscheme"))
- end,
- },
+ vim.cmd.colorscheme(nixCats("colorscheme"))
+ end,
+ },
- { import = "config.plugins.ui" },
- { import = "config.plugins.leap" },
- { import = "config.plugins.telescope" },
- { import = "config.plugins.treesitter" },
- { import = "config.plugins.mini" },
- { import = "config.plugins.completion" },
- { import = "config.plugins.formatting" },
- { import = "config.plugins.git" },
- { import = "config.plugins.extra" },
+ { import = "config.plugins.ui" },
+ { import = "config.plugins.leap" },
+ { import = "config.plugins.telescope" },
+ { import = "config.plugins.treesitter" },
+ { import = "config.plugins.mini" },
+ { import = "config.plugins.completion" },
+ { import = "config.plugins.formatting" },
+ { import = "config.plugins.git" },
+ { import = "config.plugins.extra" },
})
diff --git a/lua/config/plugins/leap.lua b/lua/config/plugins/leap.lua
index ed23683..4363336 100644
--- a/lua/config/plugins/leap.lua
+++ b/lua/config/plugins/leap.lua
@@ -1,18 +1,18 @@
return {
- {
- "leap.nvim",
- event = "DeferredUIEnter",
- load = function(name)
- vim.cmd.packadd(name)
- vim.cmd.packadd("flit.nvim")
- -- vim.cmd.packadd("leap-spooky-nvim")
- vim.cmd.packadd("telepath-nvim")
- end,
- after = function(_)
- require("leap").create_default_mappings()
- require("flit").setup()
- -- require("leap-spooky").setup()
- require("telepath").use_default_mappings()
- end,
- },
+ {
+ "leap.nvim",
+ event = "DeferredUIEnter",
+ load = function(name)
+ vim.cmd.packadd(name)
+ vim.cmd.packadd("flit.nvim")
+ -- vim.cmd.packadd("leap-spooky-nvim")
+ vim.cmd.packadd("telepath-nvim")
+ end,
+ after = function(_)
+ require("leap").create_default_mappings()
+ require("flit").setup()
+ -- require("leap-spooky").setup()
+ require("telepath").use_default_mappings()
+ end,
+ },
}
diff --git a/lua/config/plugins/mini.lua b/lua/config/plugins/mini.lua
index 65e3f6e..dc9c151 100644
--- a/lua/config/plugins/mini.lua
+++ b/lua/config/plugins/mini.lua
@@ -1,69 +1,83 @@
return {
- {
- "mini.ai",
- event = "DeferredUIEnter",
- after = function(_)
- require("mini.ai").setup()
- end,
- },
- {
- "mini.align",
- event = "DeferredUIEnter",
- after = function(_)
- require("mini.align").setup()
- end,
- },
- {
- "mini.diff",
- enabled = false, -- NOTE: using gitsigns.nvim due to more features
- event = "DeferredUIEnter",
- keys = {
- { "<leader>ght", function() require("mini.diff").toggle() end, mode = { "n" }, desc = "Toggle hunk processing" },
- { "<leader>gho", function() require("mini.diff").toggle_overlay() end, mode = { "n" }, desc = "Toggle hunk overlay" },
- },
- after = function (_)
- require("mini.diff").setup({
- mappings = {
- apply = "<leader>ghs",
- reset = "<leader>ghr",
- textobject = "<leader>ghs",
- goto_first = "[H",
- goto_prev = "[h",
- goto_next = "]h",
- goto_last = "]H",
- },
- })
- end
- },
- {
- "mini.move",
- event = "DeferredUIEnter",
- after = function(_)
- require("mini.move").setup()
- end,
- },
- {
- "mini.pairs",
- event = "DeferredUIEnter",
- after = function(_)
- require("mini.pairs").setup()
- end,
- },
- {
- "mini.surround",
- event = "DeferredUIEnter",
- after = function(_)
- require("mini.surround").setup({
- mappings = {
- add = "<leader>Sa",
- delete = "<leader>Sd",
- find = "<leader>Sf",
- find_left = "<leader>SF",
- highlight = "<leader>Sh",
- replace = "<leader>Sr",
- update_n_lines = "<leader>Sn",
- },
- })
- end,
- },
+ {
+ "mini.ai",
+ event = "DeferredUIEnter",
+ after = function(_)
+ require("mini.ai").setup()
+ end,
+ },
+ {
+ "mini.align",
+ event = "DeferredUIEnter",
+ after = function(_)
+ require("mini.align").setup()
+ end,
+ },
+ {
+ "mini.diff",
+ enabled = false, -- NOTE: using gitsigns.nvim due to more features
+ event = "DeferredUIEnter",
+ keys = {
+ {
+ "<leader>ght",
+ function()
+ require("mini.diff").toggle()
+ end,
+ mode = { "n" },
+ desc = "Toggle hunk processing",
+ },
+ {
+ "<leader>gho",
+ function()
+ require("mini.diff").toggle_overlay()
+ end,
+ mode = { "n" },
+ desc = "Toggle hunk overlay",
+ },
+ },
+ after = function(_)
+ require("mini.diff").setup({
+ mappings = {
+ apply = "<leader>ghs",
+ reset = "<leader>ghr",
+ textobject = "<leader>ghs",
+ goto_first = "[H",
+ goto_prev = "[h",
+ goto_next = "]h",
+ goto_last = "]H",
+ },
+ })
+ end,
+ },
+ {
+ "mini.move",
+ event = "DeferredUIEnter",
+ after = function(_)
+ require("mini.move").setup()
+ end,
+ },
+ {
+ "mini.pairs",
+ event = "DeferredUIEnter",
+ after = function(_)
+ require("mini.pairs").setup()
+ end,
+ },
+ {
+ "mini.surround",
+ event = "DeferredUIEnter",
+ after = function(_)
+ require("mini.surround").setup({
+ mappings = {
+ add = "<leader>Sa",
+ delete = "<leader>Sd",
+ find = "<leader>Sf",
+ find_left = "<leader>SF",
+ highlight = "<leader>Sh",
+ replace = "<leader>Sr",
+ update_n_lines = "<leader>Sn",
+ },
+ })
+ end,
+ },
}
diff --git a/lua/config/plugins/telescope.lua b/lua/config/plugins/telescope.lua
index a256cbf..d72d5fa 100644
--- a/lua/config/plugins/telescope.lua
+++ b/lua/config/plugins/telescope.lua
@@ -1,28 +1,28 @@
return {
- {
- "telescope.nvim",
- cmd = "Telescope",
- keys = {
- {
- "<leader><leader>",
- function()
- require("telescope.builtin").find_files()
- end,
- mode = { "n" },
- desc = "Search Files",
- },
- {
- "<leader>sf",
- function()
- require("telescope.builtin").find_files()
- end,
- mode = { "n" },
- desc = "[S]earch [F]iles",
- },
- },
- after = function(_)
- require("telescope").setup({})
- require("telescope").load_extension("notify")
- end,
- },
+ {
+ "telescope.nvim",
+ cmd = "Telescope",
+ keys = {
+ {
+ "<leader><leader>",
+ function()
+ require("telescope.builtin").find_files()
+ end,
+ mode = { "n" },
+ desc = "Search Files",
+ },
+ {
+ "<leader>sf",
+ function()
+ require("telescope.builtin").find_files()
+ end,
+ mode = { "n" },
+ desc = "[S]earch [F]iles",
+ },
+ },
+ after = function(_)
+ require("telescope").setup({})
+ require("telescope").load_extension("notify")
+ end,
+ },
}
diff --git a/lua/config/plugins/treesitter.lua b/lua/config/plugins/treesitter.lua
index 8e3df6a..931a474 100644
--- a/lua/config/plugins/treesitter.lua
+++ b/lua/config/plugins/treesitter.lua
@@ -1,16 +1,16 @@
return {
- {
- "nvim-treesitter",
- event = "DeferredUIEnter",
- load = function(name)
- vim.cmd.packadd(name)
- vim.cmd.packadd("nvim-treesitter-textobjects")
- end,
- after = function(_)
- require("nvim-treesitter.configs").setup({
- highlight = { enable = true },
- indent = { enable = true },
- })
- end,
- },
+ {
+ "nvim-treesitter",
+ event = "DeferredUIEnter",
+ load = function(name)
+ vim.cmd.packadd(name)
+ vim.cmd.packadd("nvim-treesitter-textobjects")
+ end,
+ after = function(_)
+ require("nvim-treesitter.configs").setup({
+ highlight = { enable = true },
+ indent = { enable = true },
+ })
+ end,
+ },
}
diff --git a/lua/config/plugins/ui.lua b/lua/config/plugins/ui.lua
index 9a3da12..12d0656 100644
--- a/lua/config/plugins/ui.lua
+++ b/lua/config/plugins/ui.lua
@@ -1,17 +1,17 @@
return {
- {
- "noice.nvim",
- event = "DeferredUIEnter",
- after = function(_)
- require("noice").setup()
- end,
- },
+ {
+ "noice.nvim",
+ event = "DeferredUIEnter",
+ after = function(_)
+ require("noice").setup()
+ end,
+ },
- {
- "todo-comments.nvim",
- event = "DeferredUIEnter",
- after = function (_)
- require("todo-comments").setup()
- end
- },
+ {
+ "todo-comments.nvim",
+ event = "DeferredUIEnter",
+ after = function(_)
+ require("todo-comments").setup()
+ end,
+ },
}