Updates from work

.bash_aliases

@@ -1,5 +1,5 @@
 # Systems
-alias io="ssh fdamstra@10.42.42.2"
+alias io="ssh fdamstra@192.168.1.100"
 alias salt-master="ssh fdamstra@salt-master.home.monkeybox.org"
 alias centosplay="ssh fdamstra@centosplay.home.monkeybox.org"
 
@@ -13,9 +13,15 @@ if [[ "$(uname -s)" == "Linux" ]]; then
   alias keybase="keybase --standalone"
 fi
 
-# OS X Only
-if [[ "$(uname -s)" == "Darwin" ]]; then
-  # Terraform switching (OS X Only, for now)
-  alias tf11="tfswitch 0.11.13"
-  alias tf12="tfswitch 0.12.24"
+if [[ -x `which bw` ]]; then
+  alias bwlogin='bw login --raw > ~/.bw_session'
+  alias bwunlock='bw unlock --raw > ~/.bw_session'
 fi
+
+# Git shortcuts
+alias clean='for i in `git branch -l | grep -v master | grep -v develop`; do git branch -d $i; done'
+alias fetch='git fetch --all --prune'
+
+alias govcloud='saml2aws --skip-prompt -a govcloud login'
+alias commercial='saml2aws --skip-prompt -a commercial login'
+alias saml='saml2aws --skip-prompt -a commercial login && saml2aws --skip-prompt -a govcloud login && sft list-servers'

.bashrc

@@ -137,6 +137,10 @@ if [ -d ~/bin ]; then
   export PATH=$PATH:~/bin
 fi
 
+if [ -d ~/xdr-terraform-live/bin ]; then
+  export PATH=$PATH:~/xdr-terraform-live/bin
+fi
+
 # Add autocompletion for git
 source ~/.bash/git-completion.bash
 
@@ -229,7 +233,19 @@ if [[ "$(uname -s)" == "Darwin" ]]; then
   echo
 fi
 
-alias splunk='ssh fred@3.80.49.68'
+#if [[ -x `which bw` ]]; then
+#  export LANG=en_CA.UTF-8;export LOCALE=en_CA.UTF-8; `which bw` slab
+#fi
+
+export TF_PLUGIN_CACHE_DIR=~/.terraform.d/plugin-cache
+[[ -d "$TF_PLUGIN_CACHE_DIR" ]] || mkdir -p $TF_PLUGIN_CACHE_DIR
+
+# Better colors
+export LSCOLORS="gxfxcxdxbxegedabagacad"
+
+# Disable bell for tab completion
+#bind 'set bell-style none'
+
 echo ""
 echo "Reminder: Use command-shift-s to save your window arrangement, command-shift-r to restore."
 echo ""

.vimrc

@@ -80,7 +80,7 @@ Plugin 'gmarik/Vundle.vim'
 Plugin 'vim-scripts/indentpython.vim'
 Plugin 'hashivim/vim-terraform'
 Plugin 'vim-syntastic/syntastic'
-Plugin 'juliosueiras/vim-terraform-completion'
+"Plugin 'juliosueiras/vim-terraform-completion'
 Plugin 'saltstack/salt-vim'
 
 " All of your Plugins must be added before the following line
@@ -125,6 +125,12 @@ au BufNewFile,BufRead *.js, *.html, *.css
 au BufNewFile,BufRead *.sls
     \ set filetype=sls
 
+"au BufNewFile,BufRead *.hcl, *.tf
+"    \ set filetype=terraform
+
+"au BufNewFile,BufRead *.md, *.MD
+"    \ set filetype=markdown
+
 " Flag bad whitespace
 " I hate this because it highlights while i'm writing
 "highlight BadWhitespace ctermfg=16 ctermbg=253 guifg=#000000 guibg=#F8F8F0
@@ -135,3 +141,5 @@ let g:terraform_align=1
 let g:terraform_fmt_on_save=0
 let g:syntastic_python_python_exec = 'python3'
 let g:syntastic_python_checkers = ['python']
+
+au BufRead * normal zR