Merge branch 'master' of https://github.com/Matir/skel

dotfiles/env

@@ -4,18 +4,15 @@ umask 027
 ulimit -c unlimited
 
 # Paths and preferences
-export PATH="$HOME/bin:/sbin:/usr/sbin:$PATH"
 export PYTHONPATH="$HOME/.python:$PYTHONPATH"
 export GOPATH="$HOME/Projects/Go"
+export PATH="$HOME/bin:/sbin:/usr/sbin:$PATH:$GOPATH/bin"
 export VISUAL=vim
 export EDITOR=vim
 export DEBEMAIL="david@systemoverlord.com"
 export DEBFULLNAME="David Tomaschik"
 export LESS="-MR"
 
-# Unconditional because /bin/sh sucks
-export PATH="$PATH:$HOME/.gce/google-cloud-sdk/bin:$HOME/bin/genymotion:$HOME/bin/genymotion/tools:$HOME/bin/google_appengine:$HOME/bin/go_appengine:$HOME/bin/google-cloud-sdk/bin:$GOPATH/bin"
-
 # Fix gnome-terminal
 if [[ $TERM == "xterm" && $COLORTERM == "gnome-terminal" ]] ; then
   export TERM="xterm-256color"

dotfiles/ssh/config

@@ -12,3 +12,8 @@ Host *
 	ForwardX11Trusted	no
 	ServerAliveInterval 120
 	CheckHostIP no
+
+Host warzone
+  Hostname warzone.shadowcats.club
+  Port 22
+  User matir

dotfiles/vimrc

@@ -148,4 +148,4 @@ autocmd Syntax * syn match ExtraWhitespace /\s\+$\| \+\ze\t/ containedin=ALL
 
 " Color column at end of lines
 set colorcolumn=+1
-highlight ColorColumn ctermbg=lightgrey guibg=lightgrey
+highlight ColorColumn ctermbg=black guibg=lightgrey

dotfiles/zsh_custom/plugins/gcloud/gcloud.plugin.zsh

@@ -0,0 +1,17 @@
+#!/bin/zsh
+
+GCL=${HOME}/tools/gcloud
+
+if [ ! -d ${GCL} ] ; then
+  return
+fi
+
+# Add bin to path
+export PATH="${PATH}:${GCL}/bin"
+
+# Load completion
+source ${GCL}/completion.zsh.inc
+
+which kubectl 2>/dev/null >&2 && \
+  source <(kubectl completion zsh) || \
+  true

dotfiles/zshrc

@@ -29,7 +29,7 @@ if [ -d $HOME/.oh-my-zsh ] ; then
   ZSH=$HOME/.oh-my-zsh
   ZSH_THEME="matir"
   ZSH_CUSTOM="$HOME/.zsh_custom"
-  plugins=(encode64 gpg-agent pep8 pip python tmux urltools extract sudo virsh virtualenv jekyll)
+  plugins=(encode64 gpg-agent pep8 pip python tmux urltools extract sudo virsh virtualenv jekyll metasploit gcloud)
   test -f /usr/share/virtualenvwrapper/virtualenvwrapper.sh && plugins+=(virtualenvwrapper)
   source $ZSH/oh-my-zsh.sh
   unset ZSH_THEME