diff --git a/bash/.bash_profile b/bash/.bash_profile index 63e2307..75b3ac6 100644 --- a/bash/.bash_profile +++ b/bash/.bash_profile @@ -2,10 +2,8 @@ if [ -s ~/.bashrc ]; then source ~/.bashrc; fi -eval "$(rbenv init -)" -export PATH="/usr/local/sbin:$PATH" +eval "$(rbenv init - --no-rehash)" +(rbenv rehash &) 2> /dev/null -export PATH="$HOME/.cargo/bin:$PATH" - -export NVM_DIR="$HOME/.nvm" +# export NVM_DIR="$HOME/.nvm" # [ -s "/usr/local/opt/nvm/nvm.sh" ] && . "/usr/local/opt/nvm/nvm.sh" diff --git a/bash/.bashrc b/bash/.bashrc index dcbeafa..cf2baed 100644 --- a/bash/.bashrc +++ b/bash/.bashrc @@ -105,13 +105,10 @@ alias fkill='fzf_kill' if [ -x /usr/local/bin/brew ]; then export PATH=/usr/local/bin:/usr/local/sbin:$PATH export MANPATH=/usr/local/share/man:$MANPATH - - # bash_completion if installed - if [ -f `brew --prefix`/etc/bash_completion.d ]; then - . `brew --prefix`/etc/bash_completion.d - fi fi +export PATH="$HOME/.cargo/bin:$PATH" + __git_ps1() { :;} if [ -e ~/.git-prompt.sh ]; then source ~/.git-prompt.sh diff --git a/vim/.vimrc b/vim/.vimrc index fa05069..0b928b2 100644 --- a/vim/.vimrc +++ b/vim/.vimrc @@ -68,7 +68,7 @@ Plug 'w0rp/ale' " ======== Snippets & Autocomplete ====================== -" Plug 'SirVer/ultisnips' | Plug 'honza/vim-snippets' +Plug 'SirVer/ultisnips' | Plug 'honza/vim-snippets' " ======== Appearence =================================== @@ -96,6 +96,8 @@ Plug 'iamcco/markdown-preview.nvim', " Plug 'zxqfl/tabnine-vim' " Plug 'pechorin/any-jump.vim' +" Plug 'neoclide/coc.nvim', {'branch': 'release'} + call plug#end() @@ -719,3 +721,6 @@ nnoremap K " replace the word under the cursor nnoremap S :%s/\<\>//g + +" this might be bad, but enables aliases from .bashrc +set shellcmdflag=-ic