fix gitmodules finally, update configs

src/.config/tmux/.tmux.conf

@@ -10,19 +10,18 @@
 set -g default-command "/bin/bash --login"
 set -g default-shell "/bin/bash"
 
-source ~/projects/laughing-hipster/tools/powerline/powerline/powerline/bindings/tmux/powerline.conf
 
-set -g default-terminal "screen-256color"
+set -g default-terminal "xterm-256color"
 
 # set esc-wait off, so vim works
 set-option -sg escape-time 0
 
+
 #set prefix to ctrl-a
 unbind-key C-b
 set-option -g prefix C-a
 unbind-key C-a       ; bind-key C-a        send-prefix
 
-
 # some nice ops
 set-option -g bell-action any
 set-option -g history-limit 10000

src/.config/vim/.vimrc

@@ -35,7 +35,7 @@ set backupcopy=yes
 set autoread
 set selection=exclusive
 set ttimeoutlen=50
-" set termguicolors
+set termguicolors
 " Use the OS clipboard by default (on versions compiled with `+clipboard`)
 set clipboard=unnamedplus
 " Enhance command-line completion
@@ -155,7 +155,7 @@ nmap <leader>n :NERDTreeToggle %:p:h<CR>
 nmap <leader>m :NERDTreeClose<CR>:NERDTreeFind<CR>
 
 " strips whitespace
-noremap <leader>ss :call StripWhitespace()<CR>
+noremap <leader>ws :call StripWhitespace()<CR>
 
 " Strip trailing whitespace (,ss)
 function! StripWhitespace()
@@ -217,7 +217,8 @@ let g:go_highlight_structs = 1
 let g:go_highlight_operators = 1
 let g:go_highlight_build_constraints = 1
 let g:go_highlight_extra_types = 1
-let g:go_fmt_command = "goreturns"
+let g:go_fmt_command = "goimports"
+let g:go_fmt_autosave = 1
 " -b -w -p"
 
 let g:syntastic_go_checkers = ['go', 'errcheck', 'gofmt', 'golint', 'govet']

src/.gitconfig

@@ -1,167 +1,171 @@
 [alias]
-  # View abbreviated SHA, description, and history graph of the latest 20 commits
+    # View abbreviated SHA, description, and history graph of the latest 20 commits
-  lo = log --oneline -n 40 --graph
+    lo = log --oneline -n 40 --graph
-  l = log --oneline -n 40 --graph --show-signature
+    l = log --oneline -n 40 --graph --show-signature
 
-  # View the current working tree status using the short format
+    # View the current working tree status using the short format
-  s = status -s
+    s = status -s
 
-  # Show the diff between the latest commit and the current state
+    # Show the diff between the latest commit and the current state
-  d = !"git diff --color --patch-with-stat"
+    d = !"git diff --color --patch-with-stat"
-  dc = !"git diff --cached --color --patch-with-stat"
+    dc = !"git diff --cached --color --patch-with-stat"
 
-  # `git di $number` shows the diff between the state `$number` revisions ago and the current state
+    # `git di $number` shows the diff between the state `$number` revisions ago and the current state
-  di = !"d() { git diff --color --patch-with-stat HEAD~$1 | diff-so-fancy; }; git diff-index --color --quiet HEAD --; d"
+    di = !"d() { git diff --color --patch-with-stat HEAD~$1 | diff-so-fancy; }; git diff-index --color --quiet HEAD --; d"
 
-  # Pull in remote changes for the current repository and all its submodules
+    # Pull in remote changes for the current repository and all its submodules
-  p = !"git pull; git submodule foreach git pull origin master"
+    p = !"git pull; git submodule foreach git pull origin master"
 
-  # Clone a repository including all submodules
+    # Clone a repository including all submodules
-  c = clone --recursive
+    c = clone --recursive
 
-  # Commit all changes
+    # Commit all changes
-  ca = !git add -A && git commit -av -S
+    ca = !git add -A && git commit -av -S
 
-  # commits with gpgsign flag
+    # commits with gpgsign flag
-  cs = commit -S
+    cs = commit -S
 
-  # commits with gpgsign and inline message flag
+    # commits with gpgsign and inline message flag
-  csm = commit -S -m
+    csm = commit -S -m
 
-  # Switch to a branch, creating it if necessary
+    # Switch to a branch, creating it if necessary
-  go = checkout -B
+    go = checkout -B
 
