diff options
Diffstat (limited to '.config/nvim')
-rwxr-xr-x | .config/nvim/init.vim | 29 |
1 files changed, 10 insertions, 19 deletions
diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim index 1fc1cb6..575c331 100755 --- a/.config/nvim/init.vim +++ b/.config/nvim/init.vim | |||
@@ -14,10 +14,10 @@ Plug 'sheerun/vim-polyglot' | |||
14 | Plug 'dense-analysis/ale' | 14 | Plug 'dense-analysis/ale' |
15 | " manages tag files | 15 | " manages tag files |
16 | Plug 'ludovicchabant/vim-gutentags' | 16 | Plug 'ludovicchabant/vim-gutentags' |
17 | " run your tests | ||
18 | " Plug 'janko/vim-test' " TODO benched for now but should be useful later | ||
19 | " open a floating terminal | 17 | " open a floating terminal |
20 | Plug 'voldikss/vim-floaterm' | 18 | Plug 'voldikss/vim-floaterm' |
19 | " run tests (todo: write tests) | ||
20 | Plug 'janko/vim-test' | ||
21 | 21 | ||
22 | " snippets to expand | 22 | " snippets to expand |
23 | Plug 'SirVer/ultisnips' | Plug 'honza/vim-snippets' | 23 | Plug 'SirVer/ultisnips' | Plug 'honza/vim-snippets' |
@@ -51,9 +51,6 @@ Plug 'lervag/vimtex' | |||
51 | 51 | ||
52 | " text alignment | 52 | " text alignment |
53 | Plug 'godlygeek/tabular' | 53 | Plug 'godlygeek/tabular' |
54 | " color code highlight | ||
55 | " Plug 'chrisbra/Colorizer' " TODO benched for now, can't remember the last | ||
56 | " time this was useful | ||
57 | " move selections up and down | 54 | " move selections up and down |
58 | Plug 'matze/vim-move' | 55 | Plug 'matze/vim-move' |
59 | " search/select/edit sandwiched textobjects | 56 | " search/select/edit sandwiched textobjects |
@@ -65,8 +62,6 @@ Plug 'michaeljsmith/vim-indent-object' | |||
65 | 62 | ||
66 | " reopen files at your last edit position | 63 | " reopen files at your last edit position |
67 | Plug 'farmergreg/vim-lastplace' | 64 | Plug 'farmergreg/vim-lastplace' |
68 | " toggle, display and navigate marks | ||
69 | " Plug 'kshenoy/vim-signature' TODO benched for now, never used | ||
70 | " git diff in the sign column | 65 | " git diff in the sign column |
71 | Plug 'airblade/vim-gitgutter' | 66 | Plug 'airblade/vim-gitgutter' |
72 | " jump to location by 2 characters | 67 | " jump to location by 2 characters |
@@ -151,11 +146,14 @@ set scrolloff=4 " Keep n lines above/below cursor | |||
151 | set number " line numbers | 146 | set number " line numbers |
152 | set foldmethod=marker " folding stuffs | 147 | set foldmethod=marker " folding stuffs |
153 | set title " set terminal title | 148 | set title " set terminal title |
154 | set showmatch " jump to the matching bracket briefly, REMOVE AFTER TESTING | ||
155 | set linebreak " wrap using 'breakat' character | 149 | set linebreak " wrap using 'breakat' character |
156 | set splitbelow " new split panes will split to below and right | 150 | set splitbelow " new split panes will split to below and right |
157 | set splitright | 151 | set splitright |
158 | set cursorline | 152 | set cursorline " highlight the current line |
153 | set relativenumber " current line actual number, rest are relative | ||
154 | |||
155 | set showmatch " jump to the matching bracket briefly | ||
156 | set hidden " move freely between buffers | ||
159 | 157 | ||
160 | set thesaurus+=~/.local/share/thesaurus.txt | 158 | set thesaurus+=~/.local/share/thesaurus.txt |
161 | 159 | ||
@@ -209,6 +207,8 @@ nmap <silent> t<C-g> :TestVisit<CR> | |||
209 | nnoremap <silent> <C-t> :tabnew<CR> | 207 | nnoremap <silent> <C-t> :tabnew<CR> |
210 | " Edit vimrc \ev | 208 | " Edit vimrc \ev |
211 | nnoremap <silent> <Leader>ev :tabnew<CR>:e ~/.config/nvim/init.vim<CR> | 209 | nnoremap <silent> <Leader>ev :tabnew<CR>:e ~/.config/nvim/init.vim<CR> |
210 | " jump to buffer | ||
211 | nnoremap <leader>b :ls<cr>:b<space> | ||
212 | 212 | ||
213 | " Up and down are more logical with g.. | 213 | " Up and down are more logical with g.. |
214 | nnoremap <silent> k gk | 214 | nnoremap <silent> k gk |
@@ -226,20 +226,15 @@ nnoremap <C-l> <C-w>l | |||
226 | nnoremap <silent> <Leader><cr> :noh<cr> | 226 | nnoremap <silent> <Leader><cr> :noh<cr> |
227 | " Space will toggle folds! | 227 | " Space will toggle folds! |
228 | nnoremap <space> za | 228 | nnoremap <space> za |
229 | " Search mappings: These will make it so that going to the next one in a | ||
230 | " search will center on the line it's found in. | ||
231 | " map N Nzz | ||
232 | " map n nzz | ||
233 | 229 | ||
234 | " checkmarks on vimwiki | 230 | " checkmarks on vimwiki |
235 | nmap <Leader>v <Plug>VimwikiToggleListItem | 231 | nmap <Leader>v <Plug>VimwikiToggleListItem |
236 | 232 | ||
233 | " sneak using grave, s is for sandwich | ||
237 | nmap ` <Plug>Sneak_s | 234 | nmap ` <Plug>Sneak_s |
238 | nmap <leader>` <Plug>Sneak_S | 235 | nmap <leader>` <Plug>Sneak_S |
239 | nnoremap ' ` | 236 | nnoremap ' ` |
240 | 237 | ||
241 | nmap <leader>i :IndentGuidesToggle<CR> | ||
242 | |||
243 | " separate cut and delete | 238 | " separate cut and delete |
244 | nnoremap x d | 239 | nnoremap x d |
245 | xnoremap x d | 240 | xnoremap x d |
@@ -367,10 +362,6 @@ let g:vimtex_quickfix_mode = 0 | |||
367 | let g:polyglot_disabled = ['latex', 'tex', 'ledger'] | 362 | let g:polyglot_disabled = ['latex', 'tex', 'ledger'] |
368 | " }}} | 363 | " }}} |
369 | 364 | ||
370 | " {{{ rainbow | ||
371 | let g:rainbow_active = 0 | ||
372 | " }}} | ||
373 | |||
374 | " {{{ Gutentags | 365 | " {{{ Gutentags |
375 | let g:gutentags_add_default_project_roots = 0 | 366 | let g:gutentags_add_default_project_roots = 0 |
376 | let g:gutentags_project_root = ['Makefile', '.git'] | 367 | let g:gutentags_project_root = ['Makefile', '.git'] |