From 658d3028c0c2af53afe180e37fd64922e96830f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= Date: Sun, 13 Nov 2016 19:16:31 +0100 Subject: [PATCH 1/2] Move fzf init to .zshrc as this is where fzf installer checks for it --- .zprofile | 2 -- .zshrc | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.zprofile b/.zprofile index 40f47552..883160fb 100644 --- a/.zprofile +++ b/.zprofile @@ -74,9 +74,7 @@ fi TMPPREFIX="${TMPDIR%/}/zsh" -# stuff that checks if it's added to the .zshrc exipliclty export PATH="$PATH:$HOME/.rvm/bin" # Add RVM to PATH for scripting -[ -f ~/.fzf.zsh ] && source ~/.fzf.zsh # other common env vars source ~/.setenv diff --git a/.zshrc b/.zshrc index 936eafa4..e0acf602 100644 --- a/.zshrc +++ b/.zshrc @@ -41,3 +41,5 @@ if [[ `uname` =~ 'CYGWIN.*' ]]; then fi alias benice="ionice -c3 nice -n20" + +[ -f ~/.fzf.zsh ] && source ~/.fzf.zsh From 0a261d7f1cd8d24613983480731f388176be8b98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= Date: Sun, 13 Nov 2016 19:55:32 +0100 Subject: [PATCH 2/2] Link in proper prezto configuration files --- common/configure_fresh_system | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/configure_fresh_system b/common/configure_fresh_system index 1688f467..137ba01f 100755 --- a/common/configure_fresh_system +++ b/common/configure_fresh_system @@ -37,10 +37,10 @@ ln -vfs "$DIR/.vimrc.linux" ~/.vimrc ln -vfs "$DIR/.tmux.conf" ~/. rm -f "~/.zshrc" ln -vfs "$DIR/.zprezto" ~/. -ln -vfs "$DIR/.zprezto/runcoms/zpreztorc" ~/.zpreztorc +ln -vfs "$DIR/.zpreztorc" ~/.zpreztorc ln -vfs "$DIR/.zprofile" ~/.zprofile ln -vfs "$DIR/.zprezto/runcoms/zshenv" ~/.zshenv -ln -vfs "$DIR/.zprezto/runcoms/zshrc" ~/.zshrc +ln -vfs "$DIR/.zshrc" ~/.zshrc ln -vfs "$DIR/.setenv" ~/. ln -vfs "$DIR/.Slic3r" ~/.