diff options
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | .mrconfig | 14 | ||||
| -rw-r--r-- | mr/.mrtrust | 2 | ||||
| -rw-r--r-- | tmux/.tmux.conf | 2 | ||||
| -rw-r--r-- | vim/.vimrc | 10 | ||||
| -rw-r--r-- | xdg-open/.config/mimeapps.list | 10 | ||||
| -rw-r--r-- | zsh/.zshrc | 2 |
7 files changed, 29 insertions, 13 deletions
@@ -1 +1 @@ -!*.gitkeep +plugins/* diff --git a/.mrconfig b/.mrconfig new file mode 100644 index 0000000..0bfd216 --- /dev/null +++ b/.mrconfig @@ -0,0 +1,14 @@ +[$HOME/dotfiles/plugins/fzf-marks] +checkout = git clone 'git@github.com:urbainvaes/fzf-marks' +update = git pull origin master +push = git push origin master + +[$HOME/dotfiles/plugins/vim-remembrall] +checkout = git clone 'git@github.com:urbainvaes/vim-remembrall.git' +update = git pull origin master +push = git push origin master + +[$HOME/dotfiles/plugins/vim-wintab] +checkout = git clone 'git@github.com:urbainvaes/vim-wintab.git' +update = git pull origin master +push = git saveandsync diff --git a/mr/.mrtrust b/mr/.mrtrust index 5f0dbe2..2e39831 100644 --- a/mr/.mrtrust +++ b/mr/.mrtrust @@ -1 +1,3 @@ ~/phd/.mrconfig +~/postdoc/.mrconfig +~/dotfiles/.mrconfig diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf index 3a55112..17d199f 100644 --- a/tmux/.tmux.conf +++ b/tmux/.tmux.conf @@ -29,7 +29,7 @@ set-hook -g client-attached "if-shell '[ -n \""'$SSH_CONNECTION'"\" ]' 'set stat PILOT_IGNORE= PILOT_BOUNDARY=ignore PILOT_MODE=wintab -PILOT_ROOT=$HOME/Dropbox/projects/vim-wintab +PILOT_ROOT=$HOME/dotfiles/plugins/vim-wintab source-file $PILOT_ROOT/pilot.tmux # Bind for clear-screen @@ -64,16 +64,16 @@ let g:zoomwintab_hidetabbar=0 Plug 'vim-scripts/ReplaceWithRegister' Plug 'vim-scripts/gmsh.vim' Plug 'wellle/targets.vim' -Plug 'zchee/deoplete-clang' +" Plug 'zchee/deoplete-clang' -if isdirectory($HOME."/Dropbox/projects") - Plug '~/Dropbox/projects/vim-remembrall' - Plug '~/Dropbox/projects/vim-wintab' +if isdirectory($HOME."/dotfiles/plugins") + Plug '~/dotfiles/plugins/vim-remembrall' + Plug '~/dotfiles/plugins/vim-wintab' endif if has("nvim") " Plug 'roxma/nvim-completion-manager' - Plug 'Shougo/deoplete.nvim', { 'do' : ':UpdateRemotePlugins', 'tag' : '4.1' } + " Plug 'Shougo/deoplete.nvim', { 'do' : ':UpdateRemotePlugins', 'tag' : '4.1' } Plug 'autozimu/LanguageClient-neovim', { 'do': 'bash install.sh', 'branch': 'next' } " Plug 'zchee/deoplete-jedi' Plug 'hkupty/iron.nvim', { 'branch': 'legacy' } diff --git a/xdg-open/.config/mimeapps.list b/xdg-open/.config/mimeapps.list index 2e38c81..3103c42 100644 --- a/xdg-open/.config/mimeapps.list +++ b/xdg-open/.config/mimeapps.list @@ -14,9 +14,9 @@ image/png=feh.desktop; image/jpg=feh.desktop; image/x-eps=org.pwmt.zathura.desktop; inode/directory=vifm.desktop;nautilus.desktop; -text/html=qutebrowser.desktop;firefox.desktop; +text/html=org.qutebrowser.qutebrowser.desktop;firefox.desktop; application/pdf=org.pwmt.zathura.desktop; -x-scheme-handler/http=qutebrowser.desktop; -x-scheme-handler/https=qutebrowser.desktop; -x-scheme-handler/about=qutebrowser.desktop; -x-scheme-handler/unknown=qutebrowser.desktop; +x-scheme-handler/http=org.qutebrowser.qutebrowser.desktop; +x-scheme-handler/https=org.qutebrowser.qutebrowser.desktop; +x-scheme-handler/about=org.qutebrowser.qutebrowser.desktop; +x-scheme-handler/unknown=org.qutebrowser.qutebrowser.desktop; @@ -64,7 +64,7 @@ fi [ ! -d ~/.zsh/zgen ] && git clone https://github.com/tarjoilija/zgen.git ~/.zsh/zgen source "$HOME/.zsh/zgen/zgen.zsh" -FZF_MARKS_PLUGIN_ZSH=$HOME/Dropbox/projects/fzf-marks/fzf-marks.plugin.zsh +FZF_MARKS_PLUGIN_ZSH=$HOME/dotfiles/plugins/fzf-marks/fzf-marks.plugin.zsh FZF_MARKS_COMMAND='fzf --height 40% --reverse -e' [ -f "$FZF_MARKS_PLUGIN_ZSH" ] && source "$FZF_MARKS_PLUGIN_ZSH" |