Handle yaml files

bashrc

@@ -39,12 +39,28 @@ if [ -x "$(command -v kubectl)" ]; then
     source <(kubectl completion bash)
 fi
 
-kc() {
-    local cluster=${1:-"testcluster5.aws.kasten.io"}
-    kops export kubecfg --state s3://aws-kasten-io-state-store --name "${cluster}"
-}
-
-kns() {
-    local ns=${1:-"default"}
-    kubectl config set-context $(kubectl config current-context) --namespace="${ns}"
-}
+alias kl="kubectl"
+alias kx="kubectx"
+alias kns="kubens"
+
+
+export PATH="$PATH:${HOME}/src/go/bin"
+export GOPATH="${HOME}/src/k10/go"
+
+#export GOPATH="${HOME}/src/go"
+export GOBIN="${GOPATH}/bin"
+export GOROOT="/usr/local/lib/go"
+export GO_EXTLINK_ENABLED=0 
+export CGO_ENABLED=0
+
+export PATH=$PATH:${GOBIN}
+
+source <(awskeys use tom)
+export AWS_DEFAULT_REGION="us-west-2"
+
+alias xclip="xclip -selection c"
+
+export EDITOR=vim
+
+source ~/.github_token
+

gitconfig

@@ -6,10 +6,13 @@
 	excludesfile = ~/.gitignore
 [push]
     default = simple
+[merge]
+	tool = vimdiff
 [diff]
 	tool = vimdiff
 [difftool]
 	prompt = false
 [alias]
 	ls = for-each-ref --sort=-committerdate refs/heads/ --format='%(committerdate:short) %(refname:short)'
     glog = log --all --pretty='format:%d %Cgreen%h%Creset %an - %s' --graph
+    mbm = merge-base master HEAD

vimrc

@@ -330,10 +330,12 @@ func! DeleteTrailingWS()
   exe "normal `z"
 endfunc
 autocmd BufWrite *.py :call DeleteTrailingWS()
+autocmd BufWrite *.yaml :call DeleteTrailingWS()
 autocmd BufWrite *.java :call DeleteTrailingWS()
 autocmd BufWrite *.sh :call DeleteTrailingWS()
 autocmd BufWrite *.pp :call DeleteTrailingWS()
 autocmd BufWrite *.rb :call DeleteTrailingWS()
+autocmd BufWrite *.rst :call DeleteTrailingWS()
 
 set guitablabel=%t
 
@@ -463,6 +465,11 @@ set foldnestmax=2
 set expandtab
 
 
+au FileType yaml set expandtab
+au FileType yaml set shiftwidth=2
+au FileType yaml set tabstop=2
+au FileType yaml set foldmethod=manual
+
 au FileType python set expandtab
 au FileType python set shiftwidth=4
 au FileType python set tabstop=4