Removing more strap configuration, got some basic dotbot stuff setup

.gitmodules

@@ -0,0 +1,4 @@
+[submodule "dotbot"]
+	path = dotbot
+	url = https://github.com/anishathalye/dotbot
+	ignore = dirty

.zshrc

@@ -18,15 +18,9 @@ autoload -U +X bashcompinit && bashcompinit
 autoload -U +X compinit && compinit
 
 # Check if given file exists. If true, source the file
-# [[ -s "$HOME/.zsh/custom_aliases.zsh" ]] && source "$HOME/.zsh/custom_aliases.zsh"
+[[ -s "$HOME/.zsh/custom_aliases.zsh" ]] && source "$HOME/.zsh/custom_aliases.zsh"
 
-# Checking for a work-specific folder (which won't be checked into Git) and then sourcing it
-# [[ -d "$HOME/.zsh/work" ]] && [-[ -s "$HOME/.zsh/work/init.zsh" ]] && source "$HOME/.zsh/work/init.zsh"
-
-# Checking for a home-specific folder (which won't be checked into Git) and then sourcing it
-[[ -d "$HOME/.zsh/home" ]] && [[ -s "$HOME/.zsh/home/init.zsh" ]] && source "$HOME/.zsh/home/init.zsh"
-
-# source $HOME/.zsh/install "git gpg-agent ripgrep tmux colored-man-pages fzf vscode gh aws kubectl helm"
+source $HOME/.zsh/install "git gpg-agent ripgrep tmux colored-man-pages fzf vscode gh aws kubectl helm"
 
 # Adding krew to path
 # export PATH="${KREW_ROOT:-$HOME/.krew}/bin:$PATH"

README.md

@@ -1,20 +1,5 @@
-# Setup
-
-## From A Fresh Install
+# ProfMoo's Dotfiles
 
 ```bash
-sh -c "$(curl -fsSL https://raw.githubusercontent.com/ProfMoo/.dotfiles/master/run)"
+./install
 ```
-
-## If You've Already Checked Out The Repository
-
-```bash
-./run
-```
-
-## TODO
-
-1. Provide .vscode configuration
-2. Auto-format files
-3. Figure out `.zsh_history` so that it works as expected (ex: what happens when you use kubie?)
-4. Make everything idempotent (and not just fail if it's already been done)

install

@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+
+set -e
+
+CONFIG="install.conf.yaml"
+DOTBOT_DIR="dotbot"
+
+DOTBOT_BIN="bin/dotbot"
+BASEDIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+
+cd "${BASEDIR}"
+git -C "${DOTBOT_DIR}" submodule sync --quiet --recursive
+git submodule update --init --recursive "${DOTBOT_DIR}"
+
+"${BASEDIR}/${DOTBOT_DIR}/${DOTBOT_BIN}" -d "${BASEDIR}" -c "${CONFIG}" "${@}"

install.conf.yaml

@@ -0,0 +1,12 @@
+- defaults:
+    link:
+      create: true
+      relink: true
+- shell:
+    - [sh pre-install.sh, Running pre installation script]
+- link:
+    ~/.zshrc:
+      force: true
+      path: .zshrc
+- shell:
+    - [git submodule update --init --recursive, Installing submodules]

pre-install

@@ -0,0 +1,28 @@
+#!/bin/bash
+
+# Check if oh-my-zsh is installed
+OMZDIR="$HOME/.oh-my-zsh"
+if [ ! -d "$OMZDIR" ]; then
+    echo 'Installing oh-my-zsh...'
+    /bin/sh -c "$(curl -fsSL https://raw.github.com/robbyrussell/oh-my-zsh/master/tools/install.sh)"
+    echo 'Completed installing oh-my-zsh.'
+else
+    echo 'Updating oh-my-zsh'
+    upgrade_oh_my_zsh
+fi
+
+if ! hash zsh 2>/dev/null; then
+    echo "zsh isn't installed. Installing now..."
+    sudo apt install -y zsh
+    echo "Completed installing zsh."
+else
+    echo "zsh already installed."
+fi
+
+# Change currenly running shell
+if [ -z "$ZSH_NAME"]; then
+    echo 'Changing default shell to zsh'
+    chsh -s /bin/zsh
+else
+    echo 'Already using zsh'
+fi

script/strap-after-setup

@@ -5,8 +5,6 @@ __dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 
 code --install-extension shan.code-settings-sync
 
-source ${__dir}/macos_setup
-
 source ${__dir}/tmux_setup
 
 source ${__dir}/kubernetes_setup