[neovim] Install octo.nvim (and some formatting)
This commit is contained in:
parent
1f3249a316
commit
6f83e32406
1 changed files with 75 additions and 61 deletions
|
@ -274,7 +274,8 @@ require("lazy").setup({
|
||||||
{
|
{
|
||||||
"microsoft/vscode-js-debug",
|
"microsoft/vscode-js-debug",
|
||||||
-- After install, build it and rename the dist directory to out
|
-- After install, build it and rename the dist directory to out
|
||||||
build = "npm install --legacy-peer-deps --no-save && npx gulp vsDebugServerBundle && rm -rf out && mv dist out",
|
build =
|
||||||
|
"npm install --legacy-peer-deps --no-save && npx gulp vsDebugServerBundle && rm -rf out && mv dist out",
|
||||||
version = "1.*",
|
version = "1.*",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -330,7 +331,8 @@ require("lazy").setup({
|
||||||
"nvim-lua/plenary.nvim",
|
"nvim-lua/plenary.nvim",
|
||||||
{
|
{
|
||||||
"nvim-telescope/telescope-fzf-native.nvim",
|
"nvim-telescope/telescope-fzf-native.nvim",
|
||||||
build = "cmake -S. -Bbuild -DCMAKE_BUILD_TYPE=Release && cmake --build build --config Release && cmake --install build --prefix build",
|
build =
|
||||||
|
"cmake -S. -Bbuild -DCMAKE_BUILD_TYPE=Release && cmake --build build --config Release && cmake --install build --prefix build",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
@ -349,6 +351,18 @@ require("lazy").setup({
|
||||||
},
|
},
|
||||||
{ "tpope/vim-fugitive", event = "VeryLazy" },
|
{ "tpope/vim-fugitive", event = "VeryLazy" },
|
||||||
{ "lewis6991/gitsigns.nvim", event = "VeryLazy" },
|
{ "lewis6991/gitsigns.nvim", event = "VeryLazy" },
|
||||||
|
{
|
||||||
|
"pwntester/octo.nvim",
|
||||||
|
requires = {
|
||||||
|
"nvim-lua/plenary.nvim",
|
||||||
|
"nvim-telescope/telescope.nvim",
|
||||||
|
"nvim-tree/nvim-web-devicons",
|
||||||
|
},
|
||||||
|
config = function()
|
||||||
|
require("octo").setup()
|
||||||
|
end,
|
||||||
|
event = "VeryLazy",
|
||||||
|
},
|
||||||
{ "famiu/bufdelete.nvim", event = "VeryLazy" },
|
{ "famiu/bufdelete.nvim", event = "VeryLazy" },
|
||||||
})
|
})
|
||||||
|
|
||||||
|
@ -452,6 +466,11 @@ cmp.setup.cmdline(':', {
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
|
-- Neodev
|
||||||
|
require("neodev").setup({
|
||||||
|
library = { plugins = { "nvim-dap-ui" }, types = true },
|
||||||
|
})
|
||||||
|
|
||||||
--[[ nvim-lspconfig
|
--[[ nvim-lspconfig
|
||||||
--]]
|
--]]
|
||||||
|
|
||||||
|
@ -632,8 +651,10 @@ require('gitsigns').setup({
|
||||||
-- Actions
|
-- Actions
|
||||||
map('n', '<leader>hs', gs.stage_hunk, { desc = 'GitSigns: stage hunk' })
|
map('n', '<leader>hs', gs.stage_hunk, { desc = 'GitSigns: stage hunk' })
|
||||||
map('n', '<leader>hr', gs.reset_hunk, { desc = 'GitSigns: reset hunk' })
|
map('n', '<leader>hr', gs.reset_hunk, { desc = 'GitSigns: reset hunk' })
|
||||||
map('v', '<leader>hs', function() gs.stage_hunk {vim.fn.line('.'), vim.fn.line('v')} end, { desc = 'GitSigns: stage hunk' })
|
map('v', '<leader>hs', function() gs.stage_hunk { vim.fn.line('.'), vim.fn.line('v') } end,
|
||||||
map('v', '<leader>hr', function() gs.reset_hunk {vim.fn.line('.'), vim.fn.line('v')} end, { desc = 'GitSigns: reset hunk' })
|
{ desc = 'GitSigns: stage hunk' })
|
||||||
|
map('v', '<leader>hr', function() gs.reset_hunk { vim.fn.line('.'), vim.fn.line('v') } end,
|
||||||
|
{ desc = 'GitSigns: reset hunk' })
|
||||||
map('n', '<leader>hS', gs.stage_buffer, { desc = 'GitSigns: stage buffer' })
|
map('n', '<leader>hS', gs.stage_buffer, { desc = 'GitSigns: stage buffer' })
|
||||||
map('n', '<leader>hu', gs.undo_stage_hunk, { desc = 'GitSigns: undo stage hunk' })
|
map('n', '<leader>hu', gs.undo_stage_hunk, { desc = 'GitSigns: undo stage hunk' })
|
||||||
map('n', '<leader>hR', gs.reset_buffer, { desc = 'GitSigns: reset_buffer' })
|
map('n', '<leader>hR', gs.reset_buffer, { desc = 'GitSigns: reset_buffer' })
|
||||||
|
@ -643,7 +664,6 @@ require('gitsigns').setup({
|
||||||
map('n', '<leader>hd', gs.diffthis, { desc = 'GitSigns: diff this' })
|
map('n', '<leader>hd', gs.diffthis, { desc = 'GitSigns: diff this' })
|
||||||
map('n', '<leader>hD', function() gs.diffthis('~') end, { desc = 'GitSigns: diff this' })
|
map('n', '<leader>hD', function() gs.diffthis('~') end, { desc = 'GitSigns: diff this' })
|
||||||
map('n', '<leader>td', gs.toggle_deleted, { desc = 'GitSigns: toggle deleted' })
|
map('n', '<leader>td', gs.toggle_deleted, { desc = 'GitSigns: toggle deleted' })
|
||||||
|
|
||||||
end
|
end
|
||||||
})
|
})
|
||||||
|
|
||||||
|
@ -721,12 +741,6 @@ require('nvim-treesitter.configs').setup({
|
||||||
|
|
||||||
vim.treesitter.language.register("html", "handlebars")
|
vim.treesitter.language.register("html", "handlebars")
|
||||||
|
|
||||||
-- Neodev
|
|
||||||
require("neodev").setup({
|
|
||||||
library = { plugins = { "nvim-dap-ui" }, types = true },
|
|
||||||
...
|
|
||||||
})
|
|
||||||
|
|
||||||
-- Tweak GitSigns blame color
|
-- Tweak GitSigns blame color
|
||||||
-- This differentiates the cursorline from the git blame text
|
-- This differentiates the cursorline from the git blame text
|
||||||
vim.cmd("highlight GitSignsCurrentLineBlame gui=bold guifg=#339944")
|
vim.cmd("highlight GitSignsCurrentLineBlame gui=bold guifg=#339944")
|
||||||
|
|
Loading…
Reference in a new issue