Merge branch 'master' of https://io.monkeybox.org/git/fdamstra/MyEnvironment

.bash_aliases

@@ -4,3 +4,6 @@ alias highstate="salt --force-color '*' state.highstate test=true | less -R; ech
 alias highstate.yes="salt --force-color '*' state.highstate | less -R"
 alias salt="salt --force-color"
 
+# CaC Servers
+alias bigubuntu1='ssh -l root bigubuntu1.monkeybox.org'
+alias splunk='ssh root@splunk.monkeybox.org'

.bashrc

@@ -58,6 +58,8 @@ fi
 
 if [ "$color_prompt" = yes ]; then
     PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ '
+    # Also do color ls
+    export CLICOLOR=true
 else
     PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\$ '
 fi
@@ -131,6 +133,9 @@ source ~/.bash/git-completion.bash
 # Add autocompletion for aws
 [ -x /usr/local/bin/aws_completer ] && complete -C aws_completer aws
 
+## iTerm integration
+#[ -f ~/.iterm2_shell_integration.bash ] && source ~/.iterm2_shell_integration.bash
+
 # Additional possible paths
 [ -d /usr/local/heroku/bin ] && export PATH="/usr/local/heroku/bin:$PATH"
 [ -d $GOPATH/bin ] && export PATH="$GOPATH/bin:$PATH"
@@ -139,4 +144,9 @@ source ~/.bash/git-completion.bash
 # Make less allow colors
 export LESS="-R"
 
+eval $(thefuck --alias)
+
+export ANSIBLE_INVENTORY=~/ansible/ansible_hosts
+export ANSIBLE_HOST_KEY_CHECKING=False
 
+[[ $(type -P fortune) ]] && [[ $(type -P cowsay) ]] && [[ $(type -P lolcat) ]] && fortune | cowsay | lolcat