Merge branch 'master' into opensuse

init.sh

@@ -1,9 +1,4 @@
 #!/bin/bash
-
-#git cloning
-echo "initialize submodules and clone prezto"
-git clone --recursive https://github.com/steveokard/prezto.git "$HOME/stevset/prezto/.zprezto"
-
 #install pre-req.
 echo "installing required packages"
 bash deps.sh
@@ -27,7 +22,7 @@ echo "Initializing Prezto"
 zsh prezto.zsh
 
 #set new shell
-echo "set new shell to zsh"
+echo "Set new shell to zsh"
 if [[ $SHELL != "/bin/zsh" ]] 
 then
 	chsh -s /bin/zsh

prezto.zsh

@@ -1,8 +1,14 @@
 #!/bin/zsh
 #Initializes Prezto
+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
 
 #Remove old stuff
-rm -rf ~/.zshrc ~/.zsh ~/.zprofile
+#zlogin  zlogout  zpreztorc  zprofile  zshenv  zshrc
+echo "....Creating symlinks"
+rm -rf ~/.zshrc ~/.zsh ~/.zprofile ~/.zlogin ~/.zlogout ~/.zpreztorc ~/.zshenv
 
 #Make Environment Links, per github readme
 setopt EXTENDED_GLOB
@@ -11,8 +17,14 @@ for rcfile in "${ZDOTDIR:-$HOME}"/stevset/prezto/.zprezto/runcoms/^README.md(.N)
   done
 
 #Fix History if it exists
-cat ~/.zsh_history > ~/.zhistory
+if test -f "~/.zsh_history"; then
+    cat ~/.zsh_history > ~/.zhistory
+fi
 
 #extra setup for powerlevel10k theme
+echo "....configuring theme"
+rm ~/.purepower
 cd && curl -fsSLO https://raw.githubusercontent.com/romkatv/dotfiles-public/master/.purepower
-ln -s ~/.zprezto/modules/prompt/{external/powerlevel10k/powerlevel10k.zsh-theme,functions/prompt_powerlevel10k_setup}
+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
+

scripts/fonts.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+# clone
+git clone https://github.com/powerline/fonts.git --depth=1
+# install
+cd fonts
+./install.sh
+# clean-up a bit
+cd ..
+rm -rf fonts