X-Git-Url: https://git.rmz.io/dotfiles.git/blobdiff_plain/22a362a0e4ef1f84641e3cae2c0933b75729def9..e3bc42d5aa2868d51a8024aec1ecce46ea2fb8f2:/vim/vimrc diff --git a/vim/vimrc b/vim/vimrc index f9f891c..9fd4ae5 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -1,77 +1,222 @@ -" My vimrc. -" -" Author: Samir Benmendil -" +" force python3 +if has('python3') | endif -" plugins {{{1 -filetype off -set runtimepath& " reset rtp -" remove all autocommands -autocmd! - -set runtimepath+=$XDG_DATA_HOME/vim/vundle -call vundle#rc('$XDG_DATA_HOME/vim') - -Plugin 'gmarik/vundle' - -Plugin 'airblade/vim-gitgutter' -Plugin 'bling/vim-airline' -Plugin 'derekwyatt/vim-fswitch' -Plugin 'elzr/vim-json' -Plugin 'firef0x/pkgbuild.vim' -Plugin 'junegunn/vim-easy-align' -Plugin 'kien/ctrlp.vim' -" Plugin 'klen/python-mode' -Plugin 'wilywampa/python-mode' -Plugin 'kshenoy/vim-signature' -Plugin 'majutsushi/tagbar' -Plugin 'raimondi/delimitmate' -Plugin 'rking/ag.vim' -Plugin 'scrooloose/nerdtree' -Plugin 'scrooloose/syntastic' -Plugin 'sjl/gundo.vim' -Plugin 'tomtom/tcomment_vim' -Plugin 'tpope/vim-endwise' -Plugin 'tpope/vim-fugitive' -Plugin 'tpope/vim-repeat' -Plugin 'tpope/vim-surround' -Plugin 'tpope/vim-unimpaired' -Plugin 'valloric/youcompleteme' -Plugin 'vim-scripts/yankring.vim' - -" snippets -Plugin 'sirver/ultisnips' -Plugin 'honza/vim-snippets' - -" ros -Plugin 'ompugao/ros.vim' -Plugin 'ompugao/ctrlp-ros' - -" seems to have problems right now... may be add later? -" Plugin 'jalcine/cmake.vim' -" Plugin 'powerman/vim-plugin-viewdoc' - -" find an alternative -Plugin 'http://git.code.sf.net/p/vim-latex/vim-latex' -" Plugin 'lokaltog/vim-easymotion' -Plugin 'justinmk/vim-sneak' -Plugin 'chrisbra/checkattach' -Plugin 'nathanaelkane/vim-indent-guides' - -" remove entries first -set runtimepath -=$HOME/.vim -set runtimepath -=$HOME/.vim/after -set runtimepath -=$XDG_CONFIG_HOME/vim -set runtimepath -=$XDG_CONFIG_HOME/vim/after -" then prepend and append them +" space is leader +let g:mapleader = " " + +" runtimepath {{{1 set runtimepath ^=$XDG_CONFIG_HOME/vim set runtimepath +=$XDG_CONFIG_HOME/vim/after +" plugins {{{1 +call plug#begin('$XDG_DATA_HOME/vim') +" This does not update vim-plug, use PlugUpgrade instead +Plug 'junegunn/vim-plug' + +Plug 'airblade/vim-gitgutter' " {{{ +" prefer other signs such as ycm diags +let g:gitgutter_sign_priority = 1 +" don't clobber other signs +let g:gitgutter_sign_allow_clobber = 0 +"}}} +Plug 'alepez/vim-gtest' +Plug 'alx741/vinfo' +Plug 'andrewradev/sideways.vim' " {{{2 +nnoremap ,h :SidewaysLeft:delmarks z +nnoremap ,l :SidewaysRight:delmarks z +"}}} +Plug 'andrewradev/switch.vim' +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 'firef0x/pkgbuild.vim' +Plug 'junegunn/vim-easy-align' +Plug 'justinmk/vim-sneak' +Plug 'klen/python-mode' +Plug 'kshenoy/vim-signature' +Plug 'majutsushi/tagbar' +Plug 'octol/vim-cpp-enhanced-highlight' +Plug 'raimondi/delimitmate' +Plug 'sgeb/vim-diff-fold' +Plug 'skywind3000/asyncrun.vim' " {{{2 +command! -bang -nargs=* -complete=file Make AsyncRun -save=2 -program=make @ +let g:asyncrun_open = 10 +"}}} +Plug 'shougo/unite.vim' +Plug 'shougo/vimproc.vim', {'do': 'make'} +Plug 'sjl/gundo.vim' +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 +Plug 'tpope/vim-unimpaired' +Plug 'tweekmonster/spellrotate.vim' +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' +Plug 'wincent/loupe' + +" colorschemes +Plug 'morhetz/gruvbox' " {{{2 +let g:gruvbox_contrast_dark = 'hard' +let g:gruvbox_contrast_light = 'soft' + +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 + +"}}} + +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 = "" + let g:UltiSnipsJumpForwardTrigger = "" + let g:UltiSnipsJumpBackwardTrigger = "" + + " 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 "\" + else + call UltiSnips#JumpForwards() + if g:ulti_jump_forwards_res == 0 + return "\" + endif + endif + endif + return "" + endfunction + au InsertEnter * exec "inoremap " . g:UltiSnipsExpandTrigger . " =g:UltiSnips_Complete()" + let g:UltiSnipsListSnippets="" +"}}} +endif + +" text objects +Plug 'kana/vim-textobj-user' +Plug 'julian/vim-textobj-variable-segment' +Plug 'sgur/vim-textobj-parameter' +Plug 'kana/vim-operator-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:org_agenda_files = ['~/org/*.org'] + +Plug 'neovimhaskell/haskell-vim' " {{{2 +let g:haskell_enable_quantification = 1 " to enable highlighting of `forall` +let g:haskell_enable_recursivedo = 1 " to enable highlighting of `mdo` and `rec` +let g:haskell_enable_arrowsyntax = 1 " to enable highlighting of `proc` +let g:haskell_enable_pattern_synonyms = 1 " to enable highlighting of `pattern` +let g:haskell_enable_typeroles = 1 " to enable highlighting of type roles +let g:haskell_enable_static_pointers = 1 " to enable highlighting of `static` +let g:haskell_backpack = 1 " to enable highlighting of backpack keywords + +let g:haskell_indent_before_where = 2 +" }}} + +Plug 'aklt/plantuml-syntax' + +Plug 'mtth/scratch.vim' " {{{2 + let g:scratch_no_mappings = 1 + let g:scratch_autohide = 0 +"}}} + +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 -colorscheme badwolf +set background=dark +let &t_8f = "\[38;2;%lu;%lu;%lum" +let &t_8b = "\[48;2;%lu;%lu;%lum" +set termguicolors +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 " options {{{1 " moving around, searching and patterns {{{2 @@ -81,28 +226,36 @@ set smartcase " override 'ignorecase' when pattern has upper case char set hlsearch " highlight all matches for the last used search pattern set nostartofline " don't move the cursor to the first non-blank char of a line -set path=.,include/,../include/,/usr/include/c++/*,/opt/ros/hydro/include +set path+=. +set path+=include/ +set path+=../include/ +set path+=/usr/include/c++/* " displaying text {{{2 -set scrolloff=5 " number of screen lines to show around the cursor set nowrap " long lines wrap set linebreak " wrap long lines at a character in 'breakat' 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=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 au! - au InsertEnter * :set listchars-=trail:· - au InsertLeave * :set listchars+=trail:· + au FileType qf setlocal listchars-=trail:· + au InsertEnter * set listchars-=trail:· + au InsertLeave * set listchars+=trail:· augroup END +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:│ @@ -131,13 +284,24 @@ set ttyfast " 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 ruler " show the cursor position all the time -set confirm " Ask what to do when closing unsaved documents -set shortmess=filnxtoOI " don't show intro message +set showcmd " Show (partial) command in status line. +set ruler " show the cursor position all the time +set confirm " Ask what to do when closing unsaved documents +set shortmess= " reset option +set shortmess+=a " all abbreviations +set shortmess+=o " overwrite file-written message +set shortmess+=O " file-read message overrides previous +set shortmess+=t " truncate file message at start +set shortmess+=T " truncate other messages in the middle +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 @@ -145,11 +309,26 @@ set backspace=indent,eol,start " allow backspacing over everything in insert mo set showmatch " Show matching brackets. set nojoinspaces " don't use two spaces after '.' when joining a line -set formatoptions=jcrnql - -set nrformats=hex " number formats recognized for CTRL-A and CTRL-X commands +set formatoptions+=j " Delete comment leader when joining lines +set formatoptions+=c " Autowrap comments using textwidth +set formatoptions+=r " Insert comment leader after hitting +set formatoptions+=n " Recognize numbered lists +set formatoptions+=q " Allow formatting of comments with "gq". +set formatoptions+=l " do not wrap lines that have been longer when starting insert mode already +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-=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 complete+=b " scan other loaded buffers that are in the buffer list +set complete+=u " scan the unloaded buffers that are in the buffer list +set complete+=t " scan tags +set complete+=i " scan current and included files +set complete+=kspell " use the currently active spell checking |spell| -set complete=.,w,b,u,t " whether to use a popup menu for Insert mode completion set completeopt=longest,menuone,preview @@ -167,11 +346,18 @@ set pastetoggle= " key sequence to toggle paste mode set foldmethod=marker " folding type set foldlevelstart=0 " value for 'foldlevel' when starting to edit a file -" save and restore folds -set viewoptions=folds,cursor " don't save local options +" open folds when jumping to line +set foldopen+=jump + +set viewoptions=cursor " save cursor position +set viewoptions+=folds " save folds " diff mode {{{2 -set diffopt=filler,vertical +set diffopt+=filler " show filler lines +set diffopt+=vertical " always vertical split +set diffopt+=context:10 " 10 lines context between changes +set diffopt+=internal +set diffopt+=algorithm:patience " reading and writing files {{{2 set modeline " read modelines @@ -185,7 +371,10 @@ set backupskip+=.netrc " skip netrc 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! @@ -205,6 +394,7 @@ set directory=$XDG_CACHE_HOME/vim/swap// set history=5000 " how many command lines are remembered set wildmenu " command-line completion shows a list of matches set wildmode=longest:full,full " specifies how command line completion works +set wildignorecase " ignore case when completing file names set wildignore+=.hg,.git,.svn " Version control set wildignore+=*.aux,*.out,*.toc " LaTeX intermediate files @@ -216,17 +406,37 @@ set wildignore+=*.luac " Lua byte code set wildignore+=*.pyc " Python byte code set wildignore+=*.orig " Merge resolution files +" 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 +set isfname-== " don't treat `=` as being part of filenames + " various {{{2 -set virtualedit=block " let cursor move past last char in mode -set viminfo='100,<50,s10,h,n$XDG_CACHE_HOME/vim/viminfo " viminfo defaults but save file in .cache +set virtualedit+=block " let cursor move past last char in mode +set virtualedit+=onemore " allow the cursor to move just past the end of the line +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// +set sessionoptions+=unix,slash " damn windows and it's silly ways + " 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 @@ -243,7 +453,7 @@ augroup ft_stdin augroup END " Jump to last known cursor position {{{2 -augroup cursor_pos +augroup last_loc au! " blacklist certain filetype let blacklist = ['gitcommit'] @@ -253,14 +463,46 @@ augroup cursor_pos \ endif augroup END -" bindings {{{1 +" Check for file modifications automatically {{{2 +" (current buffer only) +" Use :NoAutoChecktime to disable it (uses b:autochecktime) +fun! MyAutoCheckTime() + " only check timestamp for normal files + if &buftype != '' | return | endif + if ! exists('b:autochecktime') || b:autochecktime + checktime % + let b:autochecktime = 1 + endif +endfun +augroup MyAutoChecktime + au! + au FocusGained,BufEnter,CursorHold,InsertEnter * call MyAutoCheckTime() +augroup END +command! NoAutoChecktime let b:autochecktime=0 +command! ToggleAutoChecktime let b:autochecktime=!get(b:, 'autochecktime', 0) | echom "b:autochecktime:" b:autochecktime -" allow both and / to be -map +" bindings {{{1 " make -nnoremap r :make -nnoremap :make +function! MakeWithOpt() + " TODO only do this if makeprg matches make + " if &makeprg =~ "make" + let l:make_dir = "" + if exists("b:make_dir") + let l:make_dir = "-C ".b:make_dir + elseif exists("t:make_dir") + let l:make_dir = "-C ".t:make_dir + elseif exists("g:make_dir") + let l:make_dir = "-C ".g:make_dir + endif + + let l:make_targets = "" + if exists("g:make_targets") + let l:make_targets = g:make_targets + endif + execute "Make ".l:make_dir." ".l:make_targets +endf +nnoremap r :call MakeWithOpt() " unhighlight search nnoremap / :silent nohl @@ -274,8 +516,21 @@ nnoremap p* :silent! set paste"*p:set nopaste " paste from clipboard nnoremap p+ :silent! set paste"+p:set nopaste -" Clean trailing whitespace -nnoremap ww m':%s/\s\+$//:let @/=''``zz +" strip trailing whitespace +function! StripWhitespace(line1, line2, ...) " {{{2 + let s_report = &report + let &report=0 + let pattern = a:0 ? a:1 : '\s\+$' + let oldview = winsaveview() + exe 'keepjumps keeppatterns '.a:line1.','.a:line2.'substitute/'.pattern.'//e' + if oldview != winsaveview() + redraw + endif + call winrestview(oldview) + let &report = s_report +endfunction " }}}2 +command! -range=% -nargs=0 -bar Untrail keepjumps call StripWhitespace(,) +nnoremap ww :Untrail " Source vnoremap S y:execute @@:echo 'Sourced selection.' @@ -288,7 +543,11 @@ noremap ' ` nnoremap vv ^vg_ " Unfuck my screen -nnoremap U :syntax sync fromstart:AirlineRefresh:redraw! +nnoremap U + \ :syntax sync fromstart + \ :AirlineRefresh + \ :call popup_clear(1) + \ :redraw! " Ranger " nnoremap r :silent !ranger %:h:redraw! @@ -310,6 +569,7 @@ nnoremap N Nzzzv nnoremap g; g;zzzv nnoremap g, g,zzzv nnoremap zzzv +nnoremap zzzv " Not using the default mappings of 'To line from top/bottom' noremap H ^ @@ -318,14 +578,14 @@ vnoremap H ^ vnoremap L g_ " Heresy, emacs insert bindings -inoremap I -inoremap A -cnoremap -cnoremap +inoremap I +inoremap A +cnoremap +cnoremap " proper movement when lines are wrapped -noremap j (v:count == 0 ? 'gj' : 'j') -noremap k (v:count == 0 ? 'gk' : 'k') +noremap j (v:count == 0 ? 'gj' : 'j') +noremap k (v:count == 0 ? 'gk' : 'k') " disable arrows noremap @@ -348,20 +608,22 @@ cnoremap " close all folds open fold in cursor nnoremap zx zMzxzt -" edit vimrc in new tab -nmap ev :tabedit $MYVIMRC:lcd %:p:h - map :ls:b -nnoremap w -nnoremap W +" move between windows (skip previewwindow) +nnoremap w:if &previewwindow \| wincmd w \| endif +nnoremap W:if &previewwindow \| wincmd W \| endif +tnoremap w:if &previewwindow \| wincmd w \| endif +tnoremap W:if &previewwindow \| wincmd W \| endif "xterm mouse with middleclick paste nnoremap i vnoremap s " fix legacy vi inconsistency -map Y y$ +nnoremap Y y$ +" copy to clipboard +xnoremap Y "+y " allow repeat operator on visual vnoremap . :normal . @@ -376,40 +638,46 @@ map Q gq " break undo sequence before removing word inoremap u -nmap b :set expandtab tabstop=4 shiftwidth=4 softtabstop=4 -nmap B :set expandtab tabstop=8 shiftwidth=8 softtabstop=4 -nmap M :set noexpandtab tabstop=8 softtabstop=4 shiftwidth=4 -nmap m :set expandtab tabstop=2 shiftwidth=2 softtabstop=2 +nnoremap coe :set =&expandtab ? 'noexpandtab' : 'expandtab' +nnoremap [oe :set expandtab +nnoremap ]oe :set noexpandtab + +for idt in range(1,8) + exe 'nnoremap co'.idt.' :setlocal tabstop='.idt.' shiftwidth='.idt.' softtabstop='.idt.'' +endfor + +" toggle auto format of text +nnoremap coa :set =&formatoptions =~ "a" ? 'formatoptions-=a' : 'formatoptions+=a' +nnoremap [oa :set formatoptions+=a +nnoremap ]oa :set formatoptions-=a " space will toggle current fold in normal mode nnoremap za " create folds around visual selection vnoremap zf -autocmd BufWinLeave *.* mkview -autocmd BufWinEnter *.* silent loadview - " save with sudo -cnoremap w!! w !sudo tee % > /dev/null +cabbrev w!! SudoWrite " uppercase previous word inoremap gUiwgi -" plugins options {{{1 -" ag {{{2 -let g:AgSmartCase = 1 -nnoremap ag yiw:Ag " -vnoremap ag y:Ag " - -" airline {{{2 -let g:airline#extensions#whitespace#enabled = 1 -let g:airline#extensions#tabline#enabled = 1 -let g:airline_powerline_fonts = 1 +" http://git.io/v3ZeU +nmap qq :echo "hi<" . synIDattr(synID(line("."),col("."),1),"name") . '> trans<' . synIDattr(synID(line("."),col("."),0),"name") . "> lo<" . synIDattr(synIDtrans(synID(line("."),col("."),1)),"name") . ">" +" plugins options {{{1 " checkattach {{{2 let g:checkattach_filebrowser = 'ranger' let g:checkattach_once = 'y' +" close-another-window {{{2 +nnoremap c +nnoremap cc c +nnoremap ch :CloseLeftWindow +nnoremap cl :CloseRightWindow +nnoremap cj :CloseBelowWindow +nnoremap ck :CloseAboveWindow + " delimitmate {{{2 let delimitMate_expand_cr = 2 let g:delimitMate_expand_space = 1 @@ -418,22 +686,54 @@ let g:delimitMate_expand_space = 1 nnoremap ff :FSHere nnoremap fl :FSRight nnoremap fh :FSLeft +nnoremap fj :FSBelow +nnoremap fk :FSAbove nnoremap fL :FSSplitRight nnoremap fH :FSSplitLeft +nnoremap fJ :FSSplitBelow +nnoremap fK :FSSplitAbove " fugitive {{{2 nmap dd :tab split \| Gdiff \| wincmd h " delete fugitive buffers when closed autocmd BufReadPost fugitive://* set bufhidden=delete -nnoremap gs :Gstatus -nnoremap gd :Gdiff -nnoremap gc :tab Gcommit -v +function! GitToggle() + let l:status_buffer = bufname('^fugitive:///*/.git{/worktrees/*,}//$') + if buflisted(l:status_buffer) + execute 'bdelete '.l:status_buffer + else + Git + 16wincmd_ + endif +endfunction +command! GitToggle :call GitToggle() +command! GToggle GitToggle +nnoremap gs :GitToggle + +nnoremap gd :Gdiffsplit +nnoremap gc :echohl WarningMsg \| echo "use \gcc instead" \| echohl None +nnoremap gcc :tab G commit -v +nnoremap gca :tab G commit -v --amend +nnoremap gcf :tab G commit -v --fixup= +nnoremap gp :echohl WarningMsg \| echo "use \gpp instead" \| echohl None +nnoremap gpp :Git push \| copen +nnoremap gpf :Git push --force-with-lease \| copen +nnoremap gll :Git pull +nnoremap gru :Git rebase --interactive @{upstream} +nnoremap grp :Git rebase --interactive @{push} nnoremap ga :Gwrite -nnoremap gb :Gblame +nnoremap gb :G blame + +augroup fugitive_gstatus + au! + autocmd User FugitiveIndex setlocal winfixheight + autocmd User FugitiveIndex nmap = +augroup end " Gundo {{{2 nnoremap :GundoToggle +let g:gundo_prefer_python3 = 1 " indent-guides {{{2 let g:indent_guides_default_mapping = 0 @@ -442,23 +742,38 @@ nmap cog IndentGuidesToggle nmap [og IndentGuidesEnable nmap ]og IndentGuidesDisable -" NERDTree {{{2 -" open/close NERDTree with \e -nmap e :NERDTreeToggle -nmap :NERDTreeToggle -" to open files/dirs -let NERDTreeMapActivateNode='l' -" close vim if only NERDTree is open -autocmd bufenter * if (winnr("$") == 1 && exists("b:NERDTreeType") && b:NERDTreeType == "primary") | q | endif - " python-mode {{{2 let g:pymode_rope_completion = 0 let g:pymode_rope = 0 +let g:pymode_run = 0 let g:pymode_folding = 1 let g:pymode_lint_ignore = "E221,E266,E501" +let g:pymode_lint_cwindow = 0 " don't open cwindow when linting let g:pymode_syntax_space_errors = 0 " don't bother me when I'm typing +" signature {{{2 +" disable '[ mappings + +let g:SignatureMap = { + \ 'GotoNextLineAlpha' : "", + \ 'GotoPrevLineAlpha' : "", + \ 'GotoNextSpotAlpha' : "", + \ 'GotoPrevSpotAlpha' : "", + \ } + +" switch +let g:switch_mapping = "s" +let g:switch_custom_definitions = [ + \ ['yes', 'no'] + \ ] + +" spellrotate +nmap z] (SpellRotateForward) +nmap z[ (SpellRotateBackward) +vmap z] (SpellRotateForwardV) +vmap z[ (SpellRotateBackwardV) + " synastic {{{2 let g:syntastic_enable_highlighting = 0 let g:syntastic_error_symbol='E' @@ -468,6 +783,8 @@ let g:syntastic_style_warning_symbol='S' let g:syntastic_always_populate_loc_list=1 nmap y :SyntasticCheck +let g:syntastic_cpp_clang_tidy_post_args = "-p build*" + if ! &diff let g:syntastic_check_on_open=1 endif @@ -480,35 +797,65 @@ let g:tagbar_autoshowtag = 1 let g:tagbar_width = 25 let g:tagbar_iconchars = ['+', '-'] -" UltiSnips {{{2 -let g:UltiSnipsEditSplit = 'vertical' -let g:UltiSnipsSnippetsDir = expand("$XDG_CONFIG_HOME/vim/ultisnips") -let g:UltiSnipsSnippetDirectories = ["UltiSnips", "ultisnips"] -let g:UltiSnipsExpandTrigger = "" -let g:UltiSnipsJumpForwardTrigger = "" -let g:UltiSnipsJumpBackwardTrigger = "" - -" 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 "\" - else - call UltiSnips#JumpForwards() - if g:ulti_jump_forwards_res == 0 - return "\" - endif - endif - endif - return "" -endfunction -au InsertEnter * exec "inoremap " . g:UltiSnipsExpandTrigger . " =g:UltiSnips_Complete()" -let g:UltiSnipsListSnippets="" +" tcomments {{{2 +let g:tcomment_textobject_inlinecomment = 'gic' +let g:tcomment#filetype#guess = 0 +"let g:tcomment#options = {'whitespace' : 'no'} + +" unite {{{2 +call unite#filters#matcher_default#use(['matcher_fuzzy']) +call unite#custom#profile('default', 'context', { + \ 'winheight': 20, + \ 'direction': 'botright' + \ }) + +nnoremap [unite] +nmap u [unite] +nnoremap [unite]u :UniteResume +nnoremap [u :UnitePrevious +nnoremap ]u :UniteNext + +" unite-grep {{{3 +" seems not respected +let g:unite_source_grep_max_candidates = 2000 +if executable('ag') + " Use ag in unite grep source. + let g:unite_source_grep_command = 'ag' + let g:unite_source_grep_default_opts = '--smart-case --vimgrep --ignore ''.hg'' --ignore ''.svn'' --ignore ''.git'' --ignore ''.bzr''' + let g:unite_source_grep_recursive_opt = '' +end +nnoremap [unite]a :Unite grep:.:: +nnoremap [unite]A :Unite grep:.:-w: +command! -nargs=+ Ag Unite grep:.:: + +" unite-file_rec {{{3 +if executable('ag') + " Use ag in unite rec source + let g:unite_source_rec_async_command = ['ag', '--follow', '--nocolor', '--nogroup', '-g', ''] +end +nnoremap [unite]f :Unite -start-insert file_rec/async +call unite#custom#source('file_rec/async', 'sorters', 'sorter_selecta') + +" unite-buffer {{{3 +call unite#custom#default_action('buffer', 'open') +nnoremap [unite]b :Unite buffer:- + +" unite-jumplist {{{3 +nnoremap [unite]j :Unite output:jumps: + +" unite-menu {{{3 +let g:unite_source_menu_menus = {} +let g:unite_source_menu_menus.fugitive = { 'description' : 'fugitive menu'} +let g:unite_source_menu_menus.fugitive.command_candidates = { + \ 'Gstatus gs' : 'Gstatus', + \ 'Gcommit -v gc' : 'Gcommit -v', + \ 'Glog' : 'Glog', + \} + +nnoremap gg :Unite menu:fugitive + +let g:unite_source_history_yank_enable = 1 +nnoremap [unite]p :Unite history/yank " yankring {{{2 nnoremap p :YRShow @@ -521,27 +868,24 @@ function! YRRunAfterMaps() nnoremap Y :YRYankCount 'y$' endfunction -" youcompleteme {{{2 -let g:ycm_extra_conf_globlist = ['~/src/*','/mnt/data/src/*'] -let g:ycm_global_ycm_extra_conf = expand('$XDG_CONFIG_HOME/vim/ycm_extra_conf.py') -let g:ycm_extra_conf_vim_data = ['getcwd()'] -let g:ycm_add_preview_to_completeopt = 1 -let g:ycm_autoclose_preview_window_after_insertion = 1 -"let g:ycm_extra_conf_vim_data = ['%:p'] -nnoremap jd :YcmCompleter GoTo - " vim-easy-align {{{2 " start interactive EasyAlign in visual mode -vmap (EasyAlign) +vmap :echohl WarningMsg \| echo "EasyAlign mapped to a now" \| echohl None +vmap a (EasyAlign) +nmap a (EasyAlign) + +" vim-gtest {{{2 +let g:gtest#highlight_failing_tests = 0 + +nnoremap tt :GTestRun +nnoremap tc :GTestCase +nnoremap tn :GTestName +nnoremap ta :GTestCase *:GTestName *:GTestRun +nnoremap tu :GTestRunUnderCursor " vim-json {{{2 let g:vim_json_syntax_conceal = 0 -" vim-latex {{{2 -let g:tex_flavor='latex' -let g:Tex_DefaultTargetFormat='pdf' -let g:Tex_MultipleCompileFormats='pdf' - " vim-sneak {{{2 let g:sneak#streak = 1 let g:sneak#target_labels = "aoeuisnthdpylrcgfqjkxzmwvz" " dvorak @@ -571,6 +915,35 @@ if !exists(":DiffOrig") \ | wincmd p | diffthis endif +" sort operator {{{2 +function! SortLinesOpFunc(...) + '[,']sort +endfunction +nnoremap gs :set operatorfunc=SortLinesOpFuncg@ +vnoremap gs :sort + +" edit configs {{{2 +function! EditConfig(what, ext = '.vim') + let l:dir = split(&runtimepath,',')[0] + if a:what == 'vimrc' + let l:file = expand($MYVIMRC) + elseif ! isdirectory(globpath(l:dir, a:what)) + echoe a:what." is not valid!" + elseif empty(&filetype) + echoe 'filetype is empty!' + else + let l:file = l:dir.'/'.a:what.'/'.&filetype.a:ext + endif + + execute ':vsplit '.file + execute ':lcd %:p:h' +endf +nmap ev :call EditConfig('vimrc') +nmap ef :call EditConfig('ftplugin') +nmap es :call EditConfig('syntax') +nmap ei :call EditConfig('indent') +nmap eu :call EditConfig('ultisnips', '.snippets') + " spell check {{{2 " http://tex.stackexchange.com/a/52932 let g:myLangList=["en_gb","en_us","de","fr"] @@ -600,3 +973,27 @@ endfunction nnoremap coS :call SwitchSpell() " fix spelling with first choice nnoremap f 1z= + +" gitdir or home {{{2 +" from derek wyatt: +" http://git.io/v3GAV +function! FindGitDirOrHome() + let filedir = expand('%:p:h') + if isdirectory(filedir) + let cmd = 'bash -c "(cd ' . filedir . '; git rev-parse --show-toplevel 2>/dev/null)"' + let gitdir = system(cmd) + if strlen(gitdir) == 0 + return '~' + else + return gitdir[:-2] + endif + else + return '~' + endif +endfunction +command! Cd cd %:h +command! Cdr execute('cd ' . FindGitDirOrHome()) +command! LCd lcd %:h +command! LCdr execute('lcd ' . FindGitDirOrHome()) + +" vim:set et sw=2 ts=2 tw=78: