Merge branch 'master' of https://github.com/timmermansjoy/dotfiles

basic/shell/index.zsh

@@ -78,8 +78,3 @@ zstyle ':completion:*' insert-tab pending
 source $DOTFILES/basic/shell/custom.sh
 
 chpwd() ls -F
-
-
-
-
-plugins=(zsh-autosuggestions)

scripts/dependencies-install-linux.sh

@@ -1,30 +1,26 @@
 #!/bin/bash
-#
+
+sudo apt update
+
 # run all dotfiles installers
 export DOTFILES="$HOME/.dotfiles"
 
-sudo apt update
+cd "$(dirname "$0")"/.. || exit
+find -H "$DOTFILES" -maxdepth 4 -name 'install.sh' -not -path '*.git*' -exec sh -c 'FILE="$1"; "$FILE"' _ {} \;
 
-#zsh autosugest
-git clone https://github.com/zsh-users/zsh-autosuggestions ~/.zsh/zsh-autosuggestions
+info "adding zsh extensions"
+git clone https://github.com/zsh-users/zsh-autosuggestions.git ~/.oh-my-zsh/custom/plugins/zsh-autosuggestions
+git clone https://github.com/zsh-users/zsh-syntax-highlighting.git ~/.oh-my-zsh/custom/plugins/zsh-syntax-highlighting
 
 info "adding vscode repo"
 wget -q https://packages.microsoft.com/keys/microsoft.asc -O- | sudo apt-key add -
 sudo add-apt-repository "deb [arch=amd64] https://packages.microsoft.com/repos/vscode stable main"
 
-info "installing docker"
-sudo apt install -y apt-transport-https ca-certificates curl software-properties-common
-curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
-sudo add-apt-repository -y "deb [arch=amd64] https://download.docker.com/linux/ubuntu bionic stable"
-sudo apt update
-sudo apt install -y docker-ce
-sudo usermod -aG docker "${USER}"
-
 info "install the packages inside specific/linux/packages.txt"
-xargs sudo apt -y -qq install <~/.dotfiles/specific/linux/packages.txt
+xargs sudo apt -y -qq install < ~/.dotfiles/specific/linux/packages.txt
+
+info "installing lambda stack"
+wget -nv -O- https://lambdalabs.com/install-lambda-stack.sh | sh -
+
 
-# run all dotfiles installers
-export DOTFILES="$HOME/.dotfiles"
 
-cd "$(dirname "$0")"/.. || exit
-find -H "$DOTFILES" -maxdepth 4 -name 'install.sh' -not -path '*.git*' -exec sh -c 'FILE="$1"; "$FILE"' _ {} \;

scripts/dotfiles-install.sh

@@ -138,18 +138,18 @@ else
   fail "error installing dependencies"
 fi
 
-#install packages on linux
-# if [[ "$(uname)" == "Linux" ]]; then
-#   info "installing packages"
-#   if source ~/.dotfiles/scripts/dependencies-install-linux.sh
-#   then
-#     success "packages installed"
-#     info "setting zsh as default shell"
-#     chsh -s "$(command -v zsh)"
-#   else
-#     fail "error installing dependencies"
-#   fi
-# fi
+install packages on linux
+if [[ "$(uname)" == "Linux" ]]; then
+  info "installing packages"
+  if source ~/.dotfiles/scripts/dependencies-install-linux.sh
+  then
+    success "packages installed"
+    info "setting zsh as default shell"
+    chsh -s "$(command -v zsh)"
+  else
+    fail "error installing dependencies"
+  fi
+fi
 
 info "setting up ssh"
 if [[ ! -f ~/.ssh/id_rsa ]]; then

specific/homebrew/install.sh

@@ -5,6 +5,8 @@
 # This installs some of the common dependencies needed (or at least desired)
 # using Homebrew.
 
+if [[ "$(uname)" == "Darwin" ]]; then
+
 # Check for Homebrew
 if test ! "$(command -v brew)"; then
   echo "  Installing Homebrew for you."
@@ -19,3 +21,5 @@ brew bundle --file="~/.dotfiles/specific/homebrew/Brewfile"
 # For debugging
 # brew bundle --verbose --file="specific/homebrew/Brewfile"
 exit 0
+
+fi

specific/linux/packages.txt

@@ -3,5 +3,4 @@ vim
 tmux
 htop
 neofetch
-zsh-syntax-highlighting
 code

specific/oh-my-zsh/index.zsh

@@ -15,6 +15,6 @@ if [[ "$(uname)" == "Darwin" ]]; then
 fi
 # Link zsh plugin in linux
 if [[ "$(uname)" == "Linux" ]]; then
-  source /usr/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
-  source ~/.zsh/zsh-autosuggestions/zsh-autosuggestions.zsh
+  source ~/.oh-my-zsh/custom/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
+  source ~/.oh-my-zsh/custom/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh
 fi