Merging local changes

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.
+ )

home/.gitconfig

@@ -5,3 +5,5 @@
 	helper = cache --timeout=21600
 [push]
 	default = simple
+[core]
+	autocrlf = input

home/.zshrc

@@ -19,7 +19,21 @@ 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=(
+    fedora
+    systemd 
+    common-aliases 
+    history 
+    per-directory-history 
+    screen 
+    tmux 
+    docker 
+    docker-compose 
+    wd 
+    git 
+    git-extras 
+    mercurial
+)
 
 # Let's update and do other goodness
 source $ZSH/oh-my-zsh.sh
@@ -30,8 +44,8 @@ export LANG=en_US.UTF-8
 # All Hail EMACS
 export EDITOR='emacsclient -a vim'
 
-# Make sure ~/bin is on the path
-export PATH="$HOME/bin:$PATH"
+# Make sure ~/,local/bin and ~/bin are on the path
+export PATH="$$HOME/.local/bin:$HOME/bin:$PATH"
 
 # Add something to something else
 # $1 is the original value being appended to
@@ -45,6 +59,8 @@ function append_if_exists() {
     echo $result
 }
 
+alias fprobe="ffprobe -v quiet -print_format json -show_format -show_streams"
+
 # Alias to emacsclient
 # fall back on vim if emacs isn't started
 alias ec="emacsclient -a vim"
@@ -64,6 +80,10 @@ fi
 export GOPATH="$HOME/go"
 export PATH="$PATH:$HOME/go/bin"
 
+# Rust Setup
+export CARGO_HOME="$HOME/.cargo"
+export PATH="$PATH:$CARGO_HOME/bin"
+
 # CL Setup
 # if SBCL is installed point to that path
 sbcl_bin="$(which sbcl 2> /dev/null | head -n 1)"
@@ -76,6 +96,10 @@ if [ -f "$HOME/.update_dotfiles.sh" ]; then
     /usr/bin/env sh $HOME/.update_dotfiles.sh
 fi
 
+if [ -d "$HOME/.ansible" ]; then
+    export ANSIBLE_CONFIG="$HOME/.ansible/ansible.cfg"
+fi
+
 # rbenv setup
 # # doesn't work under msys
 if [ -d "$HOME/.rbenv" ] && [ -z "$MSYSTEM" ]; then
@@ -111,3 +135,5 @@ 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
+
+export PATH="/usr/share/haxe/lib:$PATH"