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