summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.config/nvim/after/plugin/abolish.vim15
-rw-r--r--.config/nvim/lua/plugin_settings.lua83
-rw-r--r--.config/nvim/lua/plugins.lua15
-rw-r--r--.config/nvim/neovim.cat26
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 @@
1Abolish {despa,sepe}rat{e,es,ed,ing,ely,ion,ions,or} {despe,sepa}rat{}
2Abolish persistan{ce,t,tly} persisten{}
3Abolish despara{te,tely,tion} despera{}
4Abolish seperat{e,es,ed,ing,ely,ion,ions,or} separat{}
5Abolish teh the
6Abolish {,un}nec{ce,ces,e}sar{y,ily} {}nec{es}sar{}
7Abolish {,ir}releven{ce,cy,t,tly} {}relevan{}
8Abolish color colour
9
10iabbrev <silent> todaylongdate <C-R>=strftime("%a %b %d %T %Z %Y")<CR>
11iabbrev <silent> todaydatetime <C-R>=strftime("%F %T")<CR>
12iabbrev <silent> todaydate <C-R>=strftime("%F")<CR>
13iabbrev <silent> pwn English Princeton WordNet
14iabbrev <silent> omw Open Multilingual WordNet
15iabbrev <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')
242-- }}} telescope -- 242-- }}} telescope --
243 243
244-- dashboard {{{ -- 244-- dashboard {{{ --
245g.dashboard_default_executive = 'telescope' 245g.dashboard_default_executive = 'telescope'
246g.dashboard_preview_command = 'cat' 246g.dashboard_preview_command = 'cat'
247g.dashboard_preview_pipeline = 'lolcat' 247g.dashboard_preview_file = '~/.config/nvim/neovim.cat'
248g.dashboard_preview_file = '~/.config/nvim/neovim.cat' 248g.dashboard_preview_file_height = 13
249g.dashboard_preview_file_height = 14 249g.dashboard_preview_file_width = 90
250g.dashboard_preview_file_width = 90 250g.dashboard_footer_icon = '💃 '
251 251
252g.dashboard_custom_shortcut = { 252g.dashboard_custom_shortcut = {
253 last_session = '<leader> s l', 253 last_session = '<leader> s l',
@@ -304,7 +304,6 @@ cmp.setup({
304 { name = 'nvim_lsp' }, 304 { name = 'nvim_lsp' },
305 { name = 'ultisnips' }, 305 { name = 'ultisnips' },
306 { name = 'buffer' }, 306 { name = 'buffer' },
307 { name = "latex_symbols" },
308 } 307 }
309}) 308})
310 309
@@ -469,3 +468,73 @@ require'nvim-tree'.setup {
469-- nvim-colorizer {{{ -- 468-- nvim-colorizer {{{ --
470require 'colorizer'.setup() 469require 'colorizer'.setup()
471-- }}} nvim-colorizer -- 470-- }}} nvim-colorizer --
471
472-- gitsigns.nvim {{{ --
473
474require('gitsigns').setup {
475 signs = {
476 add = {hl = 'GitSignsAdd' , text = '│', numhl='GitSignsAddNr' , linehl='GitSignsAddLn'},
477 change = {hl = 'GitSignsChange', text = '│', numhl='GitSignsChangeNr', linehl='GitSignsChangeLn'},
478 delete = {hl = 'GitSignsDelete', text = '_', numhl='GitSignsDeleteNr', linehl='GitSignsDeleteLn'},
479 topdelete = {hl = 'GitSignsDelete', text = '‾', numhl='GitSignsDeleteNr', linehl='GitSignsDeleteLn'},
480 changedelete = {hl = 'GitSignsChange', text = '~', numhl='GitSignsChangeNr', linehl='GitSignsChangeLn'},
481
482 },
483 signcolumn = true, -- Toggle with `:Gitsigns toggle_signs`
484 numhl = false, -- Toggle with `:Gitsigns toggle_numhl`
485 linehl = false, -- Toggle with `:Gitsigns toggle_linehl`
486 word_diff = false, -- Toggle with `:Gitsigns toggle_word_diff`
487 keymaps = {
488 -- Default keymap options
489 noremap = true,
490
491 ['n ]c'] = { expr = true, "&diff ? ']c' : '<cmd>lua require\"gitsigns.actions\".next_hunk()<CR>'"},
492 ['n [c'] = { expr = true, "&diff ? '[c' : '<cmd>lua require\"gitsigns.actions\".prev_hunk()<CR>'"},
493
494 ['n <leader>hs'] = '<cmd>lua require"gitsigns".stage_hunk()<CR>',
495 ['v <leader>hs'] = '<cmd>lua require"gitsigns".stage_hunk({vim.fn.line("."), vim.fn.line("v")})<CR>',
496 ['n <leader>hu'] = '<cmd>lua require"gitsigns".undo_stage_hunk()<CR>',
497 ['n <leader>hr'] = '<cmd>lua require"gitsigns".reset_hunk()<CR>',
498 ['v <leader>hr'] = '<cmd>lua require"gitsigns".reset_hunk({vim.fn.line("."), vim.fn.line("v")})<CR>',
499 ['n <leader>hR'] = '<cmd>lua require"gitsigns".reset_buffer()<CR>',
500 ['n <leader>hp'] = '<cmd>lua require"gitsigns".preview_hunk()<CR>',
501 ['n <leader>hb'] = '<cmd>lua require"gitsigns".blame_line(true)<CR>',
502 ['n <leader>hS'] = '<cmd>lua require"gitsigns".stage_buffer()<CR>',
503 ['n <leader>hU'] = '<cmd>lua require"gitsigns".reset_buffer_index()<CR>',
504
505 -- Text objects
506 ['o ih'] = ':<C-U>lua require"gitsigns.actions".select_hunk()<CR>',
507 ['x ih'] = ':<C-U>lua require"gitsigns.actions".select_hunk()<CR>'
508 },
509 watch_gitdir = {
510 interval = 1000,
511 follow_files = true
512 },
513 attach_to_untracked = true,
514 current_line_blame = false, -- Toggle with `:Gitsigns toggle_current_line_blame`
515 current_line_blame_opts = {
516 virt_text = true,
517 virt_text_pos = 'eol', -- 'eol' | 'overlay' | 'right_align'
518 delay = 1000,
519 },
520 current_line_blame_formatter_opts = {
521 relative_time = false
522 },
523 sign_priority = 6,
524 update_debounce = 100,
525 status_formatter = nil, -- Use default
526 max_file_length = 40000,
527 preview_config = {
528 -- Options passed to nvim_open_win
529 border = 'single',
530 style = 'minimal',
531 relative = 'cursor',
532 row = 0,
533 col = 1
534 },
535 yadm = {
536 enable = true
537 },
538}
539
540-- }}} 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()
26 use 'hrsh7th/nvim-cmp' 26 use 'hrsh7th/nvim-cmp'
27 use 'hrsh7th/cmp-nvim-lsp' 27 use 'hrsh7th/cmp-nvim-lsp'
28 use 'hrsh7th/cmp-buffer' 28 use 'hrsh7th/cmp-buffer'
29 use 'kdheepak/cmp-latex-symbols'
30 use 'quangnguyen30192/cmp-nvim-ultisnips' 29 use 'quangnguyen30192/cmp-nvim-ultisnips'
31 30
32 -- find, filter, preview, pick 31 -- find, filter, preview, pick
33 use { 32 use {
34 'nvim-telescope/telescope.nvim', 33 'nvim-telescope/telescope.nvim',
35 requires = { {'nvim-lua/plenary.nvim'} } 34 requires = { 'nvim-lua/plenary.nvim' }
36 } 35 }
37 use {'nvim-telescope/telescope-fzf-native.nvim', run = 'make' } 36 use {'nvim-telescope/telescope-fzf-native.nvim', run = 'make' }
38 37
38 -- git integration for buffers
39 use {
40 'lewis6991/gitsigns.nvim',
41 requires = {
42 'nvim-lua/plenary.nvim'
43 },
44 }
45
39 -- manages tag files 46 -- manages tag files
40 use 'ludovicchabant/vim-gutentags' 47 use 'ludovicchabant/vim-gutentags'
41 -- run tests (todo: write tests) 48 -- run tests (todo: write tests)
@@ -46,8 +53,6 @@ return require('packer').startup(function()
46 use {'SirVer/ultisnips', 'honza/vim-snippets'} 53 use {'SirVer/ultisnips', 'honza/vim-snippets'}
47 -- autopairs for neovim 54 -- autopairs for neovim
48 use 'windwp/nvim-autopairs' 55 use 'windwp/nvim-autopairs'
49 -- git diff in the sign column
50 use 'airblade/vim-gitgutter'
51 -- completion preview of floating window 56 -- completion preview of floating window
52 use 'ncm2/float-preview.nvim' 57 use 'ncm2/float-preview.nvim'
53 -- indent guides 58 -- indent guides
@@ -136,8 +141,6 @@ return require('packer').startup(function()
136 } 141 }
137 -- increment dates, times & more 142 -- increment dates, times & more
138 use 'tpope/vim-speeddating' 143 use 'tpope/vim-speeddating'
139 -- search, substitute and abbreviate
140 use 'tpope/vim-abolish'
141 -- provides ga, show unicode stuff of char under cursor 144 -- provides ga, show unicode stuff of char under cursor
142 use 'tpope/vim-characterize' 145 use 'tpope/vim-characterize'
143 -- comment helper 146 -- 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 @@
1┌──────────────────────────────────────────────────────────────────────────────────┐ 1┌──────────────────────────────────────────────────────────────────────────────────┐
2│ ___ ___ ___ ___ │ 2│      ___           ___           ___           ___                       ___     │
3│ /\ \ /\__\ /\ \ ___ /\ \ │ 3│     /\__\         /\  \         /\  \         /\__\          ___        /\__\    │
4│ \:\ \ /:/ _/_ /::\ \ /\ \ ___ |::\ \ │ 4│    /::|  |       /::\  \       /::\  \       /:/  /         /\  \      /::|  |   │
5│ \:\ \ /:/ /\__\ /:/\:\ \ \:\ \ /\__\ |:|:\ \ │ 5│   /:|:|  |      /:/\:\  \     /:/\:\  \     /:/  /          \:\  \    /:|:|  |   │
6│ _____\:\ \ /:/ /:/ _/_ /:/ \:\ \ \:\ \ /:/__/ __|:|\:\ \ │ 6│  /:/|:|  |__   /::\~\:\  \   /:/  \:\  \   /:/__/  ___      /::\__\  /:/|:|__|__ │
7│ /::::::::\__\ /:/_/:/ /\__\ /:/__/ \:\__\ ___ \:\__\ /::\ \ /::::|_\:\__\│ 7│ /:/ |:| /\__\ /:/\:\ \:\__\ /:/__/ \:\__\  |:|  | /\__\  __/:/\/__/ /:/ |::::\__\│
8│ \:\~~\~~\/__/ \:\/:/ /:/ / \:\ \ /:/ / /\ \ |:| | \/\:\ \__ \:\~~\ \/__/│ 8│ \/__|:|/:/  / \:\~\:\ \/__/ \:\  \ /:/  /  |:|  |/:/  / /\/:/  /    \/__/~~/:/  /│
9│ \:\ \ \::/_/:/ / \:\ /:/ / \:\ \|:| | ~~\:\/\__\ \:\ \ │ 9│     |:/:/  /   \:\ \:\__\    \:\  /:/  /   |:|__/:/  /  \::/__/           /:/  / │
10│ \:\ \ \:\/:/ / \:\/:/ / \:\__|:|__| \::/ / \:\ \ │ 10│     |::/  /     \:\ \/__/     \:\/:/  /     \::::/__/    \:\__\          /:/  /  │
11│ \:\__\ \::/ / \::/ / \::::/__/ /:/ / \:\__\ │ 11│     /:/  /       \:\__\        \::/  /       ~~~~         \/__/         /:/  /   │
12│ \/__/ \/__/ \/__/ ~~~~ \/__/ \/__/ │ 12│     \/__/         \/__/         \/__/                                   \/__/    │
13└──────────────────────────────────────────────────────────────────────────────────┘ 13└──────────────────────────────────────────────────────────────────────────────────┘