4 files changed, 98 insertions, 41 deletions

diff --git a/.config/nvim/after/plugin/abolish.vim b/.config/nvim/after/plugin/abolish.vim
deleted file mode 100644
index a295819..0000000
--- a/.config/nvim/after/plugin/abolish.vim
+++ /dev/null
@@ -1,15 +0,0 @@
-Abolish {despa,sepe}rat{e,es,ed,ing,ely,ion,ions,or} {despe,sepa}rat{}
-Abolish persistan{ce,t,tly} persisten{}
-Abolish despara{te,tely,tion} despera{}
-Abolish seperat{e,es,ed,ing,ely,ion,ions,or} separat{}
-Abolish teh the
-Abolish {,un}nec{ce,ces,e}sar{y,ily} {}nec{es}sar{}
-Abolish {,ir}releven{ce,cy,t,tly} {}relevan{}
-Abolish color colour
-
-iabbrev <silent> todaylongdate <C-R>=strftime("%a %b %d %T %Z %Y")<CR>
-iabbrev <silent> todaydatetime <C-R>=strftime("%F %T")<CR>
-iabbrev <silent> todaydate <C-R>=strftime("%F")<CR>
-iabbrev <silent> pwn English Princeton WordNet
-iabbrev <silent> omw Open Multilingual WordNet
-iabbrev <silent> BC blockchain
diff --git a/.config/nvim/lua/plugin_settings.lua b/.config/nvim/lua/plugin_settings.lua
index 1f39e5f..277e196 100644
--- a/.config/nvim/lua/plugin_settings.lua
+++ b/.config/nvim/lua/plugin_settings.lua
@@ -242,12 +242,12 @@ require('telescope').load_extension('fzf')
 -- }}} telescope --
 
 -- dashboard {{{ --
-g.dashboard_default_executive = 'telescope'
-g.dashboard_preview_command = 'cat'
-g.dashboard_preview_pipeline = 'lolcat'
-g.dashboard_preview_file = '~/.config/nvim/neovim.cat'
-g.dashboard_preview_file_height = 14
-g.dashboard_preview_file_width = 90
+g.dashboard_default_executive   = 'telescope'
+g.dashboard_preview_command     = 'cat'
+g.dashboard_preview_file        = '~/.config/nvim/neovim.cat'
+g.dashboard_preview_file_height = 13
+g.dashboard_preview_file_width  = 90
+g.dashboard_footer_icon         = '💃 '
 
 g.dashboard_custom_shortcut = {
     last_session       = '<leader> s l',
@@ -304,7 +304,6 @@ cmp.setup({
         { name = 'nvim_lsp' },
         { name = 'ultisnips' },
         { name = 'buffer' },
-        { name = "latex_symbols" },
     }
 })
 
@@ -469,3 +468,73 @@ require'nvim-tree'.setup {
 -- nvim-colorizer {{{ --
 require 'colorizer'.setup()
 -- }}} nvim-colorizer --
+
+-- gitsigns.nvim {{{ --
+
+require('gitsigns').setup {
+  signs = {
+    add          = {hl = 'GitSignsAdd'   , text = '│', numhl='GitSignsAddNr'   , linehl='GitSignsAddLn'},
+    change       = {hl = 'GitSignsChange', text = '│', numhl='GitSignsChangeNr', linehl='GitSignsChangeLn'},
+    delete       = {hl = 'GitSignsDelete', text = '_', numhl='GitSignsDeleteNr', linehl='GitSignsDeleteLn'},
+    topdelete    = {hl = 'GitSignsDelete', text = '‾', numhl='GitSignsDeleteNr', linehl='GitSignsDeleteLn'},
+    changedelete = {hl = 'GitSignsChange', text = '~', numhl='GitSignsChangeNr', linehl='GitSignsChangeLn'},
+
+  },
+  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`
+  keymaps = {
+    -- Default keymap options
+    noremap = true,
+
+    ['n ]c'] = { expr = true, "&diff ? ']c' : '<cmd>lua require\"gitsigns.actions\".next_hunk()<CR>'"},
+    ['n [c'] = { expr = true, "&diff ? '[c' : '<cmd>lua require\"gitsigns.actions\".prev_hunk()<CR>'"},
+
+    ['n <leader>hs'] = '<cmd>lua require"gitsigns".stage_hunk()<CR>',
+    ['v <leader>hs'] = '<cmd>lua require"gitsigns".stage_hunk({vim.fn.line("."), vim.fn.line("v")})<CR>',
+    ['n <leader>hu'] = '<cmd>lua require"gitsigns".undo_stage_hunk()<CR>',
+    ['n <leader>hr'] = '<cmd>lua require"gitsigns".reset_hunk()<CR>',
+    ['v <leader>hr'] = '<cmd>lua require"gitsigns".reset_hunk({vim.fn.line("."), vim.fn.line("v")})<CR>',
+    ['n <leader>hR'] = '<cmd>lua require"gitsigns".reset_buffer()<CR>',
+    ['n <leader>hp'] = '<cmd>lua require"gitsigns".preview_hunk()<CR>',
+    ['n <leader>hb'] = '<cmd>lua require"gitsigns".blame_line(true)<CR>',
+    ['n <leader>hS'] = '<cmd>lua require"gitsigns".stage_buffer()<CR>',
+    ['n <leader>hU'] = '<cmd>lua require"gitsigns".reset_buffer_index()<CR>',
+
+    -- Text objects
+    ['o ih'] = ':<C-U>lua require"gitsigns.actions".select_hunk()<CR>',
+    ['x ih'] = ':<C-U>lua require"gitsigns.actions".select_hunk()<CR>'
+  },
+  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,
+  },
+  current_line_blame_formatter_opts = {
+    relative_time = false
+  },
+  sign_priority = 6,
+  update_debounce = 100,
+  status_formatter = nil, -- Use default
+  max_file_length = 40000,
+  preview_config = {
+    -- Options passed to nvim_open_win
+    border = 'single',
+    style = 'minimal',
+    relative = 'cursor',
+    row = 0,
+    col = 1
+  },
+  yadm = {
+    enable = true
+  },
+}
+
+-- }}} gitsigns.nvim --
diff --git a/.config/nvim/lua/plugins.lua b/.config/nvim/lua/plugins.lua
index 266ab2c..b3a87b2 100644
--- a/.config/nvim/lua/plugins.lua
+++ b/.config/nvim/lua/plugins.lua
@@ -26,16 +26,23 @@ return require('packer').startup(function()
     use 'hrsh7th/nvim-cmp'
     use 'hrsh7th/cmp-nvim-lsp'
     use 'hrsh7th/cmp-buffer'
-    use 'kdheepak/cmp-latex-symbols'
     use 'quangnguyen30192/cmp-nvim-ultisnips'
 
     -- find, filter, preview, pick
     use {
         'nvim-telescope/telescope.nvim',
-        requires = { {'nvim-lua/plenary.nvim'} }
+        requires = { 'nvim-lua/plenary.nvim' }
     }
     use {'nvim-telescope/telescope-fzf-native.nvim', run = 'make' }
 
+    --  git integration for buffers
+    use {
+        'lewis6991/gitsigns.nvim',
+        requires = {
+            'nvim-lua/plenary.nvim'
+        },
+    }
+
     -- manages tag files
     use 'ludovicchabant/vim-gutentags'
     -- run tests (todo: write tests)
@@ -46,8 +53,6 @@ return require('packer').startup(function()
     use {'SirVer/ultisnips', 'honza/vim-snippets'}
     -- autopairs for neovim
     use 'windwp/nvim-autopairs'
-    -- git diff in the sign column
-    use 'airblade/vim-gitgutter'
     -- completion preview of floating window
     use 'ncm2/float-preview.nvim'
     -- indent guides
@@ -136,8 +141,6 @@ return require('packer').startup(function()
     }
     -- increment dates, times & more
     use 'tpope/vim-speeddating'
-    -- search, substitute and abbreviate
-    use 'tpope/vim-abolish'
     -- provides ga, show unicode stuff of char under cursor
     use 'tpope/vim-characterize'
     -- comment helper
diff --git a/.config/nvim/neovim.cat b/.config/nvim/neovim.cat
index e82ff4a..fc33e6d 100644
--- a/.config/nvim/neovim.cat
+++ b/.config/nvim/neovim.cat
@@ -1,13 +1,13 @@
-┌──────────────────────────────────────────────────────────────────────────────────┐
-│      ___           ___           ___                                     ___     │
-│     /\  \         /\__\         /\  \          ___                      /\  \    │
-│     \:\  \       /:/ _/_       /::\  \        /\  \        ___         |::\  \   │
-│      \:\  \     /:/ /\__\     /:/\:\  \       \:\  \      /\__\        |:|:\  \  │
-│  _____\:\  \   /:/ /:/ _/_   /:/  \:\  \       \:\  \    /:/__/      __|:|\:\  \ │
-│ /::::::::\__\ /:/_/:/ /\__\ /:/__/ \:\__\  ___  \:\__\  /::\  \     /::::|_\:\__\│
-│ \:\~~\~~\/__/ \:\/:/ /:/  / \:\  \ /:/  / /\  \ |:|  |  \/\:\  \__  \:\~~\  \/__/│
-│  \:\  \        \::/_/:/  /   \:\  /:/  /  \:\  \|:|  |   ~~\:\/\__\  \:\  \      │
-│   \:\  \        \:\/:/  /     \:\/:/  /    \:\__|:|__|      \::/  /   \:\  \     │
-│    \:\__\        \::/  /       \::/  /      \::::/__/       /:/  /     \:\__\    │
-│     \/__/         \/__/         \/__/        ~~~~           \/__/       \/__/    │
-└──────────────────────────────────────────────────────────────────────────────────┘
+┌──────────────────────────────────────────────────────────────────────────────────┐
+│      ___           ___           ___           ___                       ___     │
+│     /\__\         /\  \         /\  \         /\__\          ___        /\__\    │
+│    /::|  |       /::\  \       /::\  \       /:/  /         /\  \      /::|  |   │
+│   /:|:|  |      /:/\:\  \     /:/\:\  \     /:/  /          \:\  \    /:|:|  |   │
+│  /:/|:|  |__   /::\~\:\  \   /:/  \:\  \   /:/__/  ___      /::\__\  /:/|:|__|__ │
+│ /:/ |:| /\__\ /:/\:\ \:\__\ /:/__/ \:\__\  |:|  | /\__\  __/:/\/__/ /:/ |::::\__\│
+│ \/__|:|/:/  / \:\~\:\ \/__/ \:\  \ /:/  /  |:|  |/:/  / /\/:/  /    \/__/~~/:/  /│
+│     |:/:/  /   \:\ \:\__\    \:\  /:/  /   |:|__/:/  /  \::/__/           /:/  / │
+│     |::/  /     \:\ \/__/     \:\/:/  /     \::::/__/    \:\__\          /:/  /  │
+│     /:/  /       \:\__\        \::/  /       ~~~~         \/__/         /:/  /   │
+│     \/__/         \/__/         \/__/                                   \/__/    │
+└──────────────────────────────────────────────────────────────────────────────────┘