Merge branch 'mac-config' into combined-config

.gitmodules

@@ -28,3 +28,15 @@
 [submodule "vim/.vim/bundle/alchemist"]
 	path = vim/.vim/bundle/alchemist
 	url = https://github.com/slashmili/alchemist.vim
+[submodule "vim/.vim/bundle/vim-css-color"]
+	path = vim/.vim/bundle/vim-css-color
+	url = https://github.com/ap/vim-css-color
+[submodule "vim/.vim/bundle/vim-terraform"]
+	path = vim/.vim/bundle/vim-terraform
+	url = https://github.com/hashivim/vim-terraform.git
+[submodule "vim/.vim/bundle/ctrlp"]
+	path = vim/.vim/bundle/ctrlp
+	url = https://github.com/ctrlpvim/ctrlp.vim
+[submodule "vim/.vim/bundle/vim-gitgutter"]
+	path = vim/.vim/bundle/vim-gitgutter
+	url = https://github.com/airblade/vim-gitgutter

bash/.profile

@@ -33,7 +33,9 @@ restart_network_manager() {
 set_prompt
 
 # makes ls print pretty
-alias ls="ls --color=auto"
+#alias ls="ls --color=auto"
+# TODO: make this work on both platforms
+alias ls="ls -G"
 
 # default editor
 export EDITOR=vim
@@ -61,3 +63,8 @@ export JAVA_HOME=/usr/lib/jvm/java-1.8.0-openjdk-amd64
 source $HOME/.asdf/asdf.sh
 source $HOME/.asdf/completions/asdf.bash
 
+source $HOME/.install/google-cloud-sdk/completion.bash.inc
+source $HOME/.install/google-cloud-sdk/path.bash.inc
+
+[ -f /usr/local/etc/bash_completion ] && . /usr/local/etc/bash_completion
+

config.sh

@@ -3,6 +3,7 @@
 stow -t ~ bash
 stow -t ~ screen
 stow -t ~ vim
+stow -t ~ slate
 
 #rm -f .screenrc
 #ln -s ~/Code/config/screenrc .screenrc

slate/.slate

@@ -0,0 +1,103 @@
+# This is my modified .slate file.
+# It is based off the default (https://raw.githubusercontent.com/jigish/slate/master/Slate/default.slate)
+# as well as pdilyard's (https://github.com/pdilyard/dotfiles/blob/master/.slate).
+
+config defaultToCurrentScreen true
+config nudgePercentOf screenSize
+config resizePercentOf screenSize
+
+# set screens
+alias macbook 1680x1050
+alias monitor 3008x1692
+
+# variables
+alias width screenSizeX
+alias height screenSizeY
+alias originX screenOriginX
+alias originY screenOriginY
+
+alias oneThirdWidth ${width}/3
+alias oneHalfWidth ${width}/2
+alias twoThirdsWidth (${oneThirdWidth}*2)
+alias oneHalfHeight ${height}/2
+
+# positions
+alias full move ${originX};${originY} ${width};${height}
+
+alias leftHalf move ${originX};${originY} ${oneHalfWidth};${height}
+alias rightHalf move (${originX}+${oneHalfWidth});${originY} ${oneHalfWidth};${height}
+
+alias topHalf move ${originX};${originY} ${width};${oneHalfHeight}
+alias bottomHalf move ${originX};${originY}+${oneHalfHeight} ${width};${oneHalfHeight}
+
+alias leftOneThird move ${originX};${originY} ${oneThirdWidth};${height}
+alias leftTwoThirds move ${originX};${originY} ${twoThirdsWidth};${height}
+alias centerOneThird move ${originX} + ${oneThirdWidth};${originY} ${oneThirdWidth};${height}
+alias rightTwoThirds move (${originX}+${oneThirdWidth});${originY} ${twoThirdsWidth};${height}
+alias rightOneThird move (${originX}+${twoThirdsWidth});${originY} ${oneThirdWidth};${height}
+
+# static positions
+alias macbookFull ${full} ${macbook}
+
+alias monitorFull ${full} ${monitor}
+alias monitorLeft ${leftHalf} ${monitor}
+alias monitorRight ${rightHalf} ${monitor}
+
+# keybinding alias
+alias movetrigger cmd,alt
+alias extramovetrigger shift,cmd,alt
+alias apptrigger ctrl,shift
+
+# quick switching to commonly used apps
+bind space:${apptrigger} focus 'iTerm2'
+bind t:${apptrigger} focus 'iTerm2'
+bind c:${apptrigger} focus 'Google Chrome'
+bind s:${apptrigger} focus 'Slack'
+
+# movement keys
+bind f:${movetrigger} ${full}
+bind left:${movetrigger} ${leftHalf}
+bind right:${movetrigger} ${rightHalf}
+bind up:${movetrigger} ${topHalf}
+bind down:${movetrigger} ${bottomHalf}
+bind left:${extramovetrigger} ${leftOneThird}
+bind right:${extramovetrigger} ${rightOneThird}
+bind up:${extramovetrigger} ${leftTwoThirds}
+bind down:${extramovetrigger} ${rightTwoThirds}
+
+# move to other monitors
+bind left:shift,ctrl,cmd throw 0 resize
+bind right:shift,ctrl,cmd throw 1 resize
+
+# laptop layout for coding
+layout laptop-coding 'iTerm2':REPEAT ${full}
+layout laptop-coding 'Google Chrome':REPEAT ${full}
+layout laptop-coding 'Slack':REPEAT ${full}
+
+# laptop layout for code review
+layout laptop-code-review 'iTerm2':REPEAT ${rightHalf}
+layout laptop-code-review 'Google Chrome':REPEAT ${leftHalf}
+layout laptop-coding 'Slack':REPEAT ${full}
+
+# in-the-office layout for coding
+layout office-coding 'iTerm2':REPEAT ${monitorFull}
+layout office-coding 'Google Chrome':REPEAT ${macbookFull}
+layout office-coding 'Slack':REPEAT ${macbookFull}
+
+# in-the-office layout for code review
+layout office-code-review 'iTerm2':REPEAT ${monitorRight}
+layout office-code-review 'Google Chrome':REPEAT ${monitorLeft}
+layout office-code-review 'Slack':REPEAT ${macbookFull}
+
+# default layouts
+default laptop-coding resolutions:${macbook}
+default office-coding resolutions:${macbook},${monitor}
+
+# bind layouts to keys
+bind 1:${movetrigger} layout office-coding
+bind 2:${movetrigger} layout office-code-review
+bind 3:${movetrigger} layout laptop-coding
+bind 4:${movetrigger} layout laptop-code-review
+
+
+

vim/.vim/bundle/ctrlp

@@ -0,0 +1 @@
+Subproject commit bde7a2950adaa82e894d7bdf69e3e7383e40d229

vim/.vim/bundle/vim-css-color

@@ -0,0 +1 @@
+Subproject commit 2411b84298eb6db034001f35ce7cc32c36f9b43b

vim/.vim/bundle/vim-gitgutter

@@ -0,0 +1 @@
+Subproject commit 1e60667322b7cd1bfcba98762fbba746a888d21a

vim/.vim/bundle/vim-terraform

@@ -0,0 +1 @@
+Subproject commit 2d9343c7165acbb6225017a9da8baf63bbd27a26

vim/.vim/vimrc

@@ -35,7 +35,7 @@ SetupTabbing
 autocmd FileType tex set wrap spell
 autocmd FileType make set noexpandtab
 autocmd FileType python SetupTabbing
-autocmd FileType markdown set wrap spell
+autocmd FileType markdown set wrap
 
 let java_allow_cpp_keywords=1
 
@@ -61,10 +61,12 @@ let NERDTreeIgnore = ['\.pyc$']
 "
 "" I think this is some command for OS X compatibility? I don't know. Leaving
 "" it here so that I can find it later if I need it.
-"set term=xterm-color
+set term=xterm-color
 set t_Co=256
 
-colorscheme 256-grayvim
+"colorscheme 256-grayvim
+colorscheme gentooish
+
 "
 " fixes webpack file watchers
 set backupcopy=yes
@@ -81,3 +83,6 @@ au FileChangedShell * checktime
 au CursorHold * checktime
 au CursorHoldI * checktime
 
+let g:ctrlp_map = '<c-p>'
+let g:ctrlp_cmd = 'CtrlP'
+