summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mr/.mrconfig8
-rw-r--r--vim/.vimrc6
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
diff --git a/vim/.vimrc b/vim/.vimrc
index 3dc451b..25a5cbe 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -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