X-Git-Url: https://git.rmz.io/dotfiles.git/blobdiff_plain/b073eef457b18061ebad9b05727dbccfcf9e110e..37be67a9b70096ac75448ef8a397197c8c13ae60:/vim/vimrc diff --git a/vim/vimrc b/vim/vimrc index 17e2a1e..2ef5689 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -10,43 +10,67 @@ set runtimepath& " reset rtp autocmd! set runtimepath+=$XDG_DATA_HOME/vim/vundle -call vundle#rc('$XDG_DATA_HOME/vim') +call vundle#begin('$XDG_DATA_HOME/vim') Plugin 'gmarik/vundle' +Plugin 'airblade/vim-gitgutter' Plugin 'bling/vim-airline' +Plugin 'chrisbra/checkattach' +Plugin 'derekwyatt/vim-fswitch' Plugin 'elzr/vim-json' -Plugin 'rking/ag.vim' -Plugin 'http://git.code.sf.net/p/vim-latex/vim-latex' -Plugin 'kien/ctrlp.vim' +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 'scrooloose/nerdtree' +Plugin 'octol/vim-cpp-enhanced-highlight' +Plugin 'raimondi/delimitmate' +Plugin 'rdnetto/ycm-generator' Plugin 'scrooloose/syntastic' +Plugin 'shougo/unite.vim' +Plugin 'shougo/vimproc.vim' Plugin 'sjl/gundo.vim' Plugin 'tomtom/tcomment_vim' +Plugin 'tpope/vim-abolish' 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/replacewithregister' +Plugin 'vim-scripts/yankring.vim' +" colorschemes +Plugin 'flazz/vim-colorschemes' + +" snippets +Plugin 'sirver/ultisnips' +Plugin 'honza/vim-snippets' + +" text objects +Plugin 'kana/vim-textobj-user' +Plugin 'julian/vim-textobj-variable-segment' +Plugin 'sgur/vim-textobj-parameter' + +" ros Plugin 'ompugao/ros.vim' Plugin 'ompugao/ctrlp-ros' -Plugin 'firef0x/pkgbuild.vim' -Plugin 'derekwyatt/vim-fswitch' -" seems to have problems right now... may be add later? -" Plugin 'jalcine/cmake.vim' -" Plugin 'powerman/vim-plugin-viewdoc' +" staging +" find an alternative (latex-box? Automatic Latex Plugin?) +Plugin 'vim-latex/vim-latex' +Plugin 'nathanaelkane/vim-indent-guides' +Plugin 'alx741/vinfo' +Plugin 'vim-scripts/mediawiki.vim' +Plugin 'derekwyatt/vim-protodef' +" needs editing colorscheme +" Plugin 'jeaye/color_coded' +" Check LucHermites plugins: https://github.com/LucHermitte/lh-cpp -Plugin 'airblade/vim-gitgutter' -Plugin 'raimondi/delimitmate' -Plugin 'sirver/ultisnips' -Plugin 'lokaltog/vim-easymotion' -Plugin 'junegunn/vim-easy-align' -Plugin 'chrisbra/checkattach' +call vundle#end() " remove entries first set runtimepath -=$HOME/.vim @@ -61,7 +85,7 @@ filetype plugin indent on " colorscheme {{{1 syntax on -colorscheme badwolf +colorscheme badfox " options {{{1 " moving around, searching and patterns {{{2 @@ -71,26 +95,31 @@ 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:❮ " Only shown when not in insert mode +au InsertLeave * :set listchars+=trail:· augroup trailing au! 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 @@ -135,11 +164,25 @@ 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 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=hex " number formats recognized for CTRL-A and CTRL-X commands -set complete=.,w,b,u,t +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| + " whether to use a popup menu for Insert mode completion set completeopt=longest,menuone,preview @@ -157,33 +200,50 @@ 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 +" open folds when jumping to line +set foldopen+=jump + " save and restore folds -set viewoptions=folds,cursor " don't save local options +set viewoptions=cursor " only save cursor position " 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 " reading and writing files {{{2 set modeline " read modelines set modelines=2 " only check first/last 2 lines + set writebackup " write a backup file before overwriting a file set backup " keep a backup after owerwriting a file -set backupdir=$XDG_CACHE_HOME/vim// +set backupdir=$XDG_CACHE_HOME/vim/backup// + +set backupskip+=.netrc " skip netrc +set backupskip+=/dev/shm/pass* " skip passwordstore files set undofile " persistent undo history -set undodir=$XDG_CACHE_HOME/vim// +set undodir=$XDG_CACHE_HOME/vim/undo// + +augroup undoskip + au! + au BufWritePre .netrc setlocal noundofile + au BufWritePre /dev/shm/pass* setlocal noundofile + au BufWritePre /tmp/* setlocal noundofile +augroup END set autowrite " automatically write a file when leaving a modified buffer set autoread " automatically read a file that has been modified " the swap file {{{2 set noswapfile -set directory=$XDG_CACHE_HOME/vim// +set directory=$XDG_CACHE_HOME/vim/swap// " command line editing {{{2 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 @@ -195,11 +255,22 @@ 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 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 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 -set viewdir=$XDG_CACHE_HOME/vim +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 @@ -232,13 +303,32 @@ augroup cursor_pos \ endif augroup END +" 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 + " bindings {{{1 " allow both and / to be map " make -nnoremap :make +nnoremap r :make! +nnoremap :make! " unhighlight search nnoremap / :silent nohl @@ -247,16 +337,26 @@ nnoremap / :silent nohl nnoremap [ :tabprev nnoremap ] :tabnext -" Wrap -nnoremap W :set wrap! - " paste from selection 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.' @@ -268,15 +368,12 @@ noremap ' ` " Select (charwise) the contents of the current line, excluding indentation. nnoremap vv ^vg_ -" Toggle [i]nvisible characters -nnoremap i :set list! - " Unfuck my screen nnoremap U :syntax sync fromstart:AirlineRefresh:redraw! " Ranger -nnoremap r :silent !ranger %:h:redraw! -nnoremap R :silent !ranger:redraw! +" nnoremap r :silent !ranger %:h:redraw! +" nnoremap R :silent !ranger:redraw! " Use sane regexes. nnoremap / /\v @@ -294,6 +391,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 ^ @@ -302,10 +400,10 @@ 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') @@ -330,13 +428,11 @@ cnoremap cnoremap " close all folds open fold in cursor -nnoremap zx zMzxzz15 - -" edit vimrc in new tab -nmap ev :tabedit $MYVIMRC:lcd %:p:h +nnoremap zx zMzxzt map :ls:b +" move between windows nnoremap w nnoremap W @@ -345,7 +441,9 @@ 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 . @@ -357,14 +455,21 @@ noremap O :set pastem`O``:set nopaste " Don't use Ex mode, use Q for formatting map Q gq -" allow undoing in insert-mode -inoremap u +" 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.' :set 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 @@ -375,31 +480,38 @@ autocmd BufWinLeave *.* mkview autocmd BufWinEnter *.* silent loadview " save with sudo -cnoremap w!! w !sudo tee % > /dev/null +cabbrev w!! w !sudo tee % > /dev/null -" plugins {{{1 -" ag {{{2 -let g:AgSmartCase = 1 -nnoremap ag yiw:Ag " -vnoremap ag y:Ag " +" uppercase previous word +inoremap gUiwgi + +" 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 " airline {{{2 -let g:airline_detect_whitespace=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' -" Gundo {{{2 -nnoremap :GundoToggle +" delimitmate {{{2 +let delimitMate_expand_cr = 2 +let g:delimitMate_expand_space = 1 " fswitch {{{2 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 @@ -408,17 +520,47 @@ autocmd BufReadPost fugitive://* set bufhidden=delete nnoremap gs :Gstatus nnoremap gd :Gdiff -nnoremap gc :tab Gcommit -v +nnoremap gc :Gcommit -v nnoremap ga :Gwrite +nnoremap gb :Gblame -" 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 +" Gundo {{{2 +nnoremap :GundoToggle + +" indent-guides {{{2 +let g:indent_guides_default_mapping = 0 +let g:indent_guides_guide_size = 1 +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 +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' : "", + \ } " synastic {{{2 let g:syntastic_enable_highlighting = 0 @@ -441,26 +583,111 @@ let g:tagbar_autoshowtag = 1 let g:tagbar_width = 25 let g:tagbar_iconchars = ['+', '-'] -" UltiSnips {{{2 +" 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 = "" +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="" + +" 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] + +" 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 --hidden --ignore ''.hg'' --ignore ''.svn'' --ignore ''.git'' --ignore ''.bzr''' + let g:unite_source_grep_recursive_opt = '' +end +nnoremap [unite]a :Unite grep:.:: +command! -nargs=1 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 --hidden -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-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 +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 :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_complete_in_comments = 1 +let g:ycm_complete_in_strings = 1 +let g:ycm_autoclose_preview_window_after_insertion = 0 "let g:ycm_extra_conf_vim_data = ['%:p'] -nnoremap jd :YcmCompleter GoTo " vim-easy-align {{{2 " start interactive EasyAlign in visual mode -vnoremap (EasyAlign) +vmap (EasyAlign) +nmap ga (EasyAlign) " vim-json {{{2 let g:vim_json_syntax_conceal = 0 @@ -470,6 +697,24 @@ 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 +let g:sneak#use_ic_scs = 1 " follow 'ignorecase' and 'smartcase' + +" sneaky f and t +nmap f Sneak_f +nmap F Sneak_F +xmap f Sneak_f +xmap F Sneak_F +omap f Sneak_f +omap F Sneak_F +nmap t Sneak_t +nmap T Sneak_T +xmap t Sneak_t +xmap T Sneak_T +omap t Sneak_t +omap T Sneak_T " functions {{{1 @@ -481,6 +726,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) + 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.'.vim' + 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 :UltiSnipsEdit:lcd %:p:h + " spell check {{{2 " http://tex.stackexchange.com/a/52932 let g:myLangList=["en_gb","en_us","de","fr"] @@ -507,23 +781,30 @@ function! SwitchSpell() echo "setlocal spelllang=" g:myLangList[b:myLang] endfunction -nnoremap s :call ToggleSpell() -nnoremap S :call SwitchSpell() +nnoremap coS :call SwitchSpell() " fix spelling with first choice nnoremap f 1z= -" Toggle line numbers {{{2 -function! g:ToggleNumber() - if !exists("b:relanum") - let b:relanum=1 - endif - if &l:number - let b:relanum = &relativenumber - setlocal nonumber norelativenumber +" 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 - let &l:relativenumber = b:relanum - setlocal number + return gitdir[:-2] endif + else + return '~' + endif endfunction -nnoremap n :call g:ToggleNumber() -nnoremap N :setlocal relativenumber! +command! Cd cd %:h +command! Cr execute('cd ' . FindGitDirOrHome()) +command! LCd lcd %:h +command! LCr execute('lcd ' . FindGitDirOrHome()) + +" vim:set et sw=2 ts=2 tw=78: