some fixes for my attempt to install

.gitmodules

@@ -1,9 +1,3 @@
-[submodule "tmux-MacOSX-pasteboard"]
-	path = tools/osx/iTerm2-Color-Schemes
-	url = git://github.com/mbadolato/iTerm2-Color-Schemes.git
-[submodule "iTerm2-Color-Schemes"]
-	path = tools/osx/iTerm2-Color-Schemes
-	url = git://github.com/mbadolato/iTerm2-Color-Schemes.git
 [submodule "powerline-fonts"]
 	path = tools/powerline/powerline-fonts
 	url = git://github.com/Lokaltog/powerline-fonts.git
@@ -19,3 +13,9 @@
 [submodule "polybar-scripts"]
 	path = tools/polybar/polybar-scripts
 	url = git://github.com/polybar/polybar-scripts.git
+[submodule "tools/osx/tmux-MacOSX-pasteboard"]
+	path = tools/osx/tmux-MacOSX-pasteboard
+	url = git://github.com/ChrisJohnsen/tmux-MacOSX-pasteboard.git
+[submodule "tools/osx/iTerm2-Color-Schemes"]
+	path = tools/osx/iTerm2-Color-Schemes
+	url = git://github.com/mbadolato/iTerm2-Color-Schemes.git

installers/base.sh

@@ -40,7 +40,7 @@ export HOME=${HOME_DIR};
 
 echo "installing dot files from ${BASE_DIR} into ${HOME_DIR}...";
 
-mkdir -p ${HOME_DIR}/Projects;
+mkdir -p ${HOME_DIR}/projects;
 mkdir -p ${HOME_DIR}/Downloads;
 mkdir -p ${HOME_DIR}/Desktop;
 mkdir -p ${HOME_DIR}/Documents/Pictures/Wallpapers;
@@ -141,4 +141,4 @@ pushd ${HOME}/.config/vim/
 rake
 popd
 
-find ${HOME} ! -path "${HOME}/Projects" ! -path "${HOME}" | xargs -I {} chown $@ {};
+find ${HOME} ! -path "${HOME}/projects" ! -path "${HOME}" | xargs -I {} chown $@ {};

src/.config/tmux/.tmux.conf

@@ -10,7 +10,7 @@
 set -g default-command "/bin/bash --login"
 set -g default-shell "/bin/bash"
 
-source ~/tools/powerline/powerline/powerline/bindings/tmux/powerline.conf
+source ~/projects/laughing-hipster/tools/powerline/powerline/powerline/bindings/tmux/powerline.conf
 
 set -g default-terminal "screen-256color"
 

src/.config/vim/.vimrc

@@ -35,6 +35,7 @@ set backupcopy=yes
 set autoread
 set selection=exclusive
 set ttimeoutlen=50
+" set termguicolors
 " Use the OS clipboard by default (on versions compiled with `+clipboard`)
 set clipboard=unnamedplus
 " Enhance command-line completion
@@ -60,13 +61,13 @@ set t_Co=256
 
 " Centralize backups, swapfiles and undo history
 if exists("&backupdir")
-  set backupdir=~/tools/vim/backups
+  set backupdir=~/.config/vim/backups/
 endif
 if exists("&directory")
-  set directory=~/tools/vim/swaps
+  set directory=~/.config/vim/swaps/
 endif
 if exists("&undodir")
-  set undodir=~/tools/vim/undo
+  set undodir=~/.config/vim/undo/
 endif
 
 " Respect modeline in files

src/.githooks/pre-commit

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-if [ -f "$PWD/makefile" ] && [ ! -z "$(cat $PWD/makefile | grep 'lint:')" ]; then
+if [ -f "$PWD/makefile" ] && [ ! -z "$(cat $PWD/makefile | grep '^lint:')" ]; then
     echo "lint rule found in $PWD/makefile..."
     make lint
 elif [ -f "$PWD/package.json" ] && [ ! -z "$(cat $PWD/package.json | grep '\"lint\"')" ]; then
@@ -8,7 +8,7 @@ elif [ -f "$PWD/package.json" ] && [ ! -z "$(cat $PWD/package.json | grep '\"lin
     npm run lint
 fi
 
-if [ -f "$PWD/makefile" ] && [ ! -z "$(cat $PWD/makefile | grep 'test:')" ]; then
+if [ -f "$PWD/makefile" ] && [ ! -z "$(cat $PWD/makefile | grep '^test:')" ]; then
     echo "test rule found in $PWD/makefile..."
     make test
 elif [ -f "$PWD/package.json" ] && [ ! -z "$(cat $PWD/package.json | grep '\"test\"')" ]; then

src/.profile

@@ -7,11 +7,6 @@ case $- in
 esac
 
 
-# source environment settings
-if [ -f ~/.environment ]; then
-     . ~/.environment
-fi
-
 # for when you want to do custom junk
 # Sources a folder with shell extensions
 if [ -d ~/.shell_extensions ]; then
@@ -22,6 +17,12 @@ if [ -d ~/.shell_extensions ]; then
   done
 fi
 
+# source environment settings
+if [ -f ~/.environment ]; then
+     . ~/.environment
+fi
+
 if [ -f "./.motd" ]; then
     source .motd
 fi
+

src/.shell_extensions/environment.sh

@@ -48,7 +48,7 @@ if [ -d "/c/Windows" ]; then
     . ~/.windows
   fi
 else
-  export GOPATH=~/Projects/go
+  export GOPATH=~/projects/go
   export DOTNETPATH=~/.dotnet/
 fi
 

tools/osx/iTerm2-Color-Schemes

@@ -1 +1 @@
-Subproject commit b0f0c7ec94f7cb6061639f8121a2cb1009c20627
+Subproject commit 9a961a3451d25628f20d09f464bc4a77ce640f6c