diff --git a/init.lua b/init.lua index 4e7354c5..b74bba4f 100644 --- a/init.lua +++ b/init.lua @@ -137,17 +137,7 @@ require('lazy').setup({ }, }, - { - -- Add indentation guides even on blank lines - 'lukas-reineke/indent-blankline.nvim', - -- Enable `lukas-reineke/indent-blankline.nvim` - -- See `:help indent_blankline.txt` - opts = { - char = '┊', - show_trailing_blankline_indent = false, - }, - }, - +{ "lukas-reineke/indent-blankline.nvim", main = "ibl", opts = {} }, -- "gc" to comment visual regions/lines { 'numToStr/Comment.nvim', opts = {} }, @@ -204,6 +194,13 @@ require('lazy').setup({ 'ldelossa/litee.nvim' } }, { 'tpope/vim-abolish' }, + { + "kdheepak/lazygit.nvim", + -- optional for floating window border decoration + dependencies = { + "nvim-lua/plenary.nvim", + }, + }, { import = 'custom.plugins' }, }, {}) @@ -602,98 +599,98 @@ cmp.setup { require('litee.lib').setup() require('litee.gh').setup({ -- deprecated, around for compatability for now. - jump_mode = "invoking", + jump_mode = "invoking", -- remap the arrow keys to resize any litee.nvim windows. - map_resize_keys = false, + map_resize_keys = false, -- do not map any keys inside any gh.nvim buffers. - disable_keymaps = false, + disable_keymaps = false, -- the icon set to use. - icon_set = "default", + icon_set = "default", -- any custom icons to use. - icon_set_custom = nil, + icon_set_custom = nil, -- whether to register the @username and #issue_number omnifunc completion -- in buffers which start with .git/ git_buffer_completion = true, -- defines keymaps in gh.nvim buffers. - keymaps = { - -- when inside a gh.nvim panel, this key will open a node if it has - -- any futher functionality. for example, hitting on a commit node - -- will open the commit's changed files in a new gh.nvim panel. - open = "", - -- when inside a gh.nvim panel, expand a collapsed node - expand = "zo", - -- when inside a gh.nvim panel, collpased and expanded node - collapse = "zc", - -- when cursor is over a "#1234" formatted issue or PR, open its details - -- and comments in a new tab. - goto_issue = "gd", - -- show any details about a node, typically, this reveals commit messages - -- and submitted review bodys. - details = "d", - -- inside a convo buffer, submit a comment - submit_comment = "", - -- inside a convo buffer, when your cursor is ontop of a comment, open - -- up a set of actions that can be performed. - actions = "", - -- inside a thread convo buffer, resolve the thread. - resolve_thread = "", - -- inside a gh.nvim panel, if possible, open the node's web URL in your - -- browser. useful particularily for digging into external failed CI - -- checks. - goto_web = "gx" + keymaps = { + -- when inside a gh.nvim panel, this key will open a node if it has + -- any futher functionality. for example, hitting on a commit node + -- will open the commit's changed files in a new gh.nvim panel. + open = "", + -- when inside a gh.nvim panel, expand a collapsed node + expand = "zo", + -- when inside a gh.nvim panel, collpased and expanded node + collapse = "zc", + -- when cursor is over a "#1234" formatted issue or PR, open its details + -- and comments in a new tab. + goto_issue = "gd", + -- show any details about a node, typically, this reveals commit messages + -- and submitted review bodys. + details = "d", + -- inside a convo buffer, submit a comment + submit_comment = "", + -- inside a convo buffer, when your cursor is ontop of a comment, open + -- up a set of actions that can be performed. + actions = "", + -- inside a thread convo buffer, resolve the thread. + resolve_thread = "", + -- inside a gh.nvim panel, if possible, open the node's web URL in your + -- browser. useful particularily for digging into external failed CI + -- checks. + goto_web = "gx" } }) local wk = require("which-key") wk.register({ - g = { - name = "+Git", - h = { - name = "+Github", - c = { - name = "+Commits", - c = { "GHCloseCommit", "Close" }, - e = { "GHExpandCommit", "Expand" }, - o = { "GHOpenToCommit", "Open To" }, - p = { "GHPopOutCommit", "Pop Out" }, - z = { "GHCollapseCommit", "Collapse" }, - }, - i = { - name = "+Issues", - p = { "GHPreviewIssue", "Preview" }, - }, - l = { - name = "+Litee", - t = { "LTPanel", "Toggle Panel" }, - }, - r = { - name = "+Review", - b = { "GHStartReview", "Begin" }, - c = { "GHCloseReview", "Close" }, - d = { "GHDeleteReview", "Delete" }, - e = { "GHExpandReview", "Expand" }, - s = { "GHSubmitReview", "Submit" }, - z = { "GHCollapseReview", "Collapse" }, - }, - p = { - name = "+Pull Request", - c = { "GHClosePR", "Close" }, - d = { "GHPRDetails", "Details" }, - e = { "GHExpandPR", "Expand" }, - o = { "GHOpenPR", "Open" }, - p = { "GHPopOutPR", "PopOut" }, - r = { "GHRefreshPR", "Refresh" }, - t = { "GHOpenToPR", "Open To" }, - z = { "GHCollapsePR", "Collapse" }, - }, - t = { - name = "+Threads", - c = { "GHCreateThread", "Create" }, - n = { "GHNextThread", "Next" }, - t = { "GHToggleThread", "Toggle" }, - }, - }, + g = { + name = "+Git", + h = { + name = "+Github", + c = { + name = "+Commits", + c = { "GHCloseCommit", "Close" }, + e = { "GHExpandCommit", "Expand" }, + o = { "GHOpenToCommit", "Open To" }, + p = { "GHPopOutCommit", "Pop Out" }, + z = { "GHCollapseCommit", "Collapse" }, + }, + i = { + name = "+Issues", + p = { "GHPreviewIssue", "Preview" }, + }, + l = { + name = "+Litee", + t = { "LTPanel", "Toggle Panel" }, + }, + r = { + name = "+Review", + b = { "GHStartReview", "Begin" }, + c = { "GHCloseReview", "Close" }, + d = { "GHDeleteReview", "Delete" }, + e = { "GHExpandReview", "Expand" }, + s = { "GHSubmitReview", "Submit" }, + z = { "GHCollapseReview", "Collapse" }, + }, + p = { + name = "+Pull Request", + c = { "GHClosePR", "Close" }, + d = { "GHPRDetails", "Details" }, + e = { "GHExpandPR", "Expand" }, + o = { "GHOpenPR", "Open" }, + p = { "GHPopOutPR", "PopOut" }, + r = { "GHRefreshPR", "Refresh" }, + t = { "GHOpenToPR", "Open To" }, + z = { "GHCollapsePR", "Collapse" }, + }, + t = { + name = "+Threads", + c = { "GHCreateThread", "Create" }, + n = { "GHNextThread", "Next" }, + t = { "GHToggleThread", "Toggle" }, + }, }, + }, }, { prefix = "" }) local configs = require('lspconfig.configs') @@ -703,8 +700,8 @@ local util = require('lspconfig.util') if not configs.helm_ls then configs.helm_ls = { default_config = { - cmd = {"helm_ls", "serve"}, - filetypes = {'helm'}, + cmd = { "helm_ls", "serve" }, + filetypes = { 'helm' }, root_dir = function(fname) return util.root_pattern('Chart.yaml')(fname) end, @@ -713,8 +710,8 @@ if not configs.helm_ls then end lspconfig.helm_ls.setup { - filetypes = {"helm"}, - cmd = {"helm_ls", "serve"}, + filetypes = { "helm" }, + cmd = { "helm_ls", "serve" }, } -- The line beneath this is called `modeline`. See `:help modeline`