diff options
| author | Urbain Vaes <urbain@vaes.uk> | 2016-09-02 12:06:42 +0100 |
|---|---|---|
| committer | Urbain Vaes <urbain@vaes.uk> | 2016-09-02 12:06:42 +0100 |
| commit | 172b87d5ce4597a85dd76f17fa77c75d82963463 (patch) | |
| tree | 02b69e2cce583479d1ac76373b2640996732f383 | |
| parent | 85d03dc7297404ad0cac04a0a9c2bbef8e301fbb (diff) | |
| parent | 09a7dcd8ed743b9f7e4dfd184c26454c29fb4774 (diff) | |
Merge branch 'master' of urbainvaes.com:public/dotfiles
| -rw-r--r-- | mr/.mrconfig | 8 | ||||
| -rw-r--r-- | vim/.vimrc | 6 |
2 files changed, 10 insertions, 4 deletions
diff --git a/mr/.mrconfig b/mr/.mrconfig index a007de9..ab0a1eb 100644 --- a/mr/.mrconfig +++ b/mr/.mrconfig @@ -1,19 +1,19 @@ [$HOME/dotfiles] -checkout = git clone 'git@urbainvaes.com:dotfiles.git' 'dotfiles' +checkout = git clone 'gitolite@urbainvaes.com:dotfiles.git' 'dotfiles' update = git pull origin master push = git push origin master [$HOME/gitolite] -checkout = git clone 'git@urbainvaes.com:gitolite-admin.git' 'gitolite' +checkout = git clone 'gitolite@urbainvaes.com:gitolite-admin.git' 'gitolite' update = git pull origin master push = git push origin master [$HOME/personal] -checkout = git clone 'git@urbainvaes.com:private/personal.git' 'personal' +checkout = git clone 'gitolite@urbainvaes.com:private/personal.git' 'personal' update = git pull origin master push = git push origin master [$HOME/.password-store] -checkout = git clone 'git@urbainvaes.com:private/passwords.git' '.password-store' +checkout = git clone 'gitolite@urbainvaes.com:private/passwords.git' '.password-store' update = git pull origin master push = git push origin master @@ -13,6 +13,7 @@ Plug 'altercation/vim-colors-solarized' Plug 'beloglazov/vim-online-thesaurus' Plug 'christoomey/vim-tmux-navigator' Plug 'critiqjo/lldb.nvim' +Plug 'embear/vim-localvimrc' Plug 'holomorph/vim-freefem' Plug 'honza/vim-snippets' Plug 'jamessan/vim-gnupg' @@ -101,6 +102,7 @@ vnoremap <c-d>p :<C-U>LL print <C-R>=lldb#util#get_selection()<CR><CR> " Fugitive nnoremap <Leader>gs :Gstatus<cr> +nnoremap <Leader>gc :Gcommit<cr> nnoremap <Leader>gr :Gread<cr> nnoremap <Leader>gd :Gdiff<cr> @@ -162,6 +164,10 @@ let g:fzf_buffers_jump = 1 " Gundo let g:gundo_prefer_python3 = 1 +" Idealvimrc +let g:localvimrc_sandbox = 0 +let g:localvimrc_whitelist='/home/*' + " NerdTree let g:NERDTreeHijackNetrw = 0 |