indent_size = 2

Author: webpro

.editorconfig

@@ -7,4 +7,4 @@ end_of_line = lf
 insert_final_newline = true
 trim_trailing_whitespace = true
 indent_style = space
-indent_size = 4
+indent_size = 2

bin/dotfiles

@@ -5,77 +5,77 @@ COMMAND_NAME=$1
 SUB_COMMAND_NAME=$2
 
 sub_help () {
-    echo "Usage: $BIN_NAME <command>"
-    echo
-    echo "Commands:"
-    echo "   help               This help message"
-    echo "   edit               Open dotfiles in editor ($EDITOR_ALT) and Git GUI ($GIT_GUI)"
-    echo "   reload             Reload dotfiles"
-    echo "   test               Run tests"
-    echo "   update             Update packages and pkg managers (OS, brew, npm, gem, pip)"
-    echo "   osx                Apply OS X system defaults"
-    echo "   dock               Apply OS X Dock settings"
-    echo "   install vundle     Install Vundle"
+  echo "Usage: $BIN_NAME <command>"
+  echo
+  echo "Commands:"
+  echo "   help             This help message"
+  echo "   edit             Open dotfiles in editor ($EDITOR_ALT) and Git GUI ($GIT_GUI)"
+  echo "   reload           Reload dotfiles"
+  echo "   test             Run tests"
+  echo "   update           Update packages and pkg managers (OS, brew, npm, gem, pip)"
+  echo "   osx              Apply OS X system defaults"
+  echo "   dock             Apply OS X Dock settings"
+  echo "   install vundle   Install Vundle"
 }
 
 sub_edit () {
-    sh -c "$EDITOR_ALT $DOTFILES_DIR"
-    sh -c "$GIT_GUI $DOTFILES_DIR"
+  sh -c "$EDITOR_ALT $DOTFILES_DIR"
+  sh -c "$GIT_GUI $DOTFILES_DIR"
 }
 
 sub_reload () {
-    . ~/.bash_profile && echo "Bash reloaded."
+  . ~/.bash_profile && echo "Bash reloaded."
 }
 
 sub_test () {
-    bats "$DOTFILES_DIR"/test/*.bats
+  bats "$DOTFILES_DIR"/test/*.bats
 }
 
 sub_update () {
-    sudo softwareupdate -i -a
-    brew update
-    brew upgrade
-    npm install npm -g
-    npm update -g
-    gem update --system
-    gem update
-    pip install --upgrade pip
-    pip freeze --local | grep -v '^\-e' | cut -d = -f 1  | xargs pip install -U
+  sudo softwareupdate -i -a
+  brew update
+  brew upgrade
+  npm install npm -g
+  npm update -g
+  gem update --system
+  gem update
+  pip install --upgrade pip
+  pip freeze --local | grep -v '^\-e' | cut -d = -f 1  | xargs pip install -U
 }
 
 sub_osx () {
-    for DEFAULTS_FILE in "$DOTFILES_DIR"/osx/defaults*.sh; do
-        echo "Applying $DEFAULTS_FILE" && . "$DEFAULTS_FILE"
-    done
-    echo "Done. Some changes may require a logout/restart to take effect."
+  for DEFAULTS_FILE in "$DOTFILES_DIR"/osx/defaults*.sh; do
+    echo "Applying $DEFAULTS_FILE" && . "$DEFAULTS_FILE"
+  done
+  echo "Done. Some changes may require a logout/restart to take effect."
 }
 
 sub_dock () {
-    . "$DOTFILES_DIR/osx/dock.sh" && echo "Dock reloaded."
+  . "$DOTFILES_DIR/osx/dock.sh" && echo "Dock reloaded."
 }
 
 sub_install () {
-    local SCRIPT="$DOTFILES_DIR/install/$SUB_COMMAND_NAME.sh"
-    [ -f "$SCRIPT" ] && . "$SCRIPT" || echo "Unable to find script to install $SUB_COMMAND_NAME"
+  local SCRIPT="$DOTFILES_DIR/install/$SUB_COMMAND_NAME.sh"
+  [ -f "$SCRIPT" ] && . "$SCRIPT" || echo "Unable to find script to install $SUB_COMMAND_NAME"
 }
 
 # Make sure to keep this in sync with the available public commands
 
 sub_completion () {
-    echo "help edit reload test update osx dock install"
+  echo "help edit reload test update osx dock install"
 }
 
 case $COMMAND_NAME in
-    "" | "-h" | "--help")
-        sub_help
-        ;;
-    *)
-        shift
-        sub_${COMMAND_NAME} $@
-        if [ $? = 127 ]; then
-            echo "'$COMMAND_NAME' is not a known command or has errors." >&2
-            sub_help
-            exit 1
-        fi
-        ;;
+  "" | "-h" | "--help")
+    sub_help
+    ;;
+  *)
+    shift
+    sub_${COMMAND_NAME} $@
+    if [ $? = 127 ]; then
+      echo "'$COMMAND_NAME' is not a known command or has errors." >&2
+      sub_help
+      exit 1
+    fi
+    ;;
 esac

bin/json

@@ -12,12 +12,12 @@ shift $((OPTIND-1))
 
 if [ $# -ge 1 ]; then
 	if [[ "$1" == http* ]]; then
-	    INPUT=$(curl --silent "$1")
+	  INPUT=$(curl --silent "$1")
 	elif [ -f "$1" ]; then
 		INPUT=$(cat "$1")
 	fi
 else
-    INPUT=$(cat -)
+  INPUT=$(cat -)
 fi
 
 echo "$INPUT" | underscore print "$OPT_COLOR"

git/.gitconfig

@@ -1,99 +1,99 @@
 [user]
-    name = Lars Kappert
-    email = [email protected]
+  name = Lars Kappert
+  email = [email protected]
 
 [github]
-    user = webpro
+  user = webpro
 
 [core]
-    excludesfile = ~/.gitignore_global
-    editor = vim
-    filemode = false
-    trustctime = false
+  excludesfile = ~/.gitignore_global
+  editor = vim
+  filemode = false
+  trustctime = false
 
 [alias]
-    st = status
-    sts = status -sb
-    stl = ls-files -m -o --exclude-standard
-    ci = commit
-    br = branch
-    co = checkout
-    cr = clone --recursive
-    df = diff --word-diff
-    unstage = reset --hard HEAD
-    l = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit
-    ll = log --pretty=oneline --graph --abbrev-commit
-    lm = log --pretty=format:'* %s (%h)'
-    lg = log -p
-    g = grep --break --heading --line-number
-    amend = commit --amend --reuse-message=HEAD
-    contrib = shortlog --summary --numbered
-    show-ignored = "! git clean -ndX | perl -pe 's/Would remove/Ignored:/'"
-    ld = "!sh -c \"git log --since '${1:-1} days ago' --oneline --author $(git config user.email)\" -"
-    pr = "!f() { git fetch -fu ${2:-origin} refs/pull/$1/head:pr/$1 && git checkout pr/$1; }; f"
+  st = status
+  sts = status -sb
+  stl = ls-files -m -o --exclude-standard
+  ci = commit
+  br = branch
+  co = checkout
+  cr = clone --recursive
+  df = diff --word-diff
+  unstage = reset --hard HEAD
+  l = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit
+  ll = log --pretty=oneline --graph --abbrev-commit
+  lm = log --pretty=format:'* %s (%h)'
+  lg = log -p
+  g = grep --break --heading --line-number
+  amend = commit --amend --reuse-message=HEAD
+  contrib = shortlog --summary --numbered
+  show-ignored = "! git clean -ndX | perl -pe 's/Would remove/Ignored:/'"
+  ld = "!sh -c \"git log --since '${1:-1} days ago' --oneline --author $(git config user.email)\" -"
+  pr = "!f() { git fetch -fu ${2:-origin} refs/pull/$1/head:pr/$1 && git checkout pr/$1; }; f"
 
 [pager]
 	diff = diff-so-fancy | less --tabs=4 -RFX
 	show = diff-so-fancy | less --tabs=4 -RFX
 
 [color]
-    ui = auto
+  ui = auto
 [color "branch"]
-    current = yellow reverse
-    local = yellow
-    remote = green
+  current = yellow reverse
+  local = yellow
+  remote = green
 [color "diff"]
-    meta = yellow bold
-    frag = magenta bold
-    old = red bold
-    new = green bold
+  meta = yellow bold
+  frag = magenta bold
+  old = red bold
+  new = green bold
 [color "status"]
-    added = yellow
-    changed = green
-    untracked = cyan
+  added = yellow
+  changed = green
+  untracked = cyan
 [color "diff-highlight"]
-    oldNormal = "red bold"
-    oldHighlight = "red bold 52"
-    newNormal = "green bold"
-    newHighlight = "green bold 22"
+  oldNormal = "red bold"
+  oldHighlight = "red bold 52"
+  newNormal = "green bold"
+  newHighlight = "green bold 22"
 
 [credential]
-    helper = osxkeychain
+  helper = osxkeychain
 
 [grep]
-    lineNumber = true
+  lineNumber = true
 
 [help]
-    autocorrect = 1
+  autocorrect = 1
 
 [difftool]
-    prompt = false
+  prompt = false
 
 [mergetool]
-    prompt = false
+  prompt = false
 
 [push]
-    default = simple
+  default = simple
 
 [fetch]
   prune = true
 
 [diff]
-    renames = copies
-    tool = Kaleidoscope
+  renames = copies
+  tool = Kaleidoscope
 [difftool "Kaleidoscope"]
-    cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
+  cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
 [difftool "sourcetree"]
 	cmd = /usr/local/bin/ksdiff -w \"$LOCAL\" \"$REMOTE\"
-	path = 
+	path =
 
 [merge]
-    tool = Kaleidoscope
-    conflictstyle = diff3
-    defaultToUpstream = true
+  tool = Kaleidoscope
+  conflictstyle = diff3
+  defaultToUpstream = true
 [mergetool "Kaleidoscope"]
-    cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
-    trustExitCode = true
+  cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
+  trustExitCode = true
 [mergetool "sourcetree"]
 	cmd = /usr/local/bin/ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
 	trustExitCode = true

install.sh

@@ -26,9 +26,9 @@ ln -sfv "$DOTFILES_DIR/git/.gitignore_global" ~
 . "$DOTFILES_DIR/install/pip.sh"
 
 if [ "$(uname)" == "Darwin" ]; then
-    . "$DOTFILES_DIR/install/brew-cask.sh"
-    . "$DOTFILES_DIR/install/gem.sh"
-    ln -sfv "$DOTFILES_DIR/etc/mackup/.mackup.cfg" ~
+  . "$DOTFILES_DIR/install/brew-cask.sh"
+  . "$DOTFILES_DIR/install/gem.sh"
+  ln -sfv "$DOTFILES_DIR/etc/mackup/.mackup.cfg" ~
 fi
 
 # Run tests
@@ -38,5 +38,5 @@ bats test/*.bats
 # Install extra stuff
 
 if [ -d "$EXTRA_DIR" -a -f "$EXTRA_DIR/install.sh" ]; then
-    . "$EXTRA_DIR/install.sh"
+  . "$EXTRA_DIR/install.sh"
 fi

install/brew-cask.sh

@@ -7,28 +7,29 @@ brew tap caskroom/versions
 # Install packages
 
 apps=(
-    alfred
-    dash
-    dropbox
-    firefox
-    firefox-nightly
-    flux
-    glimmerblocker
-    google-chrome
-    google-chrome-canary
-    google-drive
-    hammerspoon
-    kaleidoscope
-    macdown
-    opera
-    screenflow
-    sourcetree
-    spotify
-    sublime-text3
-    transmit
-    virtualbox
-    vlc
-    webstorm
+  alfred
+  dash
+  dropbox
+  firefox
+  firefox-nightly
+  flux
+  glimmerblocker
+  google-chrome
+  google-chrome-canary
+  google-drive
+  hammerspoon
+  kaleidoscope
+  macdown
+  opera
+  screenflow
+  slack
+  sourcetree
+  spotify
+  sublime-text3
+  transmit
+  virtualbox
+  vlc
+  webstorm
 )
 
 brew cask install "${apps[@]}"