diff options
-rw-r--r-- | i3/.config/i3/config | 2 | ||||
-rw-r--r-- | mr/.mrconfig | 8 | ||||
-rw-r--r-- | vim/.vim/spell/en.utf-8.add | 6 | ||||
-rw-r--r-- | vim/.vim/spell/en.utf-8.add.spl | bin | 0 -> 154 bytes | |||
-rw-r--r-- | vim/.vimrc | 13 | ||||
-rw-r--r-- | zsh/.zsh/alias | 15 | ||||
-rw-r--r-- | zsh/.zsh/plugins | 3 |
7 files changed, 28 insertions, 19 deletions
diff --git a/i3/.config/i3/config b/i3/.config/i3/config index 8f6952d..6668438 100644 --- a/i3/.config/i3/config +++ b/i3/.config/i3/config @@ -160,7 +160,7 @@ bindsym $mod+period workspace next # Programs shortcuts bindsym $mod+b exec --no-startup-id qutebrowser bindsym $mod+i exec $HOME/bin/vimin - +bindsym Print exec xfce4-screenshooter # Pulse Audio controls bindsym XF86AudioRaiseVolume exec amixer -D pulse sset Master 5%+ bindsym XF86AudioLowerVolume exec amixer -D pulse sset Master 5%- 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/.vim/spell/en.utf-8.add b/vim/.vim/spell/en.utf-8.add new file mode 100644 index 0000000..87ee2ba --- /dev/null +++ b/vim/.vim/spell/en.utf-8.add @@ -0,0 +1,6 @@ +diagonality +laplacian +Maruyama +multiscale +SPDE +advective diff --git a/vim/.vim/spell/en.utf-8.add.spl b/vim/.vim/spell/en.utf-8.add.spl Binary files differnew file mode 100644 index 0000000..b52c8a6 --- /dev/null +++ b/vim/.vim/spell/en.utf-8.add.spl @@ -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' @@ -55,6 +56,7 @@ Plug 'troydm/zoomwintab.vim' Plug 'vim-airline/vim-airline' Plug 'vim-airline/vim-airline-themes' Plug 'vim-scripts/gmsh.vim' +Plug 'vim-scripts/SpellCheck' if has("nvim") Plug 'Shougo/deoplete.nvim' @@ -64,7 +66,6 @@ if has("nvim") else Plug 'Shougo/neocomplete.vim' Plug 'scrooloose/syntastic' - " Plug 'Valloric/YouCompleteMe', { 'do' : 'python2 install.py --clang-completer' } endif call plug#end() @@ -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> @@ -159,6 +161,13 @@ let g:deoplete#omni_patterns.tex = g:neocomplete#sources#omni#input_patterns.tex " FZF.vim 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 @@ -219,7 +228,6 @@ let g:netrw_bufsettings='relativenumber' let g:tex_conceal= 'adgm' let g:tex_flavor='latex' - "" Vim options set smartindent set expandtab @@ -227,7 +235,6 @@ set tabstop=4 set softtabstop=4 set shiftwidth=4 set showcmd -" set nofoldenable set foldmethod=marker set noswapfile set nowritebackup diff --git a/zsh/.zsh/alias b/zsh/.zsh/alias index 7d0dc7d..8477d7d 100644 --- a/zsh/.zsh/alias +++ b/zsh/.zsh/alias @@ -5,13 +5,9 @@ alias c='clear' alias ca='printf "\ec"' alias cdd='cd ~/dotfiles' -# Shortcut to files -alias notes='vim ~/dotfiles/.notes' - # Programs alias a='vifm . .' alias ff='FreeFem++' -alias g='git' alias m='cd ~/.mutt/attachments && mutt && cd -' alias e='nvim' alias n='nvim' @@ -19,13 +15,14 @@ alias ns='nvim -S Session.vim' alias v='vim' alias vs="vim -S Session.vim" -# Build +# Git +alias g='git' +alias rd='cd $(git rev-parse --show-toplevel)' + +# GNU Make +alias mi='make install' alias mc='make clean' alias mca='make clean-all' -# Tmux -alias son="tmux set -g status on" -alias soff="tmux set -g status off" - # Unablias ag from ubuntu plugin unalias ag diff --git a/zsh/.zsh/plugins b/zsh/.zsh/plugins index 3506d70..3cbc6fd 100644 --- a/zsh/.zsh/plugins +++ b/zsh/.zsh/plugins @@ -20,7 +20,6 @@ if ! zgen saved; then zgen oh-my-zsh plugins/themes # Appearance - # zgen oh-my-zsh themes/eastwood zgen load mafredri/zsh-async zgen load sindresorhus/pure @@ -49,4 +48,4 @@ fi } # Z -export _Z_EXCLUDE_DIRS=("$HOME/sshfs", "$HOME/nfs") +_Z_DADA=("$HOME/.local/share/z") |