diff options
Diffstat (limited to 'config/essentials/nvim')
| -rw-r--r-- | config/essentials/nvim/after/plugin/gitsigns.lua | 82 | ||||
| -rw-r--r-- | config/essentials/nvim/lua/user/cmp/init.lua | 1 | ||||
| -rw-r--r-- | config/essentials/nvim/lua/user/packer.lua | 3 | ||||
| -rw-r--r-- | config/essentials/nvim/lua/user/zk.lua | 33 |
4 files changed, 108 insertions, 11 deletions
diff --git a/config/essentials/nvim/after/plugin/gitsigns.lua b/config/essentials/nvim/after/plugin/gitsigns.lua new file mode 100644 index 0000000..025f70d --- /dev/null +++ b/config/essentials/nvim/after/plugin/gitsigns.lua @@ -0,0 +1,82 @@ +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 = { + 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 = '<author>, <author_time:%Y-%m-%d> - <summary>', + 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 + }, + yadm = { + enable = false + }, + 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 '<Ignore>' + end, {expr=true}) + + map('n', '[c', function() + if vim.wo.diff then return '[c' end + vim.schedule(function() gs.prev_hunk() end) + return '<Ignore>' + end, {expr=true}) + + -- Actions + map('n', '<leader>hs', gs.stage_hunk) + map('n', '<leader>hr', gs.reset_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) + map('n', '<leader>hS', gs.stage_buffer) + map('n', '<leader>hu', gs.undo_stage_hunk) + map('n', '<leader>hR', gs.reset_buffer) + map('n', '<leader>hp', gs.preview_hunk) + map('n', '<leader>hb', function() gs.blame_line{full=true} end) + map('n', '<leader>tb', gs.toggle_current_line_blame) + map('n', '<leader>hd', gs.diffthis) + map('n', '<leader>hD', function() gs.diffthis('~') end) + map('n', '<leader>td', gs.toggle_deleted) + + -- Text object + map({'o', 'x'}, 'ih', ':<C-U>Gitsigns select_hunk<CR>') + end + +} diff --git a/config/essentials/nvim/lua/user/cmp/init.lua b/config/essentials/nvim/lua/user/cmp/init.lua index 5d32c26..d40a67c 100644 --- a/config/essentials/nvim/lua/user/cmp/init.lua +++ b/config/essentials/nvim/lua/user/cmp/init.lua @@ -3,6 +3,7 @@ require("user.cmp.setup") require("user.cmp.arduino") require("user.cmp.bash") require("user.cmp.clangd") +require("user.cmp.cs") require("user.cmp.html") require("user.cmp.css") require("user.cmp.java") diff --git a/config/essentials/nvim/lua/user/packer.lua b/config/essentials/nvim/lua/user/packer.lua index bec8d54..605c0e2 100644 --- a/config/essentials/nvim/lua/user/packer.lua +++ b/config/essentials/nvim/lua/user/packer.lua @@ -18,8 +18,6 @@ return require('packer').startup(function(use) use { 'uZer/pywal16.nvim', as = 'pywal16' } use('norcalli/nvim-colorizer.lua') - use('airblade/vim-gitgutter') - use('nvim-treesitter/nvim-treesitter', {run = ':TSUpdate'}) use('nvim-treesitter/playground') use('theRealCarneiro/hyprland-vim-syntax') @@ -39,6 +37,7 @@ return require('packer').startup(function(use) use('tpope/vim-commentary') -- use('tpope/vim-endwise') use('tpope/vim-fugitive') + use('lewis6991/gitsigns.nvim') use('tpope/vim-repeat') use('tpope/vim-surround') use('tpope/vim-vinegar') diff --git a/config/essentials/nvim/lua/user/zk.lua b/config/essentials/nvim/lua/user/zk.lua index 41072a6..ee055d6 100644 --- a/config/essentials/nvim/lua/user/zk.lua +++ b/config/essentials/nvim/lua/user/zk.lua @@ -45,8 +45,8 @@ require('telekasten').setup({ template_new_note = home .. "/" .. "templates/new_note.md", new_note_filename = "title", }, - SoftwareDesign = { - home = home .. "/" .. "SoftwareDesign", + BusinessEnglish = { + home = home .. "/" .. "BusinessEnglish", template_new_note = home .. "/" .. "templates/new_note.md", new_note_filename = "title", }, @@ -55,21 +55,36 @@ require('telekasten').setup({ template_new_note = home .. "/" .. "templates/new_note.md", new_note_filename = "title", }, - NetworkEssentials = { - home = home .. "/" .. "NetworkEssentials", + BusinessCommunication = { + home = home .. "/" .. "BusinessCommunication", template_new_note = home .. "/" .. "templates/new_note.md", new_note_filename = "title", }, - C = { - home = home .. "/" .. "C", + AIEssentials = { + home = home .. "/" .. "AIEssentials", + template_new_note = home .. "/" .. "templates/new_note.md", + new_note_filename = "title", + }, + dotNetEssentials = { + home = home .. "/" .. "dotNetEssentials", + template_new_note = home .. "/" .. "templates/new_note.md", + new_note_filename = "title", + }, + iTalent = { + home = home .. "/" .. "iTalent", template_new_note = home .. "/" .. "templates/new_note.md", new_note_filename = "title", }, - businessIT = { - home = home .. "/" .. "businessIT", + SoftwareDesign2 = { + home = home .. "/" .. "SoftwareDesign2", template_new_note = home .. "/" .. "templates/new_note.md", new_note_filename = "title", - } + }, + C = { + home = home .. "/" .. "C", + template_new_note = home .. "/" .. "templates/new_note.md", + new_note_filename = "title", + }, } }) |