From 8c5a9fb0cd7fa961dc8f01942b7372b0a0a1bbce Mon Sep 17 00:00:00 2001
From: Nicole Tietz-Sokolskaya <me@ntietz.com>
Date: Fri, 15 Sep 2017 10:49:29 -0400
Subject: [PATCH] Add macbook configuration

---
 bash/.profile  |  6 ++++-
 config.sh      |  1 +
 slate/.slate   | 70 ++++++++++++++++++++++++++++++++++++++++++++++++++
 vim/.vim/vimrc |  6 +++--
 4 files changed, 80 insertions(+), 3 deletions(-)
 create mode 100644 slate/.slate

diff --git a/bash/.profile b/bash/.profile
index c722b31..576331e 100644
--- a/bash/.profile
+++ b/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,5 @@ export JAVA_HOME=/usr/lib/jvm/java-1.8.0-openjdk-amd64
 source $HOME/.asdf/asdf.sh
 source $HOME/.asdf/completions/asdf.bash
 
+[ -f /usr/local/etc/bash_completion ] && . /usr/local/etc/bash_completion
+
diff --git a/config.sh b/config.sh
index ef5f7ea..fc0f38a 100755
--- a/config.sh
+++ b/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
diff --git a/slate/.slate b/slate/.slate
new file mode 100644
index 0000000..1c7ca5c
--- /dev/null
+++ b/slate/.slate
@@ -0,0 +1,70 @@
+# 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
+
+# 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}
+
+# 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}
+
+# 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}
+
+# bind layouts to keys
+bind 1:${movetrigger} layout laptop-coding
+bind 2:${movetrigger} layout laptop-code-review
+
diff --git a/vim/.vim/vimrc b/vim/.vim/vimrc
index 0f00e13..0dff432 100644
--- a/vim/.vim/vimrc
+++ b/vim/.vim/vimrc
@@ -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