Resolve Merge Conflict

home/.zshrc

@@ -33,6 +33,7 @@ plugins=(
     git 
     git-extras 
     mercurial
+    zsh-completions
 )
 
 # Let's update and do other goodness
@@ -107,6 +108,15 @@ if [ -d "$HOME/.rbenv" ] && [ -z "$MSYSTEM" ]; then
     eval "$(rbenv init -)"
 fi
 
+# rust setup
+if [ -d "$HOME/.cargo" ]; then
+    export PATH="$HOME/.cargo/bin:$PATH"
+fi
+
+if [ -d "$HOME/.ansible" ]; then
+    export ANSIBLE_CONFIG="$HOME/.ansible/ansible.cfg"
+fi
+
 # A function that does the automatic path translation for a windows emacs
 cygwin_emacsclient(){
     # Loop over all the input variables and convert their paths     
@@ -137,3 +147,10 @@ if [ -n "$MSYSTEM" ] && [[ "$MSYSTEM" == "MSYS" ]]; then
 fi
 
 export PATH="/usr/share/haxe/lib:$PATH"
+
+# opam configuration
+test -r /home/sothr/.opam/opam-init/init.zsh && . /home/sothr/.opam/opam-init/init.zsh > /dev/null 2> /dev/null || true
+
+#THIS MUST BE AT THE END OF THE FILE FOR SDKMAN TO WORK!!!
+export SDKMAN_DIR="/home/sothr/.sdkman"
+[[ -s "/home/sothr/.sdkman/bin/sdkman-init.sh" ]] && source "/home/sothr/.sdkman/bin/sdkman-init.sh"

scripts/installers/install_tools_ubuntu.sh

@@ -1,9 +1,9 @@
-#!/usr/bin/ENV sh
+#!/usr/bin/env sh
 
 set -x
 set -e
 
-ENV=/usr/bin/ENV
+ENV=/usr/bin/env
 OPWD=$PWD
 PACKAGE_MANAGER="sudo apt-get"
 PM_UPDATE="$PACKAGE_MANAGER update"
@@ -16,7 +16,7 @@ cd $HOME
 # Install the minimal toolset to bootstrap out process
 $PM_UPDATE
 # System basics for everything after this point
-$PM_INSTALL curl wget git zsh vim tmux mosh python-software-properties software-properties-common
+$PM_INSTALL curl wget git zsh vim tmux mosh software-properties-common
 
 # Install OhMyZSH
 mkdir -p $HOME/build/oh-my-zsh
@@ -27,13 +27,13 @@ $ENV sh install.sh
 cd $HOME
 
 # Add the screenfetch repository
-sudo add-apt-repository -y 'ppa:djcj/screenfetch'
+#sudo add-apt-repository -y 'ppa:djcj/screenfetch'
 
 # Install Other Essential Tools
-$PM_INSTALL lsb-release screenfetch
+#$PM_INSTALL lsb-release screenfetch
 
 # Install Timeshift
-$SCRIPTPATH/install_timeshift.sh
+#$SCRIPTPATH/install_timeshift.sh
 
 # Return to where we started
 cd $OPWD