diff --git a/init.sh b/init.sh index 0b639b4..466b533 100755 --- a/init.sh +++ b/init.sh @@ -3,6 +3,10 @@ echo "installing required packages" bash deps.sh +#setup prezto +echo "Initializing Prezto" +zsh prezto.zsh + #create symlinks using stow echo "Stowing Configs" stow tmux @@ -13,13 +17,9 @@ if [ ! "~/.ssh" ] then mkdir ~/.ssh fi -stow ssh +ln -s "$HOME/stevset/ssh/config" "$HOME/.ssh/config" chmod -R 0600 ~/.ssh/* -ln -s "$HOME/stevset/mc" ~/.config/mc - -#setup prezto -echo "Initializing Prezto" -zsh prezto.zsh +ln -s "$HOME/stevset/mc" "$HOME/.config/mc" #set new shell echo "Set new shell to zsh" @@ -54,9 +54,6 @@ if [[ $answer = "Y" ]] || [[ $answer = "y" ]]; then git config --global user.email "$email" fi -echo "Initializing Submodules" -git submodule init && git submodule update - echo "*******************************" echo "* Restart your terminal *" echo "*******************************" diff --git a/prezto.zsh b/prezto.zsh index 34ee68a..88ee016 100755 --- a/prezto.zsh +++ b/prezto.zsh @@ -3,10 +3,9 @@ echo "initialize submodules and clone prezto" git clone --recursive https://github.com/steveokard/prezto.git "$HOME/stevset/prezto/.zprezto" #fix submodules once and for all -cd $HOME/stevset/prezto/.zprezto && git submodule update --remote +cd $HOME/stevset/prezto/.zprezto && git submodule update --remote && git submodule update #Remove old stuff -#zlogin zlogout zpreztorc zprofile zshenv zshrc echo "....Creating symlinks" rm -rf ~/.zshrc ~/.zsh ~/.zprofile ~/.zlogin ~/.zlogout ~/.zpreztorc ~/.zshenv @@ -23,8 +22,7 @@ fi #extra setup for powerlevel10k theme echo "....configuring theme" -rm ~/.purepower cd && curl -fsSLO https://raw.githubusercontent.com/romkatv/dotfiles-public/master/.purepower + rm $HOME/.zprezto/modules/prompt/functions/prompt_powerlevel10k_setup ln -s $HOME/.zprezto/modules/prompt/external/powerlevel10k/prompt_powerlevel10k_setup $HOME/.zprezto/modules/prompt/functions/prompt_powerlevel10k_setup -