From 320b8f807e2bd7beb0a1a233b4bcb19650cf9c73 Mon Sep 17 00:00:00 2001 From: Valentin Brandl Date: Fri, 12 May 2017 14:20:02 +0200 Subject: [PATCH] Update --- editors/vim/plugins.vim | 11 ++++++++++- editors/vim/vimrc | 6 +++++- shells/zsh/zshrc | 14 ++++++++++++-- 3 files changed, 27 insertions(+), 4 deletions(-) diff --git a/editors/vim/plugins.vim b/editors/vim/plugins.vim index 671f60d..98e8311 100644 --- a/editors/vim/plugins.vim +++ b/editors/vim/plugins.vim @@ -38,6 +38,9 @@ Plug 'sickill/vim-pasta' " context aware pasting Plug 'junegunn/goyo.vim' " distraction free writing Plug 'bronson/vim-trailing-whitespace' " highlight unwanted whitespaces +Plug 'SirVer/ultisnips' +Plug 'honza/vim-snippets' + " Python Plug 'davidhalter/jedi-vim', { 'for': 'python' } " python autocomplete @@ -55,7 +58,13 @@ function! BuildYCM(info) endif endfunction -Plug 'Valloric/YouCompleteMe', { 'do': function('BuildYCM') } +if has('nvim') + Plug 'Shougo/deoplete.nvim', { 'do': ':UpdateRemotePlugins' } +endif + +if has('vim') + Plug 'Valloric/YouCompleteMe', { 'do': function('BuildYCM') } +endif " Plug 'artur-shaik/vim-javacomplete2' diff --git a/editors/vim/vimrc b/editors/vim/vimrc index deee1fb..dc9bd19 100644 --- a/editors/vim/vimrc +++ b/editors/vim/vimrc @@ -386,7 +386,7 @@ let g:notes_directories = ['~/Dokumente/Notes'] let g:polyglot_disabled = ['latex'] " disable latex in polyglot to use vimtex " you complete me -let g:ycm_rust_src_path = '/usr/src/rust/src' +let g:ycm_rust_src_path = '~/.multirust/toolchains/stable-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/src' let g:ycm_python_binary_path = 'python' " " javacomplete2 @@ -404,4 +404,8 @@ let g:ycm_python_binary_path = 'python' " nmap (JavaComplete-Imports-RemoveUnused) " imap (JavaComplete-Imports-RemoveUnused) +if has('nvim') + let g:deoplete#enable_at_startup = 1 +endif + " vim: set filetype=vim ts=8 sw=2 tw=120 noet : diff --git a/shells/zsh/zshrc b/shells/zsh/zshrc index 98548a3..e11ea8e 100644 --- a/shells/zsh/zshrc +++ b/shells/zsh/zshrc @@ -8,6 +8,7 @@ antigen bundle zsh-users/zsh-syntax-highlighting # autosuggestions based on the history antigen bundle zsh-users/zsh-autosuggestions antigen bundle git +antigen bundle gitignore antigen bundle tmux antigen bundle tmuxinator # cargo autocomplete @@ -43,7 +44,7 @@ export JAVA_OPTS="-Dawt.useSystemAAFontSettings=on -Dswing.aatext=true" export EDITOR=/usr/bin/vim # map vi to vim alias vi=$EDITOR - + # Add an "alert" alias for long running commands. Use like so: # sleep 10; alert alias alert='notify-send --urgency=low -i "$([ $? = 0 ] && echo terminal || echo error)" "$(history|tail -n1|sed -e '\''s/^\s*[0-9]\+\s*//;s/[;&|]\s*alert$//'\'')"' @@ -77,11 +78,20 @@ source /etc/profile.d/vte.sh export LESS_TERMCAP_mb=$(printf '\e[01;31m') # enter blinking mode - red export LESS_TERMCAP_md=$(printf '\e[01;35m') # enter double-bright mode - bold, magenta export LESS_TERMCAP_me=$(printf '\e[0m') # turn off all appearance modes (mb, md, so, us) -export LESS_TERMCAP_se=$(printf '\e[0m') # leave standout mode +export LESS_TERMCAP_se=$(printf '\e[0m') # leave standout mode export LESS_TERMCAP_so=$(printf '\e[01;33m') # enter standout mode - yellow export LESS_TERMCAP_ue=$(printf '\e[0m') # leave underline mode export LESS_TERMCAP_us=$(printf '\e[04;36m') # enter underline mode - cyan unsetopt autopushd +# Add RVM to PATH for scripting. Make sure this is the last PATH variable change. +export PATH="$HOME/.rvm/bin:$PATH" +# export PATH=/home/me/.gem/ruby/2.4.0/bin:$PATH + +# Linuxbrew +# export PATH="/home/me/.linuxbrew/bin:$PATH" +# export MANPATH="/home/me/.linuxbrew/share/man:$MANPATH" +# export INFOPATH="/home/me/.linuxbrew/share/info:$INFOPATH" +fpath=(~/.zsh/completions $fpath) # vim: set filetype=zsh ts=4 sw=4 tw=0 et :