-" My vimrc.
-"
-" Author: Samir Benmendil <samir.benmendil[at]gmail[dot]com>
-"
+" force python3
+if has('python3') | endif
+
+" space is leader
+let g:mapleader = " "
" runtimepath {{{1
set runtimepath ^=$XDG_CONFIG_HOME/vim
set runtimepath +=$XDG_CONFIG_HOME/vim/after
-" force python3
-if has('python3') | endif
-
" plugins {{{1
-" remove all autocommands
-autocmd!
-
call plug#begin('$XDG_DATA_HOME/vim')
" This does not update vim-plug, use PlugUpgrade instead
Plug 'junegunn/vim-plug'
nnoremap <silent> ,l :SidewaysRight<CR>:delmarks z<CR>
"}}}
Plug 'andrewradev/switch.vim'
-Plug 'bling/vim-airline'
+if !has('nvim')
+ Plug 'bling/vim-airline' "{{{2
+ let g:airline#extensions#whitespace#enabled = 1
+ let g:airline#extensions#tabline#enabled = 1
+ let g:airline#extensions#searchcount#enabled = 0
+ let g:airline_powerline_fonts = 1
+
+ let g:asyncrun_status = "stopped"
+ " let g:airline_section_error = airline#section#create_right(['%{g:asyncrun_status}'])
+ "}}}
+endif
+
Plug 'chrisbra/checkattach'
Plug 'derekwyatt/vim-fswitch'
Plug 'elzr/vim-json'
Plug 'kshenoy/vim-signature'
Plug 'majutsushi/tagbar'
Plug 'octol/vim-cpp-enhanced-highlight'
-Plug 'raimondi/delimitmate'
+if !has('nvim')
+ Plug 'raimondi/delimitmate' " {{{2
+ let delimitMate_expand_cr = 2
+ let g:delimitMate_expand_space = 1
+ "}}}
+end
Plug 'sgeb/vim-diff-fold'
Plug 'skywind3000/asyncrun.vim' " {{{2
command! -bang -nargs=* -complete=file Make AsyncRun -save=2 -program=make @ <args>
Plug 'thinca/vim-qfreplace'
Plug 'tomtom/tcomment_vim'
Plug 'tpope/vim-abolish'
+Plug 'tpope/vim-characterize'
Plug 'tpope/vim-endwise'
Plug 'tpope/vim-eunuch'
Plug 'tpope/vim-fugitive'
Plug 'tpope/vim-repeat'
Plug 'tpope/vim-scriptease'
Plug 'tpope/vim-speeddating'
-Plug 'tpope/vim-surround' "investigate vim-sandwich
+if !has('nvim')
+ Plug 'tpope/vim-surround' "investigate vim-sandwich
+endif
Plug 'tpope/vim-unimpaired'
Plug 'tweekmonster/spellrotate.vim'
-Plug 'valloric/youcompleteme', { 'do': './install.py --clangd-completer --clang-completer' }
+if !has("nvim")
+ " Plug 'valloric/youcompleteme' {{{2
+ Plug 'valloric/youcompleteme',
+ \{ 'do': './install.py --clangd-completer --clang-completer' }
+ let g:ycm_clangd_binary_path = 'clangd' " use clangd in path
+ let g:ycm_clangd_args = ['--clang-tidy']
+ let g:ycm_extra_conf_vim_data = ['getcwd()']
+ let g:ycm_add_preview_to_completeopt = 1
+ let g:ycm_complete_in_comments = 1
+ let g:ycm_complete_in_strings = 1
+ let g:ycm_autoclose_preview_window_after_insertion = 0
+
+ let g:ycm_language_server =
+ \ [
+ \ {
+ \ 'name': 'haskell',
+ \ 'cmdline': [ 'haskell-language-server-wrapper', '--lsp' ],
+ \ 'filetypes': [ 'haskell', 'lhaskell' ]
+ \ },
+ \ ]
+ " }}}
+endif
Plug 'vim-scripts/mediawiki.vim'
Plug 'vim-scripts/replacewithregister'
-Plug 'vim-scripts/yankring.vim'
+if !has('nvim')
+ Plug 'svermeulen/vim-yoink'
+end
Plug 'wincent/loupe'
" colorschemes
let g:gruvbox_contrast_dark = 'hard'
let g:gruvbox_contrast_light = 'soft'
-Plug 'arcticicestudio/nord-vim' " {{{2
-let g:nord_bold = 1
-let g:nord_italic = 1
-let g:nord_italic_comments = 1
-let g:nord_underline = 1
-let g:nord_uniform_status_lines = 0
-let g:nord_uniform_diff_background = 0
-let g:nord_cursor_line_number_background = 0
-let g:nord_bold_vertical_split_line = 0
+if !has('nvim')
+ Plug 'arcticicestudio/nord-vim' " {{{2
+ let g:nord_bold = 1
+ let g:nord_italic = 1
+ let g:nord_italic_comments = 1
+ let g:nord_underline = 1
+ let g:nord_uniform_status_lines = 0
+ let g:nord_uniform_diff_background = 0
+ let g:nord_cursor_line_number_background = 0
+ let g:nord_bold_vertical_split_line = 0
+endif
"}}}
-" snippets
-Plug 'sirver/ultisnips'
-Plug 'honza/vim-snippets'
+if !has("nvim")
+ Plug 'sirver/ultisnips' " {{{
+ Plug 'honza/vim-snippets'
+
+ let g:UltiSnipsEditSplit = 'vertical'
+ let g:UltiSnipsSnippetDirectories = [ expand("$XDG_CONFIG_HOME/vim/ultisnips") ]
+ if has('fname_case')
+ let g:UltiSnipsSnippetDirectories = ["UltiSnips", "ultisnips"]
+ endif
+ let g:UltiSnipsExpandTrigger = "<tab>"
+ let g:UltiSnipsJumpForwardTrigger = "<tab>"
+ let g:UltiSnipsJumpBackwardTrigger = "<s-tab>"
+
+ " UltiSnips completion function that tries to expand a snippet. If there's no
+ " snippet for expanding, it checks for completion window and if it's shown,
+ " selects first element. If there's no completion window it tries to jump to
+ " next placeholder. If there's no placeholder it just returns TAB key
+ " https://github.com/Valloric/YouCompleteMe/issues/36#issuecomment-15451411
+ function! g:UltiSnips_Complete()
+ call UltiSnips#ExpandSnippet()
+ if g:ulti_expand_res == 0
+ if pumvisible()
+ return "\<C-n>"
+ else
+ call UltiSnips#JumpForwards()
+ if g:ulti_jump_forwards_res == 0
+ return "\<TAB>"
+ endif
+ endif
+ endif
+ return ""
+ endfunction
+ au InsertEnter * exec "inoremap <silent> " . g:UltiSnipsExpandTrigger . " <C-R>=g:UltiSnips_Complete()<cr>"
+ let g:UltiSnipsListSnippets="<c-e>"
+"}}}
+endif
" text objects
Plug 'kana/vim-textobj-user'
" staging
" Check LucHermites plugins: https://github.com/LucHermitte/lh-cpp
+Plug 'imsnif/kdl.vim'
+
+Plug 'puremourning/vimspector'
+Plug 'ilyachur/cmake4vim'
+Plug 'ilyachur/gtest-vim'
Plug 'git@github.com:/ram-z/vim-orgmode', { 'branch': 'dev' } " {{{2
Plug 'vim-scripts/syntaxrange'
let g:scratch_autohide = 0
"}}}
-Plug 'vim-utils/vim-man' " {{{2
-let g:man_width = 80
+let g:man_hardwrap = 80
+if !has('nvim')
+ Plug 'vim-utils/vim-man' " {{{2
+ let g:man_width = 80
"}}}
+endif
+Plug 'jenterkin/vim-autosource' " {{{2
+ let g:autosource_hashdir = $XDG_CACHE_HOME . '/vim/vim-autosource'
+ let g:autosource_conf_names = ['.vimrc', '.vimrc.lua']
+"}}}
call plug#end()
filetype plugin indent on
+syntax on
" colorscheme {{{1
-syntax on
set background=dark
let &t_8f = "\<Esc>[38;2;%lu;%lu;%lum"
let &t_8b = "\<Esc>[48;2;%lu;%lu;%lum"
set termguicolors
-colorscheme $THEME
+if !has('nvim')
+ colorscheme $THEME
+endif
"TODO see how I can integrate this into a theme that customises upstream Nord
hi debugPC term=reverse ctermbg=8
set showbreak=↪ " show these chars for wrapped lines
set breakindent " preserve indentation in wrapped text
-set lazyredraw " don't redraw while executing macros
-
set list " show chars defined in 'listchars'
set listchars=tab:❭\ " list of strings used for list mode
set listchars+=extends:❯,precedes:❮
+set listchars+=nbsp:␣
" Only shown when not in insert mode
set listchars+=trail:·
augroup trailing
set scrolloff=5 " number of screen lines to show around the cursor
set sidescroll=1 " number of collumns to scroll
set sidescrolloff=1 " don't scroll over the listchars
+set display+=lastline " display as much as possible of last line
set fillchars=diff:⣿,vert:│
" using the mouse {{{2
set mouse=rnv " list of flags for using the mouse
-set ttymouse=xterm " type of mouse
+if !has('nvim')
+ set ttymouse=xterm " type of mouse
+endif
" messages and info {{{2
set showcmd " Show (partial) command in status line.
set shortmess+=W " don't give 'written' or '[w]' when writing a file
set shortmess+=A " ignore swapfile warning
set shortmess+=I " no splash screen
+set shortmess+=c " don't give |ins-completion-menu| messages
" editing text {{{2
set backspace=indent,eol,start " allow backspacing over everything in insert mode
set formatoptions+=t " Auto-wrap text using textwidth
set formatoptions-=o " Do not insert comment leader after hitting o or O in normal mode
-set nrformats=hex " number formats recognized for CTRL-A and CTRL-X commands
+set nrformats-=octal " don't inc/dec octal numbers with ^[AX]
+set nrformats+=unsigned " treat all numbers as unsigned
set complete=. " scan the current buffer ( 'wrapscan' is ignored)
set complete+=w " scan buffers from other windows
set backupskip+=/dev/shm/pass* " skip passwordstore files
set undofile " persistent undo history
-set undodir=$XDG_CACHE_HOME/vim/undo//
+set undolevels=10000 " moar undos
+if !has('nvim')
+ set undodir=$XDG_CACHE_HOME/vim/undo//
+endif
augroup undoskip
au!
" running make and jumping to errors {{{2
set makeprg=make\ -w " print changing directories
+set grepformat=%f:%l:%c:%m
set grepprg=ag\ --vimgrep\ $*
" language specific {{{2
" various {{{2
set virtualedit+=block " let cursor move past last char in <C-V> mode
set virtualedit+=onemore " allow the cursor to move just past the end of the line
-set viminfo='100,<50,s10,h,n$XDG_CACHE_HOME/vim/viminfo " viminfo defaults but save file in .cache
+if !has('nvim')
+ " viminfo defaults but save file in .cache
+ set viminfo='100,<50,s10,h,n$XDG_CACHE_HOME/vim/viminfo
+else
+ " shada is the replacement format for viminfo
+ " this setting is probably not needed as it's most likely the default
+ " the default path is in XDG_DATA_HOME, which is fine
+ set shada='100,<50,s10,h
+endif
set viewdir=$XDG_CACHE_HOME/vim/view//
" autocmds {{{1
" Resize splits when the window is resized {{{2
-augroup resize
+augroup resize_splits
au!
- autocmd VimResized * :wincmd =
+ autocmd VimResized * :tabdo wincmd =
augroup END
" Only show cursorline in the current window and in normal mode {{{2
augroup END
" Jump to last known cursor position {{{2
-augroup cursor_pos
+augroup last_loc
au!
" blacklist certain filetype
let blacklist = ['gitcommit']
command! NoAutoChecktime let b:autochecktime=0
command! ToggleAutoChecktime let b:autochecktime=!get(b:, 'autochecktime', 0) | echom "b:autochecktime:" b:autochecktime
-augroup terminal
- au!
- au TerminalOpen * if &buftype == 'terminal' | setlocal bufhidden=hide | endif
-augroup END
-
" bindings {{{1
-" allow both <space> and \ to be <leader>
-map <space> <leader>
-
" make
function! MakeWithOpt()
" TODO only do this if makeprg matches make
nmap <silent> <leader>qq :echo "hi<" . synIDattr(synID(line("."),col("."),1),"name") . '> trans<' . synIDattr(synID(line("."),col("."),0),"name") . "> lo<" . synIDattr(synIDtrans(synID(line("."),col("."),1)),"name") . ">"<CR>
" plugins options {{{1
-" airline {{{2
-let g:airline#extensions#whitespace#enabled = 1
-let g:airline#extensions#tabline#enabled = 1
-let g:airline#extensions#searchcount#enabled = 0
-let g:airline_powerline_fonts = 1
-
-let g:asyncrun_status = "stopped"
-let g:airline_section_error = airline#section#create_right(['%{g:asyncrun_status}'])
-
" checkattach {{{2
let g:checkattach_filebrowser = 'ranger'
let g:checkattach_once = 'y'
-" delimitmate {{{2
-let delimitMate_expand_cr = 2
-let g:delimitMate_expand_space = 1
+" close-another-window {{{2
+nnoremap <silent> <C-W>c <NOP>
+nnoremap <silent> <C-W>cc <C-W>c
+nnoremap <silent> <C-W>ch :CloseLeftWindow<CR>
+nnoremap <silent> <C-W>cl :CloseRightWindow<CR>
+nnoremap <silent> <C-W>cj :CloseBelowWindow<CR>
+nnoremap <silent> <C-W>ck :CloseAboveWindow<CR>
+
" fswitch {{{2
nnoremap <silent> <Leader>ff :FSHere<CR>
autocmd BufReadPost fugitive://* set bufhidden=delete
function! GitToggle()
- if buflisted(bufname('.git/index'))
- bdelete .git/index
+ let l:status_buffer = bufname('^fugitive:///*/.git{/worktrees/*,}//$')
+ if buflisted(l:status_buffer)
+ execute 'bdelete '.l:status_buffer
else
- Git
- 16wincmd_
+ execute 'Git'
+ if !empty(FugitiveGitDir())
+ " only resize status if Git was sucessful
+ 16wincmd_
+ endif
endif
endfunction
command! GitToggle :call GitToggle()
nmap <silent> [og <Plug>IndentGuidesEnable
nmap <silent> ]og <Plug>IndentGuidesDisable
-" close-another-window {{{2
-nnoremap <silent> <C-W>c <NOP>
-nnoremap <silent> <C-W>cc <C-W>c
-nnoremap <silent> <C-W>ch :CloseLeftWindow<CR>
-nnoremap <silent> <C-W>cl :CloseRightWindow<CR>
-nnoremap <silent> <C-W>cj :CloseBelowWindow<CR>
-nnoremap <silent> <C-W>ck :CloseAboveWindow<CR>
-
" python-mode {{{2
let g:pymode_rope_completion = 0
" switch
let g:switch_mapping = "<Leader>s"
+let g:switch_custom_definitions = [
+ \ ['yes', 'no']
+ \ ]
" spellrotate
nmap <silent> z] <Plug>(SpellRotateForward)
let g:tcomment#filetype#guess = 0
"let g:tcomment#options = {'whitespace' : 'no'}
-" ultisnips {{{2
-let g:UltiSnipsEditSplit = 'vertical'
-let g:UltiSnipsSnippetDirectories = [ expand("$XDG_CONFIG_HOME/vim/ultisnips") ]
-if has('fname_case')
- let g:UltiSnipsSnippetDirectories = ["UltiSnips", "ultisnips"]
-endif
-let g:UltiSnipsExpandTrigger = "<tab>"
-let g:UltiSnipsJumpForwardTrigger = "<tab>"
-let g:UltiSnipsJumpBackwardTrigger = "<s-tab>"
-
-" UltiSnips completion function that tries to expand a snippet. If there's no
-" snippet for expanding, it checks for completion window and if it's shown,
-" selects first element. If there's no completion window it tries to jump to
-" next placeholder. If there's no placeholder it just returns TAB key
-" https://github.com/Valloric/YouCompleteMe/issues/36#issuecomment-15451411
-function! g:UltiSnips_Complete()
- call UltiSnips#ExpandSnippet()
- if g:ulti_expand_res == 0
- if pumvisible()
- return "\<C-n>"
- else
- call UltiSnips#JumpForwards()
- if g:ulti_jump_forwards_res == 0
- return "\<TAB>"
- endif
- endif
- endif
- return ""
-endfunction
-au InsertEnter * exec "inoremap <silent> " . g:UltiSnipsExpandTrigger . " <C-R>=g:UltiSnips_Complete()<cr>"
-let g:UltiSnipsListSnippets="<c-e>"
-
" unite {{{2
call unite#filters#matcher_default#use(['matcher_fuzzy'])
call unite#custom#profile('default', 'context', {
let g:unite_source_history_yank_enable = 1
nnoremap <silent> [unite]p :<C-u>Unite history/yank<CR>
-" yankring {{{2
-nnoremap <silent> <leader>p :YRShow<cr>
-let g:yankring_history_dir = expand('$XDG_CACHE_HOME/vim')
-let g:yankring_replace_n_pkey = ''
-let g:yankring_replace_n_nkey = ''
-
-" map Y to y$ for the yank ring
-function! YRRunAfterMaps()
- nnoremap Y :<C-U>YRYankCount 'y$'<CR>
-endfunction
-
-" youcompleteme {{{2
-let g:ycm_clangd_binary_path = 'clangd' " use clangd in path
-let g:ycm_clangd_args = ['--clang-tidy']
-let g:ycm_extra_conf_vim_data = ['getcwd()']
-let g:ycm_add_preview_to_completeopt = 1
-let g:ycm_complete_in_comments = 1
-let g:ycm_complete_in_strings = 1
-let g:ycm_autoclose_preview_window_after_insertion = 0
-
-let g:ycm_language_server =
- \ [
- \ {
- \ 'name': 'haskell',
- \ 'cmdline': [ 'haskell-language-server-wrapper', '--lsp' ],
- \ 'filetypes': [ 'haskell', 'lhaskell' ]
- \ },
- \ ]
-
" vim-easy-align {{{2
" start interactive EasyAlign in visual mode
-vmap <Enter> <Plug>(EasyAlign)
-nmap ga <Plug>(EasyAlign)
+vmap <Enter> <Esc>:echohl WarningMsg \| echo "EasyAlign mapped to \16<leader>a now" \| echohl None<CR>
+vmap <leader>a <Plug>(EasyAlign)
+nmap <leader>a <Plug>(EasyAlign)
" vim-gtest {{{2
let g:gtest#highlight_failing_tests = 0
endfunction
nnoremap <silent> coS :call SwitchSpell()<CR>
-" fix spelling with first choice
-nnoremap <Leader>f 1z=
" gitdir or home {{{2
" from derek wyatt:
repos / dotfiles.git / blobdiff