remove source

install.sh

@@ -42,10 +42,11 @@ zsh_prompt() {
     # run option
     if [[ ${zshOption,,} = "y" ]]; then
         # Create temporary zsh file
-        touch $homedir/.tempzshrc
+        touch ~/.tempzshrc
 
         # set up the basics of zsh
         sh src/services/zsh/zsh.sh
+        sh src/services/zsh/Oh-My-ZSH.sh
     fi
 }
 
@@ -332,7 +333,7 @@ main() {
     cd src
     rm temp/*
 
-    install_oh_my_zsh
+    # install_oh_my_zsh
 }
 
 # PROGRAM BODY

src/importantinstalls/node.sh

@@ -3,16 +3,13 @@ wget -qO- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.1/install.sh | bash
 
 # export nvm to env table
 if [[ $(which zsh) == "/usr/bin/zsh" ]]; then
-    echo 'export NVM_DIR="$([ -z "${XDG_CONFIG_HOME-}" ] && printf %s "${HOME}/.nvm" || printf %s "${XDG_CONFIG_HOME}/nvm")"' >> ~/.tempzshrc
-    echo '[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm' >> ~/.tempzshrc
-    source ~/.tempzshrc
+    echo 'export NVM_DIR="$([ -z "${XDG_CONFIG_HOME-}" ] && printf %s "${HOME}/.nvm" || printf %s "${XDG_CONFIG_HOME}/nvm")"' >> ~/.zshrc
+    echo '[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm' >> ~/.zshrc
 fi
 
 # always put in bashrc aswell, so that the user can always rely on the standard shell
 echo 'export NVM_DIR="$([ -z "${XDG_CONFIG_HOME-}" ] && printf %s "${HOME}/.nvm" || printf %s "${XDG_CONFIG_HOME}/nvm")"' >> ~/.bashrc
 echo '[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm' >> ~/.bashrc
-source ~/.bashrc
-
 
 # install latest version of node
 nvm install node

src/services/zsh/Oh-My-ZSH.sh

@@ -1,2 +1,8 @@
-# Get oh my zsh, after this command the install stios, since we switched shells
-sh -c "$(curl -fsSL https://raw.github.com/ohmyzsh/ohmyzsh/master/tools/install.sh)" -y
+# Oh my zsh manual install
+git clone https://github.com/ohmyzsh/ohmyzsh.git ~/.oh-my-zsh
+
+# use the ohmyzsh template as zshrc
+cp ~/.oh-my-zsh/templates/zshrc.zsh-template ~/.zshrc
+
+# set zsh as main terminal
+chsh -s $(which zsh)

src/services/zsh/zsh.sh

@@ -1,8 +1,3 @@
 # install ZSH
 sudo apt-get update
-sudo apt-get install zsh -y
-
-# Set ZSH as standard interface
-chsh -s $(which zsh)
-
-source ~/.zshrc
+sudo apt-get install zsh -y