diff --git a/.config/nvim/after/plugin/git.lua b/.config/nvim/after/plugin/git.lua new file mode 100644 index 0000000..503e2f4 --- /dev/null +++ b/.config/nvim/after/plugin/git.lua @@ -0,0 +1,77 @@ +require('gitsigns').setup { + signs = { + add = { text = '│' }, + change = { text = '│' }, + delete = { text = '_' }, + topdelete = { text = '‾' }, + changedelete = { text = '~' }, + untracked = { text = '┆' }, + }, + signcolumn = true, -- Toggle with `:Gitsigns toggle_signs` + numhl = false, -- Toggle with `:Gitsigns toggle_numhl` + linehl = false, -- Toggle with `:Gitsigns toggle_linehl` + word_diff = false, -- Toggle with `:Gitsigns toggle_word_diff` + watch_gitdir = { + interval = 1000, + follow_files = true + }, + attach_to_untracked = true, + current_line_blame = false, -- Toggle with `:Gitsigns toggle_current_line_blame` + current_line_blame_opts = { + virt_text = true, + virt_text_pos = 'eol', -- 'eol' | 'overlay' | 'right_align' + delay = 1000, + ignore_whitespace = false, + }, + current_line_blame_formatter = ', - ', + sign_priority = 6, + update_debounce = 100, + status_formatter = nil, -- Use default + max_file_length = 40000, -- Disable if file is longer than this (in lines) + preview_config = { + -- Options passed to nvim_open_win + border = 'single', + style = 'minimal', + relative = 'cursor', + row = 0, + col = 1 + }, + on_attach = function(bufnr) + local gs = package.loaded.gitsigns + + local function map(mode, l, r, opts) + opts = opts or {} + opts.buffer = bufnr + vim.keymap.set(mode, l, r, opts) + end + + -- Navigation + map('n', ']c', function() + if vim.wo.diff then return ']c' end + vim.schedule(function() gs.next_hunk() end) + return '' + end, {expr=true}) + + map('n', '[c', function() + if vim.wo.diff then return '[c' end + vim.schedule(function() gs.prev_hunk() end) + return '' + end, {expr=true}) + + -- Actions + map({'n', 'v'}, 'hs', ':Gitsigns stage_hunk') + map({'n', 'v'}, 'hr', ':Gitsigns reset_hunk') + map('n', 'hS', gs.stage_buffer) + map('n', 'hu', gs.undo_stage_hunk) + map('n', 'hR', gs.reset_buffer) + map('n', 'hp', gs.preview_hunk) + map('n', 'hb', function() gs.blame_line{full=true} end) + map('n', 'tb', gs.toggle_current_line_blame) + map('n', 'hd', gs.diffthis) + map('n', 'hD', function() gs.diffthis('~') end) + map('n', 'td', gs.toggle_deleted) + + -- Text object + map({'o', 'x'}, 'ih', ':Gitsigns select_hunk') + end +} diff --git a/.config/nvim/after/plugin/trouble.lua b/.config/nvim/after/plugin/trouble.lua new file mode 100644 index 0000000..b1e660e --- /dev/null +++ b/.config/nvim/after/plugin/trouble.lua @@ -0,0 +1,18 @@ +vim.keymap.set("n", "xx", ":TroubleToggle", + {silent = true, noremap = true} +) +vim.keymap.set("n", "xw", ":TroubleToggle workspace_diagnostics", + {silent = true, noremap = true} +) +vim.keymap.set("n", "xd", ":TroubleToggle document_diagnostics", + {silent = true, noremap = true} +) +vim.keymap.set("n", "xl", ":TroubleToggle loclist", + {silent = true, noremap = true} +) +vim.keymap.set("n", "xq", ":TroubleToggle quickfix", + {silent = true, noremap = true} +) +vim.keymap.set("n", "gR", ":TroubleToggle lsp_references", + {silent = true, noremap = true} +) diff --git a/.config/nvim/lua/ajet/packer.lua b/.config/nvim/lua/ajet/packer.lua index 9e125be..66cad2d 100755 --- a/.config/nvim/lua/ajet/packer.lua +++ b/.config/nvim/lua/ajet/packer.lua @@ -99,4 +99,5 @@ return require('packer').startup(function(use) end }) use('Konfekt/vim-alias') use('f-person/git-blame.nvim') + use('lewis6991/gitsigns.nvim') end) diff --git a/.zshrc b/.zshrc index eaaa030..86f30eb 100644 --- a/.zshrc +++ b/.zshrc @@ -1,3 +1,6 @@ +# temp remove me +export ARTIFACTORY_PW=QUtDcDhqUThmUERkS1dXV2JxeUJCM1ZLWGdWdlpOdVdrUjhzbnozTlREY2RiMnFYMWNubkpVcnZvenVNd3BrckdZMVBmUnhkNg== + # If you come from bash you might have to change your $PATH. # export PATH=$HOME/bin:/usr/local/bin:$PATH