diff options
Diffstat (limited to 'nvim/.config')
-rw-r--r-- | nvim/.config/nvim/lua/tobyvin/plugins.lua | 24 | ||||
-rw-r--r-- | nvim/.config/nvim/lua/tobyvin/plugins/bufdelete.lua | 16 | ||||
-rw-r--r-- | nvim/.config/nvim/lua/tobyvin/plugins/bufferline.lua | 10 | ||||
-rw-r--r-- | nvim/.config/nvim/lua/tobyvin/plugins/comment.lua | 20 | ||||
-rw-r--r-- | nvim/.config/nvim/lua/tobyvin/plugins/git-conflict.lua | 13 | ||||
-rw-r--r-- | nvim/.config/nvim/lua/tobyvin/plugins/trouble.lua | 23 | ||||
-rw-r--r-- | nvim/.config/nvim/lua/tobyvin/utils.lua | 10 |
7 files changed, 73 insertions, 43 deletions
diff --git a/nvim/.config/nvim/lua/tobyvin/plugins.lua b/nvim/.config/nvim/lua/tobyvin/plugins.lua index 137cb0b..2a45984 100644 --- a/nvim/.config/nvim/lua/tobyvin/plugins.lua +++ b/nvim/.config/nvim/lua/tobyvin/plugins.lua @@ -108,6 +108,7 @@ M.plugins = function(use) use({ "folke/trouble.nvim", cmd = "TroubleToggle", + config = [[require("tobyvin.plugins.trouble").setup()]], }) use({ @@ -192,27 +193,27 @@ M.plugins = function(use) config = [[require("tobyvin.plugins.neogit").setup()]], }) - if vim.fn.executable("gh") == 1 then - use("pwntester/octo.nvim") - end - use({ - "lewis6991/gitsigns.nvim", + "sindrets/diffview.nvim", requires = "nvim-lua/plenary.nvim", - config = [[require("tobyvin.plugins.gitsigns")]], + config = [[require("tobyvin.plugins.diffview").setup()]], }) use({ - "f-person/git-blame.nvim", - config = [[require("tobyvin.plugins.git-blame")]], + "akinsho/git-conflict.nvim", + config = [[require("tobyvin.plugins.git-conflict").setup()]], }) use({ - "sindrets/diffview.nvim", + "lewis6991/gitsigns.nvim", requires = "nvim-lua/plenary.nvim", - config = [[require("tobyvin.plugins.diffview")]], + config = [[require("tobyvin.plugins.gitsigns").setup()]], }) + if vim.fn.executable("gh") == 1 then + use("pwntester/octo.nvim") + end + use({ "mbbill/undotree", cmd = "UndotreeToggle", @@ -249,10 +250,9 @@ M.plugins = function(use) use({ "numToStr/Comment.nvim", - config = [[require("Comment").setup()]], + config = [[require("tobyvin.plugins.comment").setup()]], }) - use({ "famiu/bufdelete.nvim", config = [[require("tobyvin.plugins.bufdelete").setup()]] }) use({ "akinsho/nvim-bufferline.lua", requires = "kyazdani42/nvim-web-devicons", diff --git a/nvim/.config/nvim/lua/tobyvin/plugins/bufdelete.lua b/nvim/.config/nvim/lua/tobyvin/plugins/bufdelete.lua deleted file mode 100644 index 6e65fcc..0000000 --- a/nvim/.config/nvim/lua/tobyvin/plugins/bufdelete.lua +++ /dev/null @@ -1,16 +0,0 @@ -local utils = require("tobyvin.utils") -local M = {} - -M.setup = function() - local status_ok, bufdelete = pcall(require, "bufdelete") - if not status_ok then - vim.notify("Failed to load module 'bufdelete'", "error") - return - end - - local nmap = utils.create_map_group("n", "<leader>") - -- nmap("c", bufdelete.bufdelete, { desc = "Close buffer" }) - nmap("c", function() vim.cmd("Bdelete") end, { desc = "Close buffer" }) -end - -return M diff --git a/nvim/.config/nvim/lua/tobyvin/plugins/bufferline.lua b/nvim/.config/nvim/lua/tobyvin/plugins/bufferline.lua index dac5a2c..12787ee 100644 --- a/nvim/.config/nvim/lua/tobyvin/plugins/bufferline.lua +++ b/nvim/.config/nvim/lua/tobyvin/plugins/bufferline.lua @@ -6,7 +6,7 @@ M.diagnostic_signs = function(name) return utils.diagnostic_signs[name] end -M.diagnostics_indicator = function(count, level, errors, ctx) +M.diagnostics_indicator = function(_, _, errors, _) local s = " " for e, n in pairs(errors) do local sign = utils.diagnostic_signs[e:gsub("warning", "warn")].text @@ -24,20 +24,20 @@ M.setup = function() bufferline.setup({ options = { - close_command = utils.close_buffer, right_mouse_command = "buffer %d", always_show_bufferline = false, diagnostics = "nvim_lsp", diagnostics_indicator = M.diagnostics_indicator, -- show_tab_indicators = true, show_close_icon = false, - left_trunc_marker = "<", - right_trunc_marker = ">", + left_trunc_marker = "<", + right_trunc_marker = ">", }, }) local nmap = utils.create_map_group("n", "<leader>b", "Buffers") - nmap("g", bufferline.pick_buffer, { desc = "Pick Buffer" }) + nmap("c", bufferline.close_with_pick, { desc = "Close Buffer" }) + nmap("b", bufferline.pick_buffer, { desc = "Pick Buffer" }) end return M diff --git a/nvim/.config/nvim/lua/tobyvin/plugins/comment.lua b/nvim/.config/nvim/lua/tobyvin/plugins/comment.lua new file mode 100644 index 0000000..624fcf1 --- /dev/null +++ b/nvim/.config/nvim/lua/tobyvin/plugins/comment.lua @@ -0,0 +1,20 @@ +local M = {} + +M.setup = function() + local status_ok, comment = pcall(require, "Comment") + if not status_ok then + vim.notify("Failed to load module 'Comment'", "error") + return + end + + comment.setup({ + toggler = { + block = "gCc", + }, + opleader = { + block = "gC", + }, + }) +end + +return M diff --git a/nvim/.config/nvim/lua/tobyvin/plugins/git-conflict.lua b/nvim/.config/nvim/lua/tobyvin/plugins/git-conflict.lua new file mode 100644 index 0000000..e853e4c --- /dev/null +++ b/nvim/.config/nvim/lua/tobyvin/plugins/git-conflict.lua @@ -0,0 +1,13 @@ +local M = {} + +M.setup = function() + local status_ok, git_conflict = pcall(require, "git-conflict") + if not status_ok then + vim.notify("Failed to load module 'git_conflict'", "error") + return + end + + git_conflict.setup() +end + +return M diff --git a/nvim/.config/nvim/lua/tobyvin/plugins/trouble.lua b/nvim/.config/nvim/lua/tobyvin/plugins/trouble.lua new file mode 100644 index 0000000..4dd007a --- /dev/null +++ b/nvim/.config/nvim/lua/tobyvin/plugins/trouble.lua @@ -0,0 +1,23 @@ +local utils = require("tobyvin.utils") +local M = {} + +M.setup = function() + local status_ok, trouble = pcall(require, "trouble") + if not status_ok then + vim.notify("Failed to load module 'trouble'", "error") + return + end + + trouble.setup({ + -- signs = { + -- error = utils.diagnostic_signs.error.text, + -- warning = utils.diagnostic_signs.warn.text, + -- hint = utils.diagnostic_signs.hint.text, + -- information = utils.diagnostic_signs.info.text, + -- other = utils.diagnostic_signs.info.text, + -- }, + use_diagnostic_signs = true, + }) +end + +return M diff --git a/nvim/.config/nvim/lua/tobyvin/utils.lua b/nvim/.config/nvim/lua/tobyvin/utils.lua index 2cdc1e0..042a870 100644 --- a/nvim/.config/nvim/lua/tobyvin/utils.lua +++ b/nvim/.config/nvim/lua/tobyvin/utils.lua @@ -13,16 +13,6 @@ setmetatable(M.diagnostic_signs, { end, }) -M.close_buffer = function(bufnr) - bufnr = bufnr or 0 - local status_ok, bufdelete = pcall(require, "bufdelete") - if status_ok then - bufdelete.bufdelete(bufnr, true) - else - vim.cmd("bdelete " .. bufnr) - end -end - M.create_map_group = function(mode, prefix, name, g_opts) g_opts = g_opts or {} |