From 4e8f822ff21761adb4867a4f88f26ff81344ed3b Mon Sep 17 00:00:00 2001
From: Drew Short <warrick@sothr.com>
Date: Fri, 12 Oct 2018 13:18:53 -0500
Subject: [PATCH 1/2] Updating dotfiles

---
 home/.emacs.d/init.el |  6 ++++++
 home/.gitconfig       |  2 ++
 home/.zshrc           | 18 +++++++++++++++++-
 3 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/home/.emacs.d/init.el b/home/.emacs.d/init.el
index eee4a9a..50888f3 100644
--- a/home/.emacs.d/init.el
+++ b/home/.emacs.d/init.el
@@ -190,3 +190,9 @@
    (quote
     (org-doing org-bullets org-autolist org-ac better-defaults yaml-mode slime rust-mode projectile markdown-mode magit go-mode gist cyberpunk-theme auto-complete))))
 
+(custom-set-faces
+ ;; custom-set-faces was added by Custom.
+ ;; If you edit it by hand, you could mess it up, so be careful.
+ ;; Your init file should contain only one such instance.
+ ;; If there is more than one, they won't work right.
+ )
diff --git a/home/.gitconfig b/home/.gitconfig
index 6558656..4faad6f 100644
--- a/home/.gitconfig
+++ b/home/.gitconfig
@@ -5,3 +5,5 @@
 	helper = cache --timeout=21600
 [push]
 	default = simple
+[core]
+	autocrlf = input
diff --git a/home/.zshrc b/home/.zshrc
index f27200e..f6928ac 100644
--- a/home/.zshrc
+++ b/home/.zshrc
@@ -19,7 +19,7 @@ export ZSH_TMUX_AUTOSTART=false
 export ZSH_TMUX_AUTOSTART_ONCE=true
 
 # Used zsh plugins
-plugins=(archlinux systemd common-aliases history screen tmux wd git git-extras mercurial)
+plugins=(archlinux systemd common-aliases history screen tmux wd git git-extras mercurial zsh-completions)
 
 # Let's update and do other goodness
 source $ZSH/oh-my-zsh.sh
@@ -83,6 +83,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     
@@ -111,3 +120,10 @@ if [ -n "$MSYSTEM" ] && [[ "$MSYSTEM" == "MSYS" ]]; then
     # Make sure msys has our CL on the path
     export PATH=$(append_if_exists $PATH ":" $(dirname "$CL_BIN"))
 fi
+
+# 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"

From 1d7f6009058b41dffcd5a46120fe51467869c772 Mon Sep 17 00:00:00 2001
From: Drew Short <warrick@sothr.com>
Date: Mon, 12 Nov 2018 11:14:28 -0600
Subject: [PATCH 2/2] Updated ubuntu install script. Disabled screenfetch and
 timeshift installers

---
 scripts/installers/install_tools_ubuntu.sh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/scripts/installers/install_tools_ubuntu.sh b/scripts/installers/install_tools_ubuntu.sh
index 332d5f9..7c9335d 100755
--- a/scripts/installers/install_tools_ubuntu.sh
+++ b/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