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"