X-Git-Url: https://git.rmz.io/dotfiles.git/blobdiff_plain/74653f28d2bf2ed1ccc5a8b68654cd882cbeea62..3991dadf193d95de6b38dab4b9ae60972f9e7ce6:/vim/vimrc?ds=inline diff --git a/vim/vimrc b/vim/vimrc index 6fe4aec..d94c7c2 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -1,94 +1,189 @@ -" My vimrc. -" -" Author: Samir Benmendil -" +" 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 " plugins {{{1 -filetype off -set runtimepath& " reset rtp -" remove all autocommands -autocmd! - -set runtimepath+=$XDG_DATA_HOME/vim/vundle -call vundle#begin('$XDG_DATA_HOME/vim') - -Plugin 'gmarik/vundle' - -Plugin 'AndrewRadev/switch.vim' -Plugin 'airblade/vim-gitgutter' -Plugin 'alepez/vim-gtest' -Plugin 'bling/vim-airline' -Plugin 'chrisbra/checkattach' -Plugin 'derekwyatt/vim-fswitch' -Plugin 'elzr/vim-json' -Plugin 'firef0x/pkgbuild.vim' -Plugin 'junegunn/vim-easy-align' -Plugin 'justinmk/vim-sneak' -Plugin 'klen/python-mode' -Plugin 'kshenoy/vim-signature' -Plugin 'majutsushi/tagbar' -Plugin 'octol/vim-cpp-enhanced-highlight' -Plugin 'raimondi/delimitmate' -Plugin 'ram-z/vim-clang-format' -Plugin 'ram-z/vimwiki' -Plugin 'scrooloose/syntastic' -Plugin 'sgeb/vim-diff-fold' -Plugin 'shougo/unite.vim' -Plugin 'shougo/vimproc.vim' -Plugin 'sjl/gundo.vim' -Plugin 'thinca/vim-qfreplace' -Plugin 'tomtom/tcomment_vim' -Plugin 'tpope/vim-abolish' -Plugin 'tpope/vim-endwise' -Plugin 'tpope/vim-eunuch' -Plugin 'tpope/vim-fugitive' -Plugin 'tpope/vim-repeat' -Plugin 'tpope/vim-surround' "investigate vim-sandwich -Plugin 'tpope/vim-unimpaired' -Plugin 'tweekmonster/spellrotate.vim' -Plugin 'valloric/youcompleteme' -Plugin 'vim-scripts/mediawiki.vim' -Plugin 'vim-scripts/replacewithregister' -Plugin 'vim-scripts/yankring.vim' +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 -Plugin 'flazz/vim-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 + +"}}} " snippets -Plugin 'sirver/ultisnips' -Plugin 'honza/vim-snippets' +Plug 'sirver/ultisnips' +Plug 'honza/vim-snippets' " text objects -Plugin 'kana/vim-textobj-user' -Plugin 'julian/vim-textobj-variable-segment' -Plugin 'sgur/vim-textobj-parameter' -Plugin 'kana/vim-operator-user' +Plug 'kana/vim-textobj-user' +Plug 'julian/vim-textobj-variable-segment' +Plug 'sgur/vim-textobj-parameter' +Plug 'kana/vim-operator-user' " staging -" find an alternative (latex-box? Automatic Latex Plugin?) -Plugin 'vim-latex/vim-latex' -Plugin 'alx741/vinfo' -" needs editing colorscheme -" Plugin 'jeaye/color_coded' " Check LucHermites plugins: https://github.com/LucHermitte/lh-cpp -Plugin 'wincent/loupe' +Plug 'imsnif/kdl.vim' -call vundle#end() +Plug 'puremourning/vimspector' +Plug 'ilyachur/cmake4vim' +Plug 'ilyachur/gtest-vim' -" 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 -set runtimepath ^=$XDG_CONFIG_HOME/vim -set runtimepath +=$XDG_CONFIG_HOME/vim/after +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 badfox +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 @@ -114,17 +209,20 @@ 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 -au InsertLeave * :set listchars+=trail:· +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:│ @@ -153,7 +251,9 @@ 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. @@ -168,6 +268,7 @@ 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 @@ -184,7 +285,8 @@ set formatoptions+=l " do not wrap lines that have been longer when starting 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 @@ -221,6 +323,8 @@ set viewoptions+=folds " save folds 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 @@ -234,7 +338,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! @@ -269,6 +376,7 @@ 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 @@ -277,7 +385,15 @@ set isfname-== " don't treat `=` as being part of filenames " various {{{2 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 -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// @@ -285,9 +401,9 @@ 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 @@ -304,7 +420,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'] @@ -332,19 +448,28 @@ augroup END 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 and \ to be -map - " 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 @@ -385,7 +510,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! @@ -422,8 +551,8 @@ 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 @@ -449,8 +578,10 @@ nnoremap zx zMzxzt map :ls:b " move between windows (skip previewwindow) -nnoremap w:if &previewwindow \| wincmd w \| endif -nnoremap W:if &previewwindow \| wincmd W \| endif +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 @@ -502,15 +633,18 @@ inoremap gUiwgi 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 -" airline {{{2 -let g:airline#extensions#whitespace#enabled = 1 -let g:airline#extensions#tabline#enabled = 1 -let g:airline_powerline_fonts = 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 @@ -531,14 +665,42 @@ 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 :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 @@ -547,14 +709,6 @@ nmap cog IndentGuidesToggle nmap [og IndentGuidesEnable nmap ]og IndentGuidesDisable -" close-another-window {{{2 -nnoremap c -nnoremap cc c -nnoremap ch :CloseLeftWindow -nnoremap cl :CloseRightWindow -nnoremap cj :CloseBelowWindow -nnoremap ck :CloseAboveWindow - " python-mode {{{2 let g:pymode_rope_completion = 0 @@ -577,6 +731,9 @@ let g:SignatureMap = { " switch let g:switch_mapping = "s" +let g:switch_custom_definitions = [ + \ ['yes', 'no'] + \ ] " spellrotate nmap z] (SpellRotateForward) @@ -593,6 +750,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 @@ -608,10 +767,11 @@ let g:tagbar_iconchars = ['+', '-'] " tcomments {{{2 let g:tcomment_textobject_inlinecomment = 'gic' let g:tcomment#filetype#guess = 0 +"let g:tcomment#options = {'whitespace' : 'no'} " ultisnips {{{2 let g:UltiSnipsEditSplit = 'vertical' -let g:UltiSnipsSnippetsDir = expand("$XDG_CONFIG_HOME/vim/ultisnips") +let g:UltiSnipsSnippetDirectories = [ expand("$XDG_CONFIG_HOME/vim/ultisnips") ] if has('fname_case') let g:UltiSnipsSnippetDirectories = ["UltiSnips", "ultisnips"] endif @@ -665,7 +825,7 @@ if executable('ag') end nnoremap [unite]a :Unite grep:.:: nnoremap [unite]A :Unite grep:.:-w: -command! -nargs=1 Ag Unite grep:.:: +command! -nargs=+ Ag Unite grep:.:: " unite-file_rec {{{3 if executable('ag') @@ -679,6 +839,9 @@ call unite#custom#source('file_rec/async', 'sorters', 'sorter_selecta') 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'} @@ -704,35 +867,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_complete_in_comments = 1 -let g:ycm_complete_in_strings = 1 -let g:ycm_autoclose_preview_window_after_insertion = 0 - " vim-easy-align {{{2 " start interactive EasyAlign in visual mode -vmap (EasyAlign) -nmap ga (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 ta :GTestCase *:GTestName *:GTestRun -nnoremap tu :GTestRunUnderCursor +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 @@ -752,15 +904,6 @@ xmap T Sneak_T omap t Sneak_t omap T Sneak_T -" vimviki {{{2 -let g:vimwiki_list = [{'path': '$XDG_DATA_HOME/vimwiki'}] -let g:vimwiki_auto_chdir = 1 -augroup myvimwiki - au! BufRead $XDG_DATA_HOME/vimwiki/index.wiki !git -C "%:p:h" pull -q - au! BufRead,BufNewFile $XDG_DATA_HOME/vimwiki/diary/*.wiki !git -C "%:p:h" pull -q - au! BufWritePost $XDG_DATA_HOME/vimwiki/*.wiki exe '!git add "";git commit -qm"' . strftime("%FT%R") . '";git push -q' -augroup END - " functions {{{1 " Convenient command to see the difference between the current buffer and the @@ -779,7 +922,7 @@ nnoremap gs :set operatorfunc=SortLinesOpFuncg@ vnoremap gs :sort " edit configs {{{2 -function! EditConfig(what) +function! EditConfig(what, ext = '.vim') let l:dir = split(&runtimepath,',')[0] if a:what == 'vimrc' let l:file = expand($MYVIMRC) @@ -788,7 +931,7 @@ function! EditConfig(what) elseif empty(&filetype) echoe 'filetype is empty!' else - let l:file = l:dir.'/'.a:what.'/'.&filetype.'.vim' + let l:file = l:dir.'/'.a:what.'/'.&filetype.a:ext endif execute ':vsplit '.file @@ -798,7 +941,7 @@ nmap ev :call EditConfig('vimrc') nmap ef :call EditConfig('ftplugin') nmap es :call EditConfig('syntax') nmap ei :call EditConfig('indent') -nmap eu :UltiSnipsEdit:lcd %:p:h +nmap eu :call EditConfig('ultisnips', '.snippets') " spell check {{{2 " http://tex.stackexchange.com/a/52932