-  # pull rebase
+    # pull rebase
-  pr = pull --rebase
+    pr = pull --rebase
 
-  # Show verbose output about tags, branches or remotes
+    # Show verbose output about tags, branches or remotes
-  tags = tag -l
+    tags = tag -l
-  branches = branch -a
+    branches = branch -a
-  remotes = remote -v
+    remotes = remote -v
 
-  # Credit an author on the latest commit
+    # Credit an author on the latest commit
-  credit = "!f() { git commit --amend --author \"$1 <$2>\" -C HEAD; }; f"
+    credit = "!f() { git commit --amend --author \"$1 <$2>\" -C HEAD; }; f"
 
-  # Interactive rebase with the given number of latest commits
+    # Interactive rebase with the given number of latest commits
-  reb = "!r() { git rebase -i HEAD~$1; }; r"
+    reb = "!r() { git rebase -i HEAD~$1; }; r"
 
-  # Find branches containing commit
+    # Find branches containing commit
-  fb = "!f() { git branch -a --contains $1; }; f"
+    fb = "!f() { git branch -a --contains $1; }; f"
 
-  # Find tags containing commit
+    # Find tags containing commit
-  ft = "!f() { git describe --always --contains $1; }; f"
+    ft = "!f() { git describe --always --contains $1; }; f"
 
-  # Find commits by source code
+    # Find commits by source code
-  fc = "!f() { git log --pretty=format:'%C(yellow)%h  %Cblue%ad  %Creset%s%Cgreen  [%cn] %Cred%d' --decorate --date=short -S$1; }; f"
+    fc = "!f() { git log --pretty=format:'%C(yellow)%h  %Cblue%ad  %Creset%s%Cgreen  [%cn] %Cred%d' --decorate --date=short -S$1; }; f"
 
-  # Find commits by commit message
+    # Find commits by commit message
-  fm = "!f() { git log --pretty=format:'%C(yellow)%h  %Cblue%ad  %Creset%s%Cgreen  [%cn] %Cred%d' --decorate --date=short --grep=$1; }; f"
+    fm = "!f() { git log --pretty=format:'%C(yellow)%h  %Cblue%ad  %Creset%s%Cgreen  [%cn] %Cred%d' --decorate --date=short --grep=$1; }; f"
 
   # Remove branches that have already been merged with master
-  dm = "!git branch --merged | grep -v '\\*' | xargs -n 1 git branch -d"
+    dm = "!git branch --merged | grep -v '\\*' | xargs -n 1 git branch -d"
 	plog = log --graph --pretty=format:'%h -%d %s %n' --abbrev-commit --date=relative --branches
 
 [diff]
- # Git diff will use (i)ndex, (w)ork tree, (c)ommit and (o)bject
+    # Git diff will use (i)ndex, (w)ork tree, (c)ommit and (o)bject
- # instead of a/b/c/d as prefixes for patches
+    # instead of a/b/c/d as prefixes for patches
-  mnemonicprefix = true
+    mnemonicprefix = true
-  tool = vimdiff
+    tool = vimdiff
 
 [merge]
-  tool = vimdiff
+    tool = vimdiff
-  conflictstyle = diff3
+    conflictstyle = diff3
 
 [mergetool]
-  prompt = false
+    prompt = false
-  trustExitCode = false
+    trustExitCode = false
 
 [advice]
-  statusHints = false
+    statusHints = false
 
 [apply]
-  # Detect whitespace errors when applying a patch
+    # Detect whitespace errors when applying a patch
-  whitespace = fix
+    whitespace = fix
 
 [gc]
-  auto=1
+    auto=1
 
 [core]
