diff options
| author | Urbain Vaes <urbain@vaes.uk> | 2016-03-09 20:25:33 +0000 |
|---|---|---|
| committer | Urbain Vaes <urbain@vaes.uk> | 2016-03-09 20:25:33 +0000 |
| commit | cb8618bc4d733362da49bb02b65a5983bde23bda (patch) | |
| tree | 2523f0e83b840846ef275f6049a530cca6b84589 | |
| parent | 810035ab675fbf35a79bb9b1f23619ad696e9183 (diff) | |
Update mr configuration
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | .mr/mrconfig | 14 | ||||
| -rw-r--r-- | .vim/vimrc | 2 | ||||
| -rw-r--r-- | .zsh/aliases | 3 |
4 files changed, 18 insertions, 3 deletions
@@ -1,3 +1,5 @@ +.gitolite +.ledger .mutt/attachments/* .mutt/cache/* .mutt/solarized diff --git a/.mr/mrconfig b/.mr/mrconfig index a2f1b40..a8a24bd 100644 --- a/.mr/mrconfig +++ b/.mr/mrconfig @@ -3,8 +3,13 @@ checkout = git clone 'git@urbainvaes.com:dotfiles.git' 'dotfiles' update = git pull origin master push = git push origin master -[/home/urbain/dotfiles/.personal] -checkout = git clone 'git@urbainvaes.com:private/personal.git' '.personal' +[/home/urbain/dotfiles/.gitolite] +checkout = git clone 'git@urbainvaes.com:gitolite-admin.git' '.gitolite' +update = git pull origin master +push = git push origin master + +[/home/urbain/dotfiles/.ledger] +checkout = git clone 'git@urbainvaes.com:private/ledger.git' '.ledger' update = git pull origin master push = git push origin master @@ -13,6 +18,11 @@ checkout = git clone 'git@urbainvaes.com:private/passwords.git' '.passwords' update = git pull origin master push = git push origin master +[/home/urbain/dotfiles/.personal] +checkout = git clone 'git@urbainvaes.com:private/personal.git' '.personal' +update = git pull origin master +push = git push origin master + [/home/urbain/dotfiles/.vim/vim-plug] checkout = git clone 'https://github.com/junegunn/vim-plug' 'vim-plug' skip = [ "$1" = push ] @@ -41,6 +41,7 @@ Plug 'troydm/zoomwintab.vim' Plug 'Valloric/YouCompleteMe', { 'do' : 'python2 install.py --clang-completer' } Plug 'vim-airline/vim-airline' Plug 'vim-airline/vim-airline-themes' +Plug 'holomorph/vim-freefem' call plug#end() let g:vimtex_fold_enabled=0 @@ -81,7 +82,6 @@ let g:ctrlp_prompt_mappings = { \ 'PrtHistory(1)': ['<c-k>'],} let g:gitgutter_max_signs=1000 - let g:pymode_rope=0 let g:syntastic_cpp_compiler = "g++" diff --git a/.zsh/aliases b/.zsh/aliases index 4d95db5..fbb2b2f 100644 --- a/.zsh/aliases +++ b/.zsh/aliases @@ -8,7 +8,10 @@ alias notes='vim ~/dotfiles/.notes' # Programs alias a='vifm . .' +alias ff='FreeFem++' alias g='git' +alias l='ledger -f ~/dotfiles/.ledger/perso.ledger' +alias lj='vim ~/dotfiles/.ledger/perso.ledger' alias m='cd ~/.mutt/attachments && mutt && cd -' alias n='newsbeuter' alias v='vim' |