summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--common/vim.nix1
-rw-r--r--dotfiles/vim/lua/myConfig.lua21
2 files changed, 20 insertions, 2 deletions
diff --git a/common/vim.nix b/common/vim.nix
index 8f28699..8b13f78 100644
--- a/common/vim.nix
+++ b/common/vim.nix
@@ -113,6 +113,7 @@ inputs: {
113 113
114 # Other 114 # Other
115 comment-nvim 115 comment-nvim
116 fugitive-gitlab-vim
116 null-ls-nvim 117 null-ls-nvim
117 tabular 118 tabular
118 tmux-complete-vim 119 tmux-complete-vim
diff --git a/dotfiles/vim/lua/myConfig.lua b/dotfiles/vim/lua/myConfig.lua
index 65753ea..b9a150c 100644
--- a/dotfiles/vim/lua/myConfig.lua
+++ b/dotfiles/vim/lua/myConfig.lua
@@ -188,8 +188,10 @@ require("gitsigns").setup {
188 -- Actions 188 -- Actions
189 map('n', '<leader>hs', gs.stage_hunk, { desc = "Stage Hunk" }) 189 map('n', '<leader>hs', gs.stage_hunk, { desc = "Stage Hunk" })
190 map('n', '<leader>hr', gs.reset_hunk, { desc = "reset Hunk" }) 190 map('n', '<leader>hr', gs.reset_hunk, { desc = "reset Hunk" })
191 map('v', '<leader>hs', function() gs.stage_hunk { vim.fn.line('.'), vim.fn.line('v') } end, { desc = "Stage hunk" }) 191 map('v', '<leader>hs', function() gs.stage_hunk { vim.fn.line('.'), vim.fn.line('v') } end,
192 map('v', '<leader>hr', function() gs.reset_hunk { vim.fn.line('.'), vim.fn.line('v') } end, { desc = "Reset hunk" }) 192 { desc = "Stage hunk" })
193 map('v', '<leader>hr', function() gs.reset_hunk { vim.fn.line('.'), vim.fn.line('v') } end,
194 { desc = "Reset hunk" })
193 map('n', '<leader>hS', gs.stage_buffer, { desc = "Stage buffer" }) 195 map('n', '<leader>hS', gs.stage_buffer, { desc = "Stage buffer" })
194 map('n', '<leader>hu', gs.undo_stage_hunk, { desc = "Undo stage hunk" }) 196 map('n', '<leader>hu', gs.undo_stage_hunk, { desc = "Undo stage hunk" })
195 map('n', '<leader>hR', gs.reset_buffer, { desc = "Reset buffer" }) 197 map('n', '<leader>hR', gs.reset_buffer, { desc = "Reset buffer" })
@@ -508,6 +510,21 @@ require("indent_blankline").setup {
508 show_current_context_start = true, 510 show_current_context_start = true,
509} 511}
510 512
513-- For fugitive's :GBrowse
514
515vim.api.nvim_create_user_command("Browse", function(opts)
516 local Job = require('plenary.job')
517
518 Job:new({
519 command = 'xdg-open',
520 args = { opts.args },
521 on_exit = function(j, return_val)
522 print(return_val)
523 print(j:result())
524 end
525 }):start()
526end, { nargs = 1 })
527
511-- Local config 528-- Local config
512 529
513local function isModuleAvailable(name) 530local function isModuleAvailable(name)