-  # Use custom `.gitignore` and `.gitattributes`
+    # Use custom `.gitignore` and `.gitattributes`
-  excludesfile = /Users/Adam/.gitignore
+    excludesfile = /Users/Adam/.gitignore
-  attributesfile = ~/.gitattributes
+    attributesfile = ~/.gitattributes
-  # Treat spaces before tabs and all kinds of trailing whitespace as an error.
+    # Treat spaces before tabs and all kinds of trailing whitespace as an error.
-  # [default] trailing-space: looks for spaces at the end of a line
+    # [default] trailing-space: looks for spaces at the end of a line
-  # [default] space-before-tab: looks for spaces before tabs at the beginning of
+    # [default] space-before-tab: looks for spaces before tabs at the beginning of
-  # a line
+    # a line
-  whitespace = space-before-tab,-indent-with-non-tab,trailing-space
+    whitespace = space-before-tab,-indent-with-non-tab,trailing-space
-  # Make `git rebase` safer on OS X
+    # Make `git rebase` safer on OS X
-  # More info: <http://www.git-tower.com/blog/make-git-rebase-safe-on-osx/>
+    # More info: <http://www.git-tower.com/blog/make-git-rebase-safe-on-osx/>
-  trustctime = false
+    trustctime = false
-  autocrlf = false
+    autocrlf = false
-  eol = 'lf'
+    eol = 'lf'
-  editor = $EDITOR
+    editor = $EDITOR
-  hooksPath = /home/adam/.githooks/
+    hooksPath = /home/adam/.githooks/
 
 [color]
-  # Use colors in Git commands that are capable of colored output when
+    # Use colors in Git commands that are capable of colored output when
-  # outputting to the terminal. (This is the default setting in Git ≥ 1.8.4.)
+    # outputting to the terminal. (This is the default setting in Git ≥ 1.8.4.)
-  ui = auto
+    ui = auto
 
 [color "branch"]
-  current = yellow reverse
+    current = yellow reverse
-  local = yellow
+    local = yellow
-  remote = green
+    remote = green
 
 [color "diff"]
-  meta = yellow bold
+    meta = yellow bold
-  frag = magenta bold
+    frag = magenta bold
-  old = red bold
+    old = red bold
-  new = green bold
+    new = green bold
 
 [color "status"]
-  added = yellow
+    added = yellow
-  changed = green
+    changed = green
-  untracked = cyan
+    untracked = cyan
 
 [merge]
-  # Include summaries of merged commits in newly created merge commit messages
+    # Include summaries of merged commits in newly created merge commit messages
-  log = true
+    log = true
-  # better merge messages
+    # better merge messages
-  summary=true
+    summary=true
 
 # URL shorthands
 [url "git@github.com:"]
-  insteadOf = "gh:"
+    insteadOf = https://github.com/
-  pushInsteadOf = "github:"
+    pushInsteadOf = "github:"
-  pushInsteadOf = "git://github.com/"
+    pushInsteadOf = "git://github.com/"
+
 [url "git://github.com/"]
-  insteadOf = "github:"
+    insteadOf = "github:"
+
 [url "git@gist.github.com:"]
-  insteadOf = "gst:"
+    insteadOf = "gst:"
-  pushInsteadOf = "gist:"
+    pushInsteadOf = "gist:"
-  pushInsteadOf = "git://gist.github.com/"
+    pushInsteadOf = "git://gist.github.com/"
+
 [url "git://gist.github.com/"]
-  insteadOf = "gist:"
+    insteadOf = "gist:"
 
 [push]
-  default = current
+    default = current
+
 [pull]
-  default = current
+    default = current
 
 [user]
-  email = adam.veldhousen@liveauctioneers.com
+    email = adam.veldhousen@liveauctioneers.com
-  name = Adam Veldhousen
+    name = Adam Veldhousen
-  signingkey = 415C0B9C
+    signingkey =  4FA79E5B6598505C8DFA30A7A466CEE1415C0B9C
 
 [commit]
-  gpgsign = true
+    gpgsign = true
-  template = /home/adam/.gitmessage
+    template = /home/adam/.gitmessage
 
 [help]
-  autocorrect=20
+    autocorrect=20
 
 [credential]
-  # for OSX
+    # for OSX
-  #helper = osxkeychain
+    #helper = osxkeychain
-  # for Linux
+    # for Linux
-	helper = store --file ~/.git-credentials
+    helper = store --file ~/.git-credentials

tools/modules/iTerm2-Color-Schemes

@@ -1 +0,0 @@
-Subproject commit 20a54b079c8be65db941776f0b824054bb297b31

tools/modules/powerline

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

tools/modules/powerline-fonts

@@ -1 +0,0 @@
-Subproject commit 99be8480bb39f2b9daa52f03a22941a45cd1b8cf

tools/modules/tmux-MacOSX-pasteboard

@@ -1 +0,0 @@
-Subproject commit 98f32381182c5850a40ed60abec0c1320b7be270