Change prompt to lambda

.bash_aliases

@@ -1,11 +1,10 @@
 ##### Platform independent #####
+# Files
+alias df1="du -h -d 1"
+
+
 # Git Aliases
 alias g="git"
-alias much="git"
-alias such="git"
-alias very="git"
-alias so="git"
-
 alias ga="git add"
 alias gr="git rm"
 alias gc="git commit"
@@ -14,56 +13,50 @@ alias gss="git status"
 alias gd="git diff"
 alias gds="git diff --staged"
 alias gco="git checkout"
-alias gcm="git checkout master"
+alias gcom="git checkout master"
 alias gpom="git pull origin master"
 alias gbd="git branch -D"
 alias gm="git mergetool"
+alias gmc="git merge --continue"
+alias grc="git rebase --continue"
 
+# tmux
 alias tm="tmux -2 attach-session -t "default" || tmux -2 new-session -s \"default\""
+alias tmv="tmux -2 attach-session -t "vscode" || tmux -2 new-session -s \"vscode\""
+alias tmks="tmux kill-session -t"
+alias tmas="tmux attach-session -t"
+alias tmls="tmux list-sessions"
+
+# Docker
+alias dc="docker compose"
+alias de="docker exec"
+alias dr="docker run"
+alias db="docker build"
+alias ds="docker stop"
+alias drm="docker rm"
+alias drmi="docker rmi"
+alias dps="docker ps"
+alias dl="docker logs"
 
 # Editing files
-alias aliases="vim ~/.bash_aliases"
+alias aliases="code ~/.bash_aliases"
 alias vimrc="vim ~/.vimrc"
 
+# NPM
+alias npr="npm run"
+
 # CD-ing to some commonly used folders
 alias og="cd ~/Git"
 
 alias sass_watch="sass --watch ./:./"
-alias s="sublime"
 alias grep="grep --color=auto"
 alias c="clear"
 alias be="bundle exec"
-alias share="python -m SimpleHTTPServer"
+alias serve="python -m http.server 9000"
 
 ##### Mac OS Specific #####
-alias showfiles="defaults write com.apple.finder AppleShowAllFiles YES; killall Finder /System/Library/CoreServices/Finder.app"
-alias hidefiles="defaults write com.apple.finder AppleShowAllFiles NO; killall Finder /System/Library/CoreServices/Finder.app"
-
 alias cask="brew cask"
-
-##### Ubuntu/Linux Specific #####
-# Easier APT
-alias install="sudo apt-get install"
-alias purge="sudo apt-get purge"
-alias search="sudo apt-cache search"
-alias remove="sudo apt-get remove"
-alias autoremove="sudo apt-get autoremove"
-
-# Secondary Monitor
-alias monitor_enable="xrandr --output CRT1 --auto --right-of LVDS"
-alias monitor_disable="xrandr --output CRT1 --off"
-
-# PC Info
-alias mountinfo="mount | column -t"
-alias meminfo="free -mlt"
-alias driveinfo="df -h"
-
-# Launchers
-alias lstart="sudo /opt/lampp/lampp start"
-alias lstop="sudo /opt/lampp/lampp stop"
-alias pgstart="sudo service postgresql start"
-alias pgstop="sudo service postgresql stop"
-
+alias fl="open -a ForkLift"
 
 if [ -f ~/.bash_local_aliases ]; then
     . ~/.bash_local_aliases

.bash_profile

@@ -1,12 +1 @@
-
-[[ -s "$HOME/.profile" ]] && source "$HOME/.profile" # Load the default .profile
-
-[[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm" # Load RVM into a shell session *as a function*
-
-# if [[ "$TERM" != "screen-256color" ]]
-# then
-#     tmux -2 attach-session -t "default" || tmux -2 new-session -s "default"
-#     exit
-# fi
-
-alias tm="tmux -2 attach-session -t "default" || tmux -2 new-session -s \"default\""
+source ~/.bashrc

.bashrc

@@ -1,209 +1,93 @@
-# ~/.bashrc: executed by bash(1) for non-login shells.
-# see /usr/share/doc/bash/examples/startup-files (in the package bash-doc)
-# for examples
+# Set prompt
+IFS='.' read -ra split_hostname <<<$(hostname | tr '[:upper:]' '[:lower:]')
+HOSTNAME=${split_hostname[0]}
+PS1='\[\e[1;4;31m\]$HOSTNAME\[\e[1;0m\] \[\e[1;32m\]\w\[\e[m\]\[\e[1;0m\] λ\[\e[0m\] \[\e[1;0m\]'
+export TERM=xterm-256color
 
-# If not running interactively, don't do anything
-[ -z "$PS1" ] && return
+shopt -s cdspell
+# check the window size after each command and, if necessary,
+# update the values of LINES and COLUMNS.
+shopt -s checkwinsize
+
+# Disable Caret-C output
+stty -ctlecho
+
+set -o vi
+bind -m vi-insert "\C-l":clear-screen
+
+#so as not to be disturbed by Ctrl-S ctrl-Q in terminals:
+stty -ixon
+
+######################
+# History Management #
+######################
+
+# append to the history file, don't overwrite it
+shopt -s histappend
+
+# for setting history length see HISTSIZE and HISTFILESIZE in bash(1)
+HISTSIZE=5000
+HISTFILESIZE=2000
 
 # don't put duplicate lines or lines starting with space in the history.
 # See bash(1) for more options
 HISTCONTROL=ignoreboth
 
-# append to the history file, don't overwrite it
-shopt -s histappend
-shopt -s autocd
-
-# for setting history length see HISTSIZE and HISTFILESIZE in bash(1)
-HISTSIZE=1000
-HISTFILESIZE=2000
-
-# check the window size after each command and, if necessary,
-# update the values of LINES and COLUMNS.
-shopt -s checkwinsize
-
-# If set, the pattern "**" used in a pathname expansion context will
-# match all files and zero or more directories and subdirectories.
-#shopt -s globstar
-
-# make less more friendly for non-text input files, see lesspipe(1)
-[ -x /usr/bin/lesspipe ] && eval "$(SHELL=/bin/sh lesspipe)"
-
-# set variable identifying the chroot you work in (used in the prompt below)
-if [ -z "$debian_chroot" ] && [ -r /etc/debian_chroot ]; then
-    debian_chroot=$(cat /etc/debian_chroot)
-fi
-
-# set a fancy prompt (non-color, unless we know we "want" color)
-case "$TERM" in
-    xterm-color) color_prompt=yes;;
-esac
-
-# uncomment for a colored prompt, if the terminal has the capability; turned
-# off by default to not distract the user: the focus in a terminal window
-# should be on the output of commands, not on the prompt
-#force_color_prompt=yes
-
-force_color_prompt=yes
-
-if [ -n "$force_color_prompt" ]; then
-    if [ -x /usr/bin/tput ] && tput setaf 1 >&/dev/null; then
-	# We have color support; assume it's compliant with Ecma-48
-	# (ISO/IEC-6429). (Lack of such support is extremely rare, and such
-	# a case would tend to support setf rather than setaf.)
-	color_prompt=yes
-    else
-	color_prompt=
-    fi
-fi
-
-# Reset
-Color_Off="\[\033[0m\]"       # Text Reset
-
-# Regular Colors
-Black="\[\033[0;30m\]"        # Black
-Red="\[\033[0;31m\]"          # Red
-Green="\[\033[0;32m\]"        # Green
-Yellow="\[\033[0;33m\]"       # Yellow
-Blue="\[\033[0;34m\]"         # Blue
-Purple="\[\033[0;35m\]"       # Purple
-Cyan="\[\033[0;36m\]"         # Cyan
-White="\[\033[0;37m\]"        # White
-
-# Bold
-BBlack="\[\033[1;30m\]"       # Black
-BRed="\[\033[1;31m\]"         # Red
-BGreen="\[\033[1;32m\]"       # Green
-BYellow="\[\033[1;33m\]"      # Yellow
-BBlue="\[\033[1;34m\]"        # Blue
-BPurple="\[\033[1;35m\]"      # Purple
-BCyan="\[\033[1;36m\]"        # Cyan
-BWhite="\[\033[1;37m\]"       # White
-
-# Underline
-UBlack="\[\033[4;30m\]"       # Black
-URed="\[\033[4;31m\]"         # Red
-UGreen="\[\033[4;32m\]"       # Green
-UYellow="\[\033[4;33m\]"      # Yellow
-UBlue="\[\033[4;34m\]"        # Blue
-UPurple="\[\033[4;35m\]"      # Purple
-UCyan="\[\033[4;36m\]"        # Cyan
-UWhite="\[\033[4;37m\]"       # White
-
-# Background
-On_Black="\[\033[40m\]"       # Black
-On_Red="\[\033[41m\]"         # Red
-On_Green="\[\033[42m\]"       # Green
-On_Yellow="\[\033[43m\]"      # Yellow
-On_Blue="\[\033[44m\]"        # Blue
-On_Purple="\[\033[45m\]"      # Purple
-On_Cyan="\[\033[46m\]"        # Cyan
-On_White="\[\033[47m\]"       # White
-
-# High Intensty
-IBlack="\[\033[0;90m\]"       # Black
-IRed="\[\033[0;91m\]"         # Red
-IGreen="\[\033[0;92m\]"       # Green
-IYellow="\[\033[0;93m\]"      # Yellow
-IBlue="\[\033[0;94m\]"        # Blue
-IPurple="\[\033[0;95m\]"      # Purple
-ICyan="\[\033[0;96m\]"        # Cyan
-IWhite="\[\033[0;97m\]"       # White
-
-# Bold High Intensty
-BIBlack="\[\033[1;90m\]"      # Black
-BIRed="\[\033[1;91m\]"        # Red
-BIGreen="\[\033[1;92m\]"      # Green
-BIYellow="\[\033[1;93m\]"     # Yellow
-BIBlue="\[\033[1;94m\]"       # Blue
-BIPurple="\[\033[1;95m\]"     # Purple
-BICyan="\[\033[1;96m\]"       # Cyan
-BIWhite="\[\033[1;97m\]"      # White
-
-# High Intensty backgrounds
-On_IBlack="\[\033[0;100m\]"   # Black
-On_IRed="\[\033[0;101m\]"     # Red
-On_IGreen="\[\033[0;102m\]"   # Green
-On_IYellow="\[\033[0;103m\]"  # Yellow
-On_IBlue="\[\033[0;104m\]"    # Blue
-On_IPurple="\[\033[10;95m\]"  # Purple
-On_ICyan="\[\033[0;106m\]"    # Cyan
-On_IWhite="\[\033[0;107m\]"   # White
-
-# Various variables you might want for your PS1 prompt instead
-Time12h="\A"
-Time12a="\@"
-PathShort="\w"
-PathFull="\W"
-NewLine="\n"
-Jobs="\j"
-
-if [ "$color_prompt" = yes ]; then
-    PS1='$(git branch &>/dev/null;\
-if [ $? -eq 0 ]; then \
-  echo "$(echo `git status` | grep "nothing to commit" > /dev/null 2>&1; \
-  if [ "$?" -eq "0" ]; then \
-    # @4 - Clean repository - nothing to commit
-    echo "'$BGreen$PathShort$BCyan'"$(__git_ps1 " (%s)"); \
-  else \
-    # @5 - Changes to working tree
-    echo "'$BGreen$PathShort$IRed'"$(__git_ps1 " (%s)"); \
-  fi)'$BWhite':'$Color_Off' "; \
-else \
-  # @2 - Prompt when not in GIT repo
-  echo "'$BGreen$PathShort$BWhite':'$Color_Off' "; \
-fi)'
-else
-    PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\$ '
-fi
-
-unset color_prompt force_color_prompt
-
-# If this is an xterm set the title to user@host:dir
-case "$TERM" in
-xterm*|rxvt*)
-    PS1="\[\e]0;${debian_chroot:+($debian_chroot)}\u@\h: \w\a\]$PS1"
-    ;;
-*)
-    ;;
-esac
+######################
+# Aliases            #
+######################
 
 # enable color support of ls and also add handy aliases
 if [ -x /usr/bin/dircolors ]; then
-    test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)"
-    alias ls='ls --color=auto'
-    #alias dir='dir --color=auto'
-    #alias vdir='vdir --color=auto'
-
-    alias grep='grep --color=auto'
-    alias fgrep='fgrep --color=auto'
-    alias egrep='egrep --color=auto'
+  test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)"
+  alias grep='grep --color=auto'
+  alias fgrep='fgrep --color=auto'
+  alias egrep='egrep --color=auto'
 fi
 
 # some more ls aliases
-alias ll='ls -alF'
-alias la='ls -A'
-alias l='ls -CF'
+alias ls='ls -hG'
+alias ll='ls -alhFG'
+alias la='ls -AG'
+alias l='ls -CFG'
 
-# Add an "alert" alias for long running commands.  Use like so:
-#   sleep 10; alert
-alias alert='notify-send --urgency=low -i "$([ $? = 0 ] && echo terminal || echo error)" "$(history|tail -n1|sed -e '\''s/^\s*[0-9]\+\s*//;s/[;&|]\s*alert$//'\'')"'
+# Editor
+export EDITOR='code -w'
 
-# Alias definitions.
-# You may want to put all your additions into a separate file like
-# ~/.bash_aliases, instead of adding them here directly.
-# See /usr/share/doc/bash-doc/examples in the bash-doc package.
+# bash-git-prompt
+GIT_PROMPT_ONLY_IN_REPO=1
+GIT_PROMPT_START="\[\e[1;4;31m\]$HOSTNAME\[\e[1;0m\] \[\e[1;32m\]\w\[\e[m\]"
+GIT_PROMPT_END="\[\e[1;m\] λ \[\e[1;m\]"
+
+
+# Disable deprecation warning on mac
+export BASH_SILENCE_DEPRECATION_WARNING=1
+
+######################
+# Sources & exports  #
+######################
 
 if [ -f ~/.bash_aliases ]; then
-    . ~/.bash_aliases
+  source ~/.bash_aliases
 fi
 
-if [ -f ~/.bash_local_aliases ]; then
-    . ~/.bash_local_aliases
+if [ -f ~/.bashrc_local ]; then
+  source ~/.bashrc_local
+fi
+
+# bash-git prompt
+if [ -f ~/.bash-git-prompt/gitprompt.sh ]; then
+  source ~/.bash-git-prompt/gitprompt.sh
 fi
 
 # enable programmable completion features (you don't need to enable
 # this, if it's already enabled in /etc/bash.bashrc and /etc/profile
 # sources /etc/bash.bashrc).
 if [ -f /etc/bash_completion ] && ! shopt -oq posix; then
-    . /etc/bash_completion
+  source /etc/bash_completion
+fi
+
+# Git completion
+if [ -f ~/.git-completion.bash ]; then
+  source ~/.git-completion.bash
 fi

.git-prompt-colors.sh

@@ -0,0 +1,24 @@
+override_git_prompt_colors() {
+  GIT_PROMPT_THEME_NAME="Georgi"
+
+  GIT_PROMPT_PREFIX="${BoldCyan}("
+  GIT_PROMPT_SUFFIX="${BoldCyan})"
+  GIT_PROMPT_BRANCH="${BoldCyan}"
+  GIT_PROMPT_SEPARATOR="${BoldCyan}|"
+
+  GIT_PROMPT_CHANGED="${BoldRed}+"
+  GIT_PROMPT_UNTRACKED="${BoldRed}…"
+  GIT_PROMPT_STAGED="${BoldGreen}●"
+  GIT_PROMPT_STASHED="${BoldCyan}⚑"
+  GIT_PROMPT_CONFLICTS="${BoldRed}✖"
+  GIT_PROMPT_CLEAN="${BoldCyan}✔"
+
+  GIT_PROMPT_SYMBOLS_AHEAD="${BoldYellow}↑"
+  GIT_PROMPT_SYMBOLS_BEHIND="${BoldMagenta}↓"
+  GIT_PROMPT_SYMBOLS_PREHASH="${BoldRed}:"
+
+  GIT_PROMPT_SYMBOLS_NO_REMOTE_TRACKING=" "
+  GIT_PROMPT_REMOTE=""
+}
+
+reload_git_prompt_colors "Georgi"

.gitconfig

@@ -21,11 +21,14 @@
     unignore = !git update-index --no-assume-unchanged
     ignored = !git ls-files -v | grep "^[[:lower:]]"
     undo = reset --soft HEAD^
-    squash = rebase -i
+    squash = rebase --autostash -i
+    megasquash = "!f() { git rebase --autostash -i `git merge-base --fork-point HEAD master`; }; f"
+    unstage = restore --staged
 
     # various pretty loggers from various places
     l = log --pretty=oneline --abbrev-commit
     lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%Creset' --abbrev-commit --date=relative
+    lgg = log --graph --pretty=format:'%Creset %s' --abbrev-commit
     lc = log ORIG_HEAD.. --stat --no-merges
     # from http://blog.kfish.org/2010/04/git-lola.html
     lol = log --graph --decorate --pretty=oneline --abbrev-commit
@@ -33,11 +36,20 @@
     ll = log --graph --date=short
 [push]
 	default = simple
+[mergetool "sourcetree"]
+	cmd = /Applications/Sourcetree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
+	trustExitCode = true
+[diff]
+    tool = default-difftool
+[difftool "default-difftool"]
+    cmd = code --wait --diff $LOCAL $REMOTE
+[difftool "sourcetree"]
+	cmd = opendiff \"$LOCAL\" \"$REMOTE\"
+	path =
 [filter "media"]
 	clean = git media clean %f
 	smudge = git media smudge %f
 	required = true
-
 # local user config, usernames, etc
 [include]
     path=~/.gitconfig-local

.tmux.conf

@@ -2,51 +2,72 @@
 #  General Settings
 # ------------------
 
+# See: https://github.com/gpakosz/.tmux/blob/master/.tmux.conf
+
 # Set Custom Prefix
 set -g prefix C-a
 unbind C-b
 
-# Start in Zsh
-set -g default-command '/bin/zsh --login'
-set -g default-shell /bin/zsh
+# Start in newer bash
+set-option -g default-command "/usr/local/bin/bash --login"
 
 # Disable delay
 set -sg escape-time 1
 
-# Change the index of first window or pane to 1
-set -g base-index 1
-setw -g pane-base-index 1
+set -g base-index 1           # start windows numbering at 1
+setw -g pane-base-index 1     # make pane numbering consistent with windows
 
-# set -g status-utf8 on
-# setw -g utf8 on
+set -q -g status-utf8 on      # expect UTF-8 (tmux < 2.2)
+setw -q -g utf8 on
 
 # -------------------
 #   Visual Settings
 # -------------------
 
 set -g default-terminal "screen-256color"
+source-file ~/.tmux/themes/tomorrow-night.tmux
 
-# Theme
-set -g status-bg black
-set -g status-fg white
-set -g status-left-length 30
-set -g status-right-length 60
-#
-# Colors
-set -g status-fg white
-set -g status-bg colour234
-set -g pane-border-fg colour245
-set -g pane-active-border-fg colour25
-set -g message-fg white
-set -g message-bg colour25
-set -g message-attr bold
+# Theme Variables
+
+TMUX_ACTIVE_COLOR="#373b41"
+
+TMUX_STATUS_TEXT_COLOR="#c5c8c6"
+TMUX_STATUS_BG="#26292c"
+
+TMUX_NAMESPACE_FG="#000000"
+TMUX_STATUS_RED="#cc6666"
+
+TMUX_USERNAME_FG="#000000"
+TMUX_STATUS_AQUA="#8abeb7"
+
+# Styles
+STYLE_DEFAULT="fg=white,bg=$TMUX_STATUS_BG"
+STYLE_ACTIVE_ITEM="#[fg=$TMUX_STATUS_TEXT_COLOR,bg=$TMUX_ACTIVE_COLOR,noreverse,bold]"
+STYLE_RED="#[fg=$TMUX_NAMESPACE_FG,bg=$TMUX_STATUS_RED,bold]"
+STYLE_AQUA="#[fg=$TMUX_USERNAME_FG,bg=$TMUX_STATUS_AQUA,bold]"
 
 # Status bar
-# set-option -g status-position bottom
-set -g status-left '#[fg=colour25,bg=white,bold] #S #[fg=colour252,bg=colour238,bold]#[fg=colour245,bg=colour238,bold] #(whoami) #[fg=colour238,bg=colour234,bold]'
-set -g status-right '#[fg=colour238,bg=colour234,bold]#[fg=colour245,bg=colour238,bold] #H #[fg=colour252,bg=colour238,bold]#[fg=colour25,bg=white,bold] #(date +%H:%M) '
-set -g window-status-format "#[fg=white,bg=colour234] #I #W "
-set -g window-status-current-format "#[fg=white,bg=colour25,noreverse,bold] #I #W "
+set-option -g status-position bottom
+
+# Status mid style
+set -g status-style $STYLE_DEFAULT
+
+set -g status-left "#{prefix_highlight}$STYLE_RED #S #[fg=$TMUX_STATUS_RED,bg=$TMUX_STATUS_AQUA,bold]$STYLE_AQUA #(whoami) #[fg=$TMUX_STATUS_AQUA,bg=$TMUX_STATUS_BG,bold] "
+set -g status-left-length 30
+
+PC_STATS="$STYLE_ACTIVE_ITEM cpu #{cpu_icon} #{cpu_percentage} #[$STYLE_DEFAULT] $STYLE_ACTIVE_ITEM mem #{ram_icon} #{ram_percentage} #[$STYLE_DEFAULT]"
+
+set -g status-right "$PC_STATS #[fg=$TMUX_STATUS_AQUA,bg=$TMUX_STATUS_BG,bold]$STYLE_AQUA #h #[fg=$TMUX_STATUS_RED,bg=$TMUX_STATUS_AQUA,bold]$STYLE_RED %a, %h %d %H:%M "
+set -g status-right-length 90
+
+# window name options
+# set -g window-status-format "#[$STATUS_DEFAILT] #I #W "
+# set -g window-status-current-format "$TYLE_ACTIVE_ITEM] #I #W "
+
+# Prefix style
+# https://github.com/tmux-plugins/tmux-prefix-highlight
+set -g @prefix_highlight_fg $TMUX_STATUS_TEXT_COLOR
+set -g @prefix_highlight_bg $TMUX_ACTIVE_COLOR
 
 # --------------------
 #  Custom keybindings
@@ -82,9 +103,18 @@ unbind C-Right
 # Source this file
 bind r source-file ~/.tmux.conf \; display "Config file reloaded!"
 
-# Splits
+# split current window horizontally
 bind v split-window -h
+bind | split-window -h
+
+# split current window vertically
 bind s split-window -v
+bind - split-window -v
+
+# Swap panes
+bind-key -r "<" swap-window -d -t -1
+bind-key -r ">" swap-window -d -t +1
+bind-key -r n swap-pane -U
 
 # Move between panes
 bind h select-pane -L
@@ -104,7 +134,21 @@ bind -r L resize-pane -R 5
 
 # Copy & Paste
 bind Escape copy-mode
-bind p paste-buffer
-bind -t vi-copy 'v' begin-selection
-bind C-c run-shell "bash -c 'tmux show-buffer | reattach-to-user-namespace pbcopy'" \; display 'Copied to clipboard'
+bind b list-buffers   # list paste buffers
+bind p paste-buffer   # paste last buffer
+bind P choose-buffer  # see all buffers
+bind C-c run-shell "bash -c 'tmux show-buffer | pbcopy'" \; display 'Copied to clipboard'
 
+
+# Tmux Plugin manager
+# https://github.com/tmux-plugins/tpm
+
+# Enabled plugins
+# install         prefix I
+# update          prefix u
+# uninstall all   prefix alt u
+set -g @plugin 'tmux-plugins/tpm'
+set -g @plugin 'tmux-plugins/tmux-cpu'
+set -g @plugin 'tmux-plugins/tmux-prefix-highlight'
+
+run -b '~/.tmux/plugins/tpm/tpm'

.tmux/themes/tomorrow-night.tmux

@@ -0,0 +1,72 @@
+# https://github.com/edouard-lopez/tmux-tomorrow/
+# Color key:
+#   #1d1f21 Background
+#   #282a2e Current Line
+#   #373b41 Selection
+#   #c5c8c6 Foreground
+#   #969896 Comment
+#   #cc6666 Red
+#   #de935f Orange
+#   #f0c674 Yellow
+#   #b5bd68 Green
+#   #8abeb7 Aqua
+#   #81a2be Blue
+#   #b294bb Purple
+
+
+## set status bar
+set -g status-style bg=default
+setw -g window-status-current-style bg="#282a2e"
+setw -g window-status-current-style fg="#81a2be"
+
+## highlight active window
+setw -g window-style 'bg=#282a2e'
+setw -g window-active-style 'bg=#1d1f21'
+setw -g pane-active-border-style ''
+
+## highlight activity in status bar
+setw -g window-status-activity-style fg="#8abeb7"
+setw -g window-status-activity-style bg="#1d1f21"
+
+## pane border and colors
+set -g pane-active-border-style bg=default
+set -g pane-active-border-style fg="#373b41"
+set -g pane-border-style bg=default
+set -g pane-border-style fg="#373b41"
+
+set -g clock-mode-colour "#81a2be"
+set -g clock-mode-style 24
+
+set -g message-style bg="#8abeb7"
+set -g message-style fg="#000000"
+
+set -g message-command-style bg="#8abeb7"
+set -g message-command-style fg="#000000"
+
+# message bar or "prompt"
+set -g message-style bg="#2d2d2d"
+set -g message-style fg="#cc99cc"
+
+set -g mode-style bg="#1d1f21"
+set -g mode-style fg="#de935f"
+
+# right side of status bar holds "[host name] (date time)"
+set -g status-right-length 100
+set -g status-right-style fg=black
+set -g status-right-style bold
+set -g status-right '#[fg=#f99157,bg=#2d2d2d] %H:%M |#[fg=#6699cc] %y.%m.%d '
+
+# make background window look like white tab
+set-window-option -g window-status-style bg=default
+set-window-option -g window-status-style fg=white
+set-window-option -g window-status-style none
+set-window-option -g window-status-format '#[fg=#6699cc,bg=colour235] #I #[fg=#999999,bg=#2d2d2d] #W #[default]'
+
+# make foreground window look like bold yellow foreground tab
+set-window-option -g window-status-current-style none
+set-window-option -g window-status-current-format '#[fg=#f99157,bg=#2d2d2d] #I #[fg=#cccccc,bg=#393939] #W #[default]'
+
+# active terminal yellow border, non-active white
+set -g pane-border-style bg=default
+set -g pane-border-style fg="#999999"
+set -g pane-active-border-style fg="#f99157"

.vimrc

@@ -27,7 +27,7 @@ set undodir=~/.vim/undodir
 set dir=~/.vim/swapdir
 
 " Set colors
-colorscheme Tomorrow
+colorscheme Tomorrow-Night
 set t_Co=256
 set cursorline
 autocmd BufEnter * :syntax sync fromstart
@@ -262,5 +262,5 @@ map <Leader>a= :Tabularize /=<CR>
 map <Leader>a: :Tabularize /:\zs<CR>
 
 " GitGutter
-let g:gitgutter_sign_column_always = 1
+set signcolumn=yes
 let g:airline#extensions#tabline#fnamemod = ':t'

.xbindkeysrc

@@ -1,46 +0,0 @@
-# Mappings for keys for MX Revoluton
-# b:1	-	left mouse button
-# b:2	-	left and right mouse button together
-# b:3 	-	right mouse button
-# b:4	-	mouse wheel up
-# b:5	-	mouse wheel down
-# b:6	-	mouse wheel left
-# b:7	-	mouse wheel right
-# b:8	-	back button
-# b:9	-	forward button
-# b:10	-	-none-
-# b:11	-	-none-
-# b:12	-	-none-
-# b:13	-	media wheel up
-# b:14	-	-none-
-# b:15	-	media wheel down
-# b:16	-	-none-
-# b:17	-	media wheel press
-
-# forward
-"dbus-send --print-reply --dest=org.mpris.MediaPlayer2.spotify /org/mpris/MediaPlayer2 org.mpris.MediaPlayer2.Player.Next"
-m:0x0 + b:8
-
-# back
-"dbus-send --print-reply --dest=org.mpris.MediaPlayer2.spotify /org/mpris/MediaPlayer2 org.mpris.MediaPlayer2.Player.Previous"
-m:0x0 + b:9
-
-# volume up
-"amixer -D pulse sset Master 5%+"
-m:0x0 + b:13
-
-# volume down
-"amixer -D pulse sset Master 5%-"
-m:0x0 + b:15
-
-# mute
-"amixer -D pulse set Master 1+ toggle"
-m:0x0 + b:17
-
-# mouse wheel left middle click
-"dbus-send --print-reply --dest=org.mpris.MediaPlayer2.spotify /org/mpris/MediaPlayer2 org.mpris.MediaPlayer2.Player.PlayPause"
-b:6
-
-# mouse wheel right middle click
-"dbus-send --print-reply --dest=org.mpris.MediaPlayer2.spotify /org/mpris/MediaPlayer2 org.mpris.MediaPlayer2.Player.Stop"
-b:7

.zsh/git-prompt/gitstatus.py

@@ -1,74 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: UTF-8 -*-
-
-from __future__ import print_function
-
-# change those symbols to whatever you prefer
-symbols = {'ahead of': '↑', 'behind': '↓', 'prehash':':'}
-
-from subprocess import Popen, PIPE
-
-import sys
-gitsym = Popen(['git', 'symbolic-ref', 'HEAD'], stdout=PIPE, stderr=PIPE)
-branch, error = gitsym.communicate()
-
-error_string = error.decode('utf-8')
-
-if 'fatal: Not a git repository' in error_string:
-	sys.exit(0)
-
-branch = branch.strip()[11:]
-
-res, err = Popen(['git','diff','--name-status'], stdout=PIPE, stderr=PIPE).communicate()
-err_string = err.decode('utf-8')
-if 'fatal' in err_string:
-	sys.exit(0)
-changed_files = [namestat[0] for namestat in res.splitlines()]
-staged_files = [namestat[0] for namestat in Popen(['git','diff', '--staged','--name-status'], stdout=PIPE).communicate()[0].splitlines()]
-nb_changed = len(changed_files) - changed_files.count('U')
-nb_U = staged_files.count('U')
-nb_staged = len(staged_files) - nb_U
-staged = str(nb_staged)
-conflicts = str(nb_U)
-changed = str(nb_changed)
-nb_untracked = len(Popen(['git','ls-files','--others','--exclude-standard'],stdout=PIPE).communicate()[0].splitlines())
-untracked = str(nb_untracked)
-if not nb_changed and not nb_staged and not nb_U and not nb_untracked:
-	clean = '1'
-else:
-	clean = '0'
-
-remote = ''
-
-if not branch: # not on any branch
-	branch = symbols['prehash']+ Popen(['git','rev-parse','--short','HEAD'], stdout=PIPE).communicate()[0][:-1]
-else:
-	remote_name = Popen(['git','config','branch.%s.remote' % branch], stdout=PIPE).communicate()[0].strip()
-	if remote_name:
-		merge_name = Popen(['git','config','branch.%s.merge' % branch], stdout=PIPE).communicate()[0].strip()
-		if remote_name == '.': # local
-			remote_ref = merge_name
-		else:
-			remote_ref = 'refs/remotes/%s/%s' % (remote_name, merge_name[11:])
-		revgit = Popen(['git', 'rev-list', '--left-right', '%s...HEAD' % remote_ref],stdout=PIPE, stderr=PIPE)
-		revlist = revgit.communicate()[0]
-		if revgit.poll(): # fallback to local
-			revlist = Popen(['git', 'rev-list', '--left-right', '%s...HEAD' % merge_name],stdout=PIPE, stderr=PIPE).communicate()[0]
-		behead = revlist.splitlines()
-		ahead = len([x for x in behead if x[0]=='>'])
-		behind = len(behead) - ahead
-		if behind:
-			remote += '%s%s' % (symbols['behind'], behind)
-		if ahead:
-			remote += '%s%s' % (symbols['ahead of'], ahead)
-
-out = '\n'.join([
-	str(branch),
-	remote,
-	staged,
-	conflicts,
-	changed,
-	untracked,
-	clean])
-print(out)
-

.zsh/git-prompt/zshrc.sh

@@ -1,94 +0,0 @@
-# To install source this file from your .zshrc file
-
-# Change this to reflect your installation directory
-export __GIT_PROMPT_DIR=~/.zsh/git-prompt
-# Initialize colors.
-autoload -U colors
-colors
-
-# Allow for functions in the prompt.
-setopt PROMPT_SUBST
-
-autoload -U add-zsh-hook
-
-add-zsh-hook chpwd chpwd_update_git_vars
-add-zsh-hook preexec preexec_update_git_vars
-add-zsh-hook precmd precmd_update_git_vars
-
-## Function definitions
-function preexec_update_git_vars() {
-    case "$2" in
-        git*|hub*|gh*|stg*)
-        __EXECUTED_GIT_COMMAND=1
-        ;;
-    esac
-}
-
-function precmd_update_git_vars() {
-    if [ -n "$__EXECUTED_GIT_COMMAND" ] || [ -n "$ZSH_THEME_GIT_PROMPT_NOCACHE" ]; then
-        update_current_git_vars
-        unset __EXECUTED_GIT_COMMAND
-    fi
-}
-
-function chpwd_update_git_vars() {
-    update_current_git_vars
-}
-
-function update_current_git_vars() {
-    unset __CURRENT_GIT_STATUS
-
-    local gitstatus="$__GIT_PROMPT_DIR/gitstatus.py"
-    _GIT_STATUS=`python ${gitstatus}`
-    __CURRENT_GIT_STATUS=("${(@f)_GIT_STATUS}")
-	GIT_BRANCH=$__CURRENT_GIT_STATUS[1]
-	GIT_REMOTE=$__CURRENT_GIT_STATUS[2]
-	GIT_STAGED=$__CURRENT_GIT_STATUS[3]
-	GIT_CONFLICTS=$__CURRENT_GIT_STATUS[4]
-	GIT_CHANGED=$__CURRENT_GIT_STATUS[5]
-	GIT_UNTRACKED=$__CURRENT_GIT_STATUS[6]
-	GIT_CLEAN=$__CURRENT_GIT_STATUS[7]
-}
-
-
-git_super_status() {
-	precmd_update_git_vars
-    if [ -n "$__CURRENT_GIT_STATUS" ]; then
-	  STATUS="$ZSH_THEME_GIT_PROMPT_PREFIX$ZSH_THEME_GIT_PROMPT_BRANCH$GIT_BRANCH%{${reset_color}%}"
-	  if [ -n "$GIT_REMOTE" ]; then
-		  STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_REMOTE$GIT_REMOTE%{${reset_color}%}"
-	  fi
-	  STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_SEPARATOR"
-	  if [ "$GIT_STAGED" -ne "0" ]; then
-		  STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_STAGED$GIT_STAGED%{${reset_color}%}"
-	  fi
-	  if [ "$GIT_CONFLICTS" -ne "0" ]; then
-		  STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_CONFLICTS$GIT_CONFLICTS%{${reset_color}%}"
-	  fi
-	  if [ "$GIT_CHANGED" -ne "0" ]; then
-		  STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_CHANGED$GIT_CHANGED%{${reset_color}%}"
-	  fi
-	  if [ "$GIT_UNTRACKED" -ne "0" ]; then
-		  STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_UNTRACKED%{${reset_color}%}"
-	  fi
-	  if [ "$GIT_CLEAN" -eq "1" ]; then
-		  STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_CLEAN"
-	  fi
-	  STATUS="$STATUS%{${reset_color}%}$ZSH_THEME_GIT_PROMPT_SUFFIX"
-	  echo "$STATUS"
-	fi
-}
-
-# Default values for the appearance of the prompt. Configure at will.
-ZSH_THEME_GIT_PROMPT_PREFIX="("
-ZSH_THEME_GIT_PROMPT_SUFFIX=")"
-ZSH_THEME_GIT_PROMPT_SEPARATOR="|"
-ZSH_THEME_GIT_PROMPT_BRANCH="%{$fg_bold[magenta]%}"
-ZSH_THEME_GIT_PROMPT_STAGED="%{$fg[red]%}●"
-ZSH_THEME_GIT_PROMPT_CONFLICTS="%{$fg[red]%}✖"
-ZSH_THEME_GIT_PROMPT_CHANGED="%{$fg[blue]%}✚"
-ZSH_THEME_GIT_PROMPT_REMOTE=""
-ZSH_THEME_GIT_PROMPT_UNTRACKED="…"
-ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg_bold[green]%}✔"
-
-

.zshrc

@@ -1,83 +0,0 @@
-# Include my bash aliases
-source ~/.bash_aliases
-
-source ~/.zsh/git-prompt/zshrc.sh
-
-bindkey -v
-
-bindkey '^r' history-incremental-search-backward
-bindkey '^R' history-incremental-pattern-search-backward
-#
-#so as not to be disturbed by Ctrl-S ctrl-Q in terminals:
-stty -ixon
-
-# enable color support of ls and also add handy aliases
-if [ -x /usr/bin/dircolors ]; then
-    test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)"
-    #alias dir='dir --color=auto'
-    #alias vdir='vdir --color=auto'
-
-    alias grep='grep --color=auto'
-    alias fgrep='fgrep --color=auto'
-    alias egrep='egrep --color=auto'
-fi
-
-# some more ls aliases
-alias ls='ls -G'
-alias ll='ls -alFG'
-alias la='ls -AG'
-alias l='ls -CFG'
-
-
-autoload -U compinit promptinit
-autoload -U colors && colors
-compinit
-promptinit
-
-setopt AUTO_CD
-setopt AUTO_PUSHD
-setopt PUSHD_IGNORE_DUPS
-setopt PROMPT_SUBST
-
-# Allow [ or ] whereever you want
-unsetopt nomatch
-
-DIRSTACKSIZE=15
-
-# Enable colors in prompt
-autoload -U colors && colors
-
-
-# Git Prompt colors
-ZSH_THEME_GIT_PROMPT_PREFIX=" %{$fg_bold[cyan]%}("
-ZSH_THEME_GIT_PROMPT_SUFFIX="%{$fg_bold[cyan]%})"
-ZSH_THEME_GIT_PROMPT_SEPARATOR="%{$fg_bold[cyan]%}|"
-ZSH_THEME_GIT_PROMPT_BRANCH=""
-ZSH_THEME_GIT_PROMPT_STAGED="%{$fg_bold[green]%}●"
-ZSH_THEME_GIT_PROMPT_CONFLICTS="%{$fg_bold[red]%}✖"
-ZSH_THEME_GIT_PROMPT_CHANGED="%{$fg_bold[red]%}✚"
-ZSH_THEME_GIT_PROMPT_REMOTE=""
-ZSH_THEME_GIT_PROMPT_UNTRACKED="…"
-ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg_bold[cyan]%}✔"
-
-
-
-PROMPT='%B%F{green}%~%b%F{white}$(git_super_status)%{$fg_bold[white]%}: '
-RPROMPT='${${KEYMAP/vicmd/$VIM_PROMPT}/(main|viins)/} $EPS1'
-
-export KEYTIMEOUT=1
-
-# Arrow-driven completion
-zstyle ':completion:*' menu select
-
-# Complete Aliases
-setopt completealiases
-
-PATH=$PATH:$HOME/.rvm/bin # Add RVM to PATH for scripting
-
-### Added by the Heroku Toolbelt
-export PATH="/usr/local/heroku/bin:$PATH"
-
-export PATH="$PATH:$HOME/.rvm/bin" # Add RVM to PATH for scripting
-[[ -s "$HOME/.rvm/scripts/rvm" ]] && . "$HOME/.rvm/scripts/rvm"  # This loads RVM
-

Makefile

@@ -0,0 +1,28 @@
+linux: link bash_git_prompt tmux vim
+macos: link bash_git_prompt brew cask tmux vim
+
+link:
+	-ln -s ~/Git/dotfiles/.bash_aliases ~/.bash_aliases
+	-ln -s ~/Git/dotfiles/.bashrc ~/.bashrc
+	-ln -s ~/Git/dotfiles/.git-completion.bash ~/.git-completion.bash
+	-ln -s ~/Git/dotfiles/.gitconfig ~/.gitconfig
+	-ln -s ~/Git/dotfiles/.tmux.conf ~/.tmux.conf
+
+brew:
+	sh ./macos/brewfile.sh
+
+cask:
+	sh ./macos/caskfile.sh
+
+tmux:
+	-git clone https://github.com/tmux-plugins/tpm ~/.tmux/plugins/tpm
+	-ln -s ~/Git/dotfiles/.tmux/themes ~/.tmux/themes
+
+bash_git_prompt:
+	-git clone https://github.com/magicmonty/bash-git-prompt.git ~/.bash-git-prompt --depth=1
+	-ln -s ~/Git/dotfiles/.git-prompt-colors.sh ~/.git-prompt-colors.sh
+
+vim:
+ 	-ln -s ~/Git/dotfiles/.vim ~/.vim
+	-ln -s ~/Git/dotfiles/.vimrc ~/.vimrc
+	-git clone https://github.com/VundleVim/Vundle.vim.git ~/.vim/bundle/Vundle.vim

diff.py

@@ -1,6 +0,0 @@
-#!/usr/bin/python
-
-import sys
-import os
-
-os.system('meld "%s" "%s"' % (sys.argv[2], sys.argv[5]))

mac_install/brewfile.sh

@@ -1,7 +0,0 @@
-brew install git
-brew install tmux
-brew install zsh
-brew install macvim
-brew linkapps macvim
-
-brew install kdiff3

mac_install/caskfile.sh

@@ -1,39 +0,0 @@
-# Install Cask
-brew install caskroom/cask/brew-cask
-
-# Install Casks
-brew cask install firefox
-brew cask install spotify
-brew cask install steam
-# brew cask install adium
-brew cask install sublime-text
-brew cask install eclipse-java
-brew cask install evernote
-brew cask install skype
-
-brew cask install sizeup
-# brew cask install cinch
-brew cask install battle-net
-brew cask install istat-menus
-brew cask install bartender
-brew cask install karabiner
-brew cask install macvim
-brew cask install google-chrome
-brew cask install the-unarchiver
-brew cask install magicprefs
-brew cask install dropbox
-brew cask install vlc
-
-brew cask install divvy
-brew cask install seil
-brew cask install quicklook-csv
-brew cask install lastpass
-brew cask install sourcetree
-# brew cask install postbox
-
-brew cask install transmission
-brew cask install plex-home-theater
-brew cask install teamviewer
-
-brew cask install telegram
-brew cask install itsycal

mac_install/karabiner_private.xml

@@ -1,17 +0,0 @@
-<?xml version="1.0"?>
-<root>
-	<item>
-		<name>Use PC Style "Change Input Source" Georgi</name>
-		<appendix>Flip between input modes</appendix>
-		<appendix>(Option_L+Shift_L to Command+Space)</appendix>
-		<appendix>If you want to use Option_L+Shift_L as modifier, press Shift_L first. (then press Option_L.)</appendix>
-		<identifier>remap.pcstyle_changeinputmethod1georgi</identifier>
-		<autogen>__KeyToKey__ KeyCode::SHIFT_L, ModifierFlag::COMMAND_L, KeyCode::SLASH, ModifierFlag::COMMAND_L, ModifierFlag::SHIFT_L</autogen>
-	</item>
-	<item>
-		<name>Replace ± with ~ Georgi</name>
-		<appendix>Fix keys</appendix>
-		<identifier>remap.pcstyle_changetildebacktick</identifier>
-		<autogen>__KeyToKey__ KeyCode::UK_SECTION, KeyCode::BACKQUOTE</autogen>
-	</item>
-</root>

mac_install/manual_install_apps

@@ -1,7 +0,0 @@
-degrees
-wunderlist
-pocket
-twitter
-xcode
-watts
-snap

macos/alfred/themes/Luminescence.alfredappearance

@@ -0,0 +1,65 @@
+{
+  "alfredtheme" : {
+    "result" : {
+      "textSpacing" : 5,
+      "subtext" : {
+        "size" : 12,
+        "colorSelected" : "#FFFFFFCC",
+        "font" : "System",
+        "color" : "#B3B5B5FF"
+      },
+      "shortcut" : {
+        "size" : 16,
+        "colorSelected" : "#FFFFFFFF",
+        "font" : "System",
+        "color" : "#00A9F8FF"
+      },
+      "backgroundSelected" : "#00A7F9FF",
+      "text" : {
+        "size" : 18,
+        "colorSelected" : "#FFFFFFFF",
+        "font" : "System",
+        "color" : "#FFFFFFD8"
+      },
+      "iconPaddingHorizontal" : 6,
+      "roundness" : 5,
+      "paddingVertical" : 3,
+      "iconSize" : 40
+    },
+    "search" : {
+      "backgroundSelected" : "#016BDEFF",
+      "paddingHorizontal" : 8,
+      "spacing" : 6,
+      "text" : {
+        "size" : 25,
+        "colorSelected" : "#FFFFFFFF",
+        "font" : "Helvetica Neue Light",
+        "color" : "#ECEDECFF"
+      },
+      "background" : "#27303AFF",
+      "roundness" : 6,
+      "paddingVertical" : 5
+    },
+    "window" : {
+      "color" : "#2E3741FF",
+      "paddingHorizontal" : 6,
+      "width" : 559,
+      "borderPadding" : 0,
+      "borderColor" : "#FFFFFF00",
+      "blur" : 0,
+      "roundness" : 6,
+      "paddingVertical" : 6
+    },
+    "credit" : "GG",
+    "visualEffectMode" : 2,
+    "separator" : {
+      "color" : "#CBCBCBF3",
+      "thickness" : 0
+    },
+    "scrollbar" : {
+      "color" : "#6D6D6DFF",
+      "thickness" : 2
+    },
+    "name" : "Luminescence"
+  }
+}

macos/brewfile.sh

@@ -0,0 +1,8 @@
+brew install bash
+sudo chsh -s /usr/local/bin/bash
+
+brew install bash-git-prompt
+brew install git
+brew install nvm
+brew install thefuck
+brew install tmux

macos/caskfile.sh

@@ -0,0 +1,42 @@
+# Install Cask
+brew install caskroom/cask/brew-cask
+
+# Install Casks
+
+brew cask install authy
+brew cask install bartender
+brew cask install bettertouchtool
+brew cask install firefox
+brew cask install forklift
+brew cask install google-chrome
+brew cask install istat-menus
+brew cask install iterm2
+brew cask install karabiner-elements
+brew cask install slack
+brew cask install sourcetree
+brew cask install spotify
+brew cask install the-unarchiver
+brew cask install visual-studi-code
+brew cask install vlc
+
+# brew cask install adium
+# brew cask install battle-net
+# brew cask install cinch
+# brew cask install divvy
+# brew cask install dropbox
+# brew cask install eclipse-java
+# brew cask install evernote
+# brew cask install itsycal
+# brew cask install lastpass
+# brew cask install magicprefs
+# brew cask install plex-home-theater
+# brew cask install postbox
+# brew cask install quicklook-csv
+# brew cask install seil
+# brew cask install sizeup
+# brew cask install skype
+# brew cask install steam
+# brew cask install sublime-text
+# brew cask install teamviewer
+# brew cask install telegram
+# brew cask install transmission

macos/itermcolors/tomorrow-night.itermcolors

@@ -0,0 +1,357 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>Ansi 0 Color</key>
+	<dict>
+		<key>Alpha Component</key>
+		<real>1</real>
+		<key>Blue Component</key>
+		<real>0.0</real>
+		<key>Color Space</key>
+		<string>sRGB</string>
+		<key>Green Component</key>
+		<real>0.0</real>
+		<key>Red Component</key>
+		<real>0.0</real>
+	</dict>
+	<key>Ansi 1 Color</key>
+	<dict>
+		<key>Alpha Component</key>
+		<real>1</real>
+		<key>Blue Component</key>
+		<real>0.47467166185379028</real>
+		<key>Color Space</key>
+		<string>sRGB</string>
+		<key>Green Component</key>
+		<real>0.48615175485610962</real>
+		<key>Red Component</key>
+		<real>0.84407895803451538</real>
+	</dict>
+	<key>Ansi 10 Color</key>
+	<dict>
+		<key>Alpha Component</key>
+		<real>1</real>
+		<key>Blue Component</key>
+		<real>0.48212379217147827</real>
+		<key>Color Space</key>
+		<string>sRGB</string>
+		<key>Green Component</key>
+		<real>0.7796512246131897</real>
+		<key>Red Component</key>
+		<real>0.75982838869094849</real>
+	</dict>
+	<key>Ansi 11 Color</key>
+	<dict>
+		<key>Alpha Component</key>
+		<real>1</real>
+		<key>Blue Component</key>
+		<real>0.5276486873626709</real>
+		<key>Color Space</key>
+		<string>sRGB</string>
+		<key>Green Component</key>
+		<real>0.81325840950012207</real>
+		<key>Red Component</key>
+		<real>0.95596224069595337</real>
+	</dict>
+	<key>Ansi 12 Color</key>
+	<dict>
+		<key>Alpha Component</key>
+		<real>1</real>
+		<key>Blue Component</key>
+		<real>0.79152572154998779</real>
+		<key>Color Space</key>
+		<string>sRGB</string>
+		<key>Green Component</key>
+		<real>0.69708853960037231</real>
+		<key>Red Component</key>
+		<real>0.57461577653884888</real>
+	</dict>
+	<key>Ansi 13 Color</key>
+	<dict>
+		<key>Alpha Component</key>
+		<real>1</real>
+		<key>Blue Component</key>
+		<real>0.78127235174179077</real>
+		<key>Color Space</key>
+		<string>sRGB</string>
+		<key>Green Component</key>
+		<real>0.65371012687683105</real>
+		<key>Red Component</key>
+		<real>0.75323194265365601</real>
+	</dict>
+	<key>Ansi 14 Color</key>
+	<dict>
+		<key>Alpha Component</key>
+		<real>1</real>
+		<key>Blue Component</key>
+		<real>0.76780575513839722</real>
+		<key>Color Space</key>
+		<string>sRGB</string>
+		<key>Green Component</key>
+		<real>0.78734117746353149</real>
+		<key>Red Component</key>
+		<real>0.60513764619827271</real>
+	</dict>
+	<key>Ansi 15 Color</key>
+	<dict>
+		<key>Alpha Component</key>
+		<real>1</real>
+		<key>Blue Component</key>
+		<real>0.99999994039535522</real>
+		<key>Color Space</key>
+		<string>sRGB</string>
+		<key>Green Component</key>
+		<real>0.99999994039535522</real>
+		<key>Red Component</key>
+		<real>0.9999966025352478</real>
+	</dict>
+	<key>Ansi 2 Color</key>
+	<dict>
+		<key>Alpha Component</key>
+		<real>1</real>
+		<key>Blue Component</key>
+		<real>0.48212379217147827</real>
+		<key>Color Space</key>
+		<string>sRGB</string>
+		<key>Green Component</key>
+		<real>0.7796512246131897</real>
+		<key>Red Component</key>
+		<real>0.75982838869094849</real>
+	</dict>
+	<key>Ansi 3 Color</key>
+	<dict>
+		<key>Alpha Component</key>
+		<real>1</real>
+		<key>Blue Component</key>
+		<real>0.5276486873626709</real>
+		<key>Color Space</key>
+		<string>sRGB</string>
+		<key>Green Component</key>
+		<real>0.81325840950012207</real>
+		<key>Red Component</key>
+		<real>0.95596224069595337</real>
+	</dict>
+	<key>Ansi 4 Color</key>
+	<dict>
+		<key>Alpha Component</key>
+		<real>1</real>
+		<key>Blue Component</key>
+		<real>0.79152572154998779</real>
+		<key>Color Space</key>
+		<string>sRGB</string>
+		<key>Green Component</key>
+		<real>0.69708853960037231</real>
+		<key>Red Component</key>
+		<real>0.57461577653884888</real>
+	</dict>
+	<key>Ansi 5 Color</key>
+	<dict>
+		<key>Alpha Component</key>
+		<real>1</real>
+		<key>Blue Component</key>
+		<real>0.78127235174179077</real>
+		<key>Color Space</key>
+		<string>sRGB</string>
+		<key>Green Component</key>
+		<real>0.65371012687683105</real>
+		<key>Red Component</key>
+		<real>0.75323194265365601</real>
+	</dict>
+	<key>Ansi 6 Color</key>
+	<dict>
+		<key>Alpha Component</key>
+		<real>1</real>
+		<key>Blue Component</key>
+		<real>0.76780575513839722</real>
+		<key>Color Space</key>
+		<string>sRGB</string>
+		<key>Green Component</key>
+		<real>0.78734117746353149</real>
+		<key>Red Component</key>
+		<real>0.60513764619827271</real>
+	</dict>
+	<key>Ansi 7 Color</key>
+	<dict>
+		<key>Alpha Component</key>
+		<real>1</real>
+		<key>Blue Component</key>
+		<real>0.99999994039535522</real>
+		<key>Color Space</key>
+		<string>sRGB</string>
+		<key>Green Component</key>
+		<real>0.99999994039535522</real>
+		<key>Red Component</key>
+		<real>0.9999966025352478</real>
+	</dict>
+	<key>Ansi 8 Color</key>
+	<dict>
+		<key>Alpha Component</key>
+		<real>1</real>
+		<key>Blue Component</key>
+		<real>0.0</real>
+		<key>Color Space</key>
+		<string>sRGB</string>
+		<key>Green Component</key>
+		<real>0.0</real>
+		<key>Red Component</key>
+		<real>0.0</real>
+	</dict>
+	<key>Ansi 9 Color</key>
+	<dict>
+		<key>Alpha Component</key>
+		<real>1</real>
+		<key>Blue Component</key>
+		<real>0.47467166185379028</real>
+		<key>Color Space</key>
+		<string>sRGB</string>
+		<key>Green Component</key>
+		<real>0.48615175485610962</real>
+		<key>Red Component</key>
+		<real>0.84407895803451538</real>
+	</dict>
+	<key>Background Color</key>
+	<dict>
+		<key>Alpha Component</key>
+		<real>1</real>
+		<key>Blue Component</key>
+		<real>0.17268243432044983</real>
+		<key>Color Space</key>
+		<string>sRGB</string>
+		<key>Green Component</key>
+		<real>0.16236096620559692</real>
+		<key>Red Component</key>
+		<real>0.15134406089782715</real>
+	</dict>
+	<key>Badge Color</key>
+	<dict>
+		<key>Alpha Component</key>
+		<real>0.5</real>
+		<key>Blue Component</key>
+		<real>0.0</real>
+		<key>Color Space</key>
+		<string>sRGB</string>
+		<key>Green Component</key>
+		<real>0.1491314172744751</real>
+		<key>Red Component</key>
+		<real>1</real>
+	</dict>
+	<key>Bold Color</key>
+	<dict>
+		<key>Alpha Component</key>
+		<real>1</real>
+		<key>Blue Component</key>
+		<real>0.81766432523727417</real>
+		<key>Color Space</key>
+		<string>sRGB</string>
+		<key>Green Component</key>
+		<real>0.82387620210647583</real>
+		<key>Red Component</key>
+		<real>0.8140903115272522</real>
+	</dict>
+	<key>Cursor Color</key>
+	<dict>
+		<key>Alpha Component</key>
+		<real>1</real>
+		<key>Blue Component</key>
+		<real>0.81766432523727417</real>
+		<key>Color Space</key>
+		<string>sRGB</string>
+		<key>Green Component</key>
+		<real>0.82387620210647583</real>
+		<key>Red Component</key>
+		<real>0.8140903115272522</real>
+	</dict>
+	<key>Cursor Guide Color</key>
+	<dict>
+		<key>Alpha Component</key>
+		<real>0.25</real>
+		<key>Blue Component</key>
+		<real>1</real>
+		<key>Color Space</key>
+		<string>sRGB</string>
+		<key>Green Component</key>
+		<real>0.9268307089805603</real>
+		<key>Red Component</key>
+		<real>0.70213186740875244</real>
+	</dict>
+	<key>Cursor Text Color</key>
+	<dict>
+		<key>Alpha Component</key>
+		<real>1</real>
+		<key>Blue Component</key>
+		<real>0.17268243432044983</real>
+		<key>Color Space</key>
+		<string>sRGB</string>
+		<key>Green Component</key>
+		<real>0.16236096620559692</real>
+		<key>Red Component</key>
+		<real>0.15134406089782715</real>
+	</dict>
+	<key>Foreground Color</key>
+	<dict>
+		<key>Alpha Component</key>
+		<real>1</real>
+		<key>Blue Component</key>
+		<real>0.81766432523727417</real>
+		<key>Color Space</key>
+		<string>sRGB</string>
+		<key>Green Component</key>
+		<real>0.82387620210647583</real>
+		<key>Red Component</key>
+		<real>0.8140903115272522</real>
+	</dict>
+	<key>Link Color</key>
+	<dict>
+		<key>Alpha Component</key>
+		<real>1</real>
+		<key>Blue Component</key>
+		<real>0.73423302173614502</real>
+		<key>Color Space</key>
+		<string>sRGB</string>
+		<key>Green Component</key>
+		<real>0.35916060209274292</real>
+		<key>Red Component</key>
+		<real>0.0</real>
+	</dict>
+	<key>Selected Text Color</key>
+	<dict>
+		<key>Alpha Component</key>
+		<real>1</real>
+		<key>Blue Component</key>
+		<real>0.81766432523727417</real>
+		<key>Color Space</key>
+		<string>sRGB</string>
+		<key>Green Component</key>
+		<real>0.82387620210647583</real>
+		<key>Red Component</key>
+		<real>0.8140903115272522</real>
+	</dict>
+	<key>Selection Color</key>
+	<dict>
+		<key>Alpha Component</key>
+		<real>1</real>
+		<key>Blue Component</key>
+		<real>0.32358166575431824</real>
+		<key>Color Space</key>
+		<string>sRGB</string>
+		<key>Green Component</key>
+		<real>0.2975325882434845</real>
+		<key>Red Component</key>
+		<real>0.27846634387969971</real>
+	</dict>
+	<key>Tab Color</key>
+	<dict>
+		<key>Alpha Component</key>
+		<real>1</real>
+		<key>Blue Component</key>
+		<real>0.69531339406967163</real>
+		<key>Color Space</key>
+		<string>sRGB</string>
+		<key>Green Component</key>
+		<real>0.69531339406967163</real>
+		<key>Red Component</key>
+		<real>0.83334356546401978</real>
+	</dict>
+</dict>
+</plist>

sublime/Custom-Themes/Espresso Soda.tmTheme

@@ -1,683 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-    <key>name</key>
-    <string>Espresso Soda</string>
-    <key>settings</key>
-    <array>
-        <dict>
-            <key>settings</key>
-            <dict>
-                <key>background</key>
-                <string>#FFFFFF</string>
-                <key>caret</key>
-                <string>#000000</string>
-                <key>foreground</key>
-                <string>#000000</string>
-                <key>invisibles</key>
-                <string>#E0E0E0</string>
-                <key>lineHighlight</key>
-                <string>#A5A5A526</string>
-                <key>selection</key>
-                <string>#C2E8FF</string>
-                <key>selectionBorder</key>
-                <string>#AACBDF</string>
-                <key>inactiveSelection</key>
-                <string>#EDEDED</string>
-                <key>findHighlight</key>
-                <string>#FFE792</string>
-                <key>findHighlightForeground</key>
-                <string>#000000</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Comments</string>
-            <key>scope</key>
-            <string>comment, comment punctuation</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string></string>
-                <key>foreground</key>
-                <string>#ADADAD</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Comments: Preprocessor</string>
-            <key>scope</key>
-            <string>comment.block.preprocessor</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string></string>
-                <key>foreground</key>
-                <string>#ADADAD</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Comments: Documentation</string>
-            <key>scope</key>
-            <string>comment.documentation, comment.block.documentation</string>
-            <key>settings</key>
-            <dict>
-                <key>background</key>
-                <string>#FFFDF7</string>
-                <key>fontStyle</key>
-                <string></string>
-                <key>foreground</key>
-                <string>#BC670F</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Invalid - Deprecated</string>
-            <key>scope</key>
-            <string>invalid.deprecated</string>
-            <key>settings</key>
-            <dict>
-                <key>background</key>
-                <string>#EFCFCF</string>
-                <key>fontStyle</key>
-                <string>italic underline</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Invalid - Illegal</string>
-            <key>scope</key>
-            <string>invalid.illegal</string>
-            <key>settings</key>
-            <dict>
-                <key>background</key>
-                <string>#F93232</string>
-                <key>fontStyle</key>
-                <string></string>
-                <key>foreground</key>
-                <string>#F9F2CE</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Operators</string>
-            <key>scope</key>
-            <string>keyword.operator</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string></string>
-                <key>foreground</key>
-                <string>#626FC9</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Keywords</string>
-            <key>scope</key>
-            <string>keyword, storage</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string></string>
-                <key>foreground</key>
-                <string>#61862F</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Types</string>
-            <key>scope</key>
-            <string>storage.type, support.type</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string></string>
-                <key>foreground</key>
-                <string>#6700B9</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Language Constants</string>
-            <key>scope</key>
-            <string>constant.language, support.constant, variable.language</string>
-            <key>settings</key>
-            <dict>
-                <key>background</key>
-                <string>#F3F2FF</string>
-                <key>fontStyle</key>
-                <string></string>
-                <key>foreground</key>
-                <string>#7653C1</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Variables</string>
-            <key>scope</key>
-            <string>variable, support.variable</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string></string>
-                <key>foreground</key>
-                <string>#4C8FC7</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Variables: Punctuation</string>
-            <key>scope</key>
-            <string>variable punctuation</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string></string>
-                <key>foreground</key>
-                <string>#4C8FC7</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Functions</string>
-            <key>scope</key>
-            <string>entity.name.function, support.function, entity</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string></string>
-                <key>foreground</key>
-                <string>#61862F</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Classes</string>
-            <key>scope</key>
-            <string>entity.name.type, entity.other.inherited-class, support.class</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string></string>
-                <key>foreground</key>
-                <string>#3A1D72</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Exceptions</string>
-            <key>scope</key>
-            <string>entity.name.exception</string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#F93232</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Sections</string>
-            <key>scope</key>
-            <string>entity.name.section</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string></string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Numbers</string>
-            <key>scope</key>
-            <string>constant.numeric, constant</string>
-            <key>settings</key>
-            <dict>
-                <key>background</key>
-                <string>#F3F2FF</string>
-                <key>fontStyle</key>
-                <string></string>
-                <key>foreground</key>
-                <string>#7653C1</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Punctuation</string>
-            <key>scope</key>
-            <string>punctuation</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string></string>
-                <key>foreground</key>
-                <string>#000000</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Strings</string>
-            <key>scope</key>
-            <string>constant.character, string</string>
-            <key>settings</key>
-            <dict>
-                <key>background</key>
-                <string>#FBE9AD1A</string>
-                <key>fontStyle</key>
-                <string></string>
-                <key>foreground</key>
-                <string>#BC670F</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Strings: Punctuation</string>
-            <key>scope</key>
-            <string>string punctuation</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string></string>
-                <key>foreground</key>
-                <string>#E69A4C</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Strings: Escape Sequences</string>
-            <key>scope</key>
-            <string>constant.character.escape</string>
-            <key>settings</key>
-            <dict>
-                <key>background</key>
-                <string>#FBE9ADCC</string>
-                <key>fontStyle</key>
-                <string>bold</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Strings: Regular Expressions</string>
-            <key>scope</key>
-            <string>string.regexp</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string></string>
-                <key>foreground</key>
-                <string>#699D36</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Strings: Symbols</string>
-            <key>scope</key>
-            <string>constant.other.symbol</string>
-            <key>settings</key>
-            <dict>
-                <key>background</key>
-                <string>#E8FFD5</string>
-                <key>fontStyle</key>
-                <string>bold</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Embedded Source</string>
-            <key>scope</key>
-            <string>string source, text source</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string></string>
-                <key>foreground</key>
-                <string>#434343</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>-----------------------------------</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string></string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>HTML: Doctype Declaration</string>
-            <key>scope</key>
-            <string>meta.tag.sgml.doctype</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string></string>
-                <key>foreground</key>
-                <string>#7F7F7F</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>HTML: Tags</string>
-            <key>scope</key>
-            <string>entity.name.tag</string>
-            <key>settings</key>
-            <dict>
-                <key>background</key>
-                <string>#F4FAFF</string>
-                <key>fontStyle</key>
-                <string></string>
-                <key>foreground</key>
-                <string>#2F6F9F</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>HTML: Attribute Punctuation</string>
-            <key>scope</key>
-            <string>meta.tag string punctuation</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string></string>
-                <key>foreground</key>
-                <string>#5FAFEF</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>HTML: Tag Punctuation</string>
-            <key>scope</key>
-            <string>punctuation.definition.tag</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string></string>
-                <key>foreground</key>
-                <string>#4F9FCF</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>HTML: Entities</string>
-            <key>scope</key>
-            <string>constant.character.entity</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string></string>
-                <key>foreground</key>
-                <string>#000000</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>HTML: Attribute Names</string>
-            <key>scope</key>
-            <string>entity.other.attribute-name</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string></string>
-                <key>foreground</key>
-                <string>#4F9FCF</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>HTML: Attribute Values</string>
-            <key>scope</key>
-            <string>meta.tag string.quoted, meta.tag string.quoted constant.character.entity</string>
-            <key>settings</key>
-            <dict>
-                <key>background</key>
-                <string>#FFFFFF</string>
-                <key>fontStyle</key>
-                <string></string>
-                <key>foreground</key>
-                <string>#D44950</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>-----------------------------------</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string></string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>CSS: Selectors</string>
-            <key>scope</key>
-            <string>meta.selector, meta.selector entity, meta.selector entity punctuation, entity.name.tag.css</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string></string>
-                <key>foreground</key>
-                <string>#3A77BF</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>CSS: Property Names</string>
-            <key>scope</key>
-            <string>meta.property-name, support.type.property-name</string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#D4430D</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>CSS: Property Values</string>
-            <key>scope</key>
-            <string>meta.property-value constant.numeric, meta.property-value constant, meta.property-value keyword</string>
-            <key>settings</key>
-            <dict>
-                <key>background</key>
-                <string>#FFFFFF</string>
-                <key>fontStyle</key>
-                <string></string>
-                <key>foreground</key>
-                <string>#43A202</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>-----------------------------------</string>
-            <key>settings</key>
-            <dict/>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Markup: Changed</string>
-            <key>scope</key>
-            <string>markup.changed</string>
-            <key>settings</key>
-            <dict>
-                <key>background</key>
-                <string>#FFFFDD</string>
-                <key>fontStyle</key>
-                <string></string>
-                <key>foreground</key>
-                <string>#000000</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Markup: Deletion</string>
-            <key>scope</key>
-            <string>markup.deleted</string>
-            <key>settings</key>
-            <dict>
-                <key>background</key>
-                <string>#FFDDDD</string>
-                <key>foreground</key>
-                <string>#000000</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Markup: Emphasis</string>
-            <key>scope</key>
-            <string>markup.italic</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string>italic</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Markup: Error</string>
-            <key>scope</key>
-            <string>markup.error</string>
-            <key>settings</key>
-            <dict>
-                <key>background</key>
-                <string>#F93232</string>
-                <key>fontStyle</key>
-                <string></string>
-                <key>foreground</key>
-                <string>#F9F2CE</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Markup: Insertion</string>
-            <key>scope</key>
-            <string>markup.inserted</string>
-            <key>settings</key>
-            <dict>
-                <key>background</key>
-                <string>#DDFFDD</string>
-                <key>fontStyle</key>
-                <string></string>
-                <key>foreground</key>
-                <string>#000000</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Markup: Output</string>
-            <key>scope</key>
-            <string>markup.output, markup.raw</string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#7F7F7F</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Markup: Prompt</string>
-            <key>scope</key>
-            <string>markup.prompt</string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#555555</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Markup: Heading</string>
-            <key>scope</key>
-            <string>markup.heading</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string>bold</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Markup: Strong</string>
-            <key>scope</key>
-            <string>markup.bold</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string>bold</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Markup: Traceback</string>
-            <key>scope</key>
-            <string>markup.traceback</string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#F93232</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Markup: Underline</string>
-            <key>scope</key>
-            <string>markup.underline</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string>underline</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>-----------------------------------</string>
-            <key>settings</key>
-            <dict/>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Extra: Diff Range</string>
-            <key>scope</key>
-            <string>meta.diff.range, meta.diff.index, meta.separator</string>
-            <key>settings</key>
-            <dict>
-                <key>background</key>
-                <string>#EAF2F5</string>
-                <key>fontStyle</key>
-                <string></string>
-                <key>foreground</key>
-                <string>#434343</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Extra: Diff From</string>
-            <key>scope</key>
-            <string>meta.diff.header.from-file</string>
-            <key>settings</key>
-            <dict>
-                <key>background</key>
-                <string>#FFDDDD</string>
-                <key>foreground</key>
-                <string>#434343</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Extra: Diff To</string>
-            <key>scope</key>
-            <string>meta.diff.header.to-file</string>
-            <key>settings</key>
-            <dict>
-                <key>background</key>
-                <string>#DDFFDD</string>
-                <key>foreground</key>
-                <string>#434343</string>
-            </dict>
-        </dict>
-    </array>
-    <key>uuid</key>
-    <string>BF4E1964-0DB9-4E88-8142-E8F52D7EDEEC</string>
-</dict>
-</plist>

sublime/Custom-Themes/Monokai Soda.tmTheme

@@ -1,351 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-    <key>name</key>
-    <string>Monokai Soda</string>
-    <key>settings</key>
-    <array>
-        <dict>
-            <key>settings</key>
-            <dict>
-                <key>background</key>
-                <string>#222222</string>
-                <key>caret</key>
-                <string>#F8F8F0</string>
-                <key>foreground</key>
-                <string>#F8F8F2</string>
-                <key>invisibles</key>
-                <string>#3B3A32</string>
-                <key>lineHighlight</key>
-                <string>#333333</string>
-                <key>selection</key>
-                <string>#444444</string>
-                <key>findHighlight</key>
-                <string>#FFE792</string>
-                <key>findHighlightForeground</key>
-                <string>#000000</string>
-                <key>selectionBorder</key>
-                <string>#1c1c1c</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Comment</string>
-            <key>scope</key>
-            <string>comment</string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#75715E</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>String</string>
-            <key>scope</key>
-            <string>string</string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#E6DB74</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Number</string>
-            <key>scope</key>
-            <string>constant.numeric</string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#AE81FF</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Built-in constant</string>
-            <key>scope</key>
-            <string>constant.language</string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#AE81FF</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>User-defined constant</string>
-            <key>scope</key>
-            <string>constant.character, constant.other</string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#AE81FF</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Variable</string>
-            <key>scope</key>
-            <string>variable</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string></string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Keyword</string>
-            <key>scope</key>
-            <string>keyword</string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#F92672</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Storage</string>
-            <key>scope</key>
-            <string>storage</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string></string>
-                <key>foreground</key>
-                <string>#F92672</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Storage type</string>
-            <key>scope</key>
-            <string>storage.type</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string>italic</string>
-                <key>foreground</key>
-                <string>#66D9EF</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Class name</string>
-            <key>scope</key>
-            <string>entity.name.class</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string>underline</string>
-                <key>foreground</key>
-                <string>#A6E22E</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Inherited class</string>
-            <key>scope</key>
-            <string>entity.other.inherited-class</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string>italic underline</string>
-                <key>foreground</key>
-                <string>#A6E22E</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Function name</string>
-            <key>scope</key>
-            <string>entity.name.function</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string></string>
-                <key>foreground</key>
-                <string>#A6E22E</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Function argument</string>
-            <key>scope</key>
-            <string>variable.parameter</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string>italic</string>
-                <key>foreground</key>
-                <string>#FD971F</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Tag name</string>
-            <key>scope</key>
-            <string>entity.name.tag</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string></string>
-                <key>foreground</key>
-                <string>#F92672</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Tag attribute</string>
-            <key>scope</key>
-            <string>entity.other.attribute-name</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string></string>
-                <key>foreground</key>
-                <string>#A6E22E</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Library function</string>
-            <key>scope</key>
-            <string>support.function</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string></string>
-                <key>foreground</key>
-                <string>#66D9EF</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Library constant</string>
-            <key>scope</key>
-            <string>support.constant</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string></string>
-                <key>foreground</key>
-                <string>#66D9EF</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Library class/type</string>
-            <key>scope</key>
-            <string>support.type, support.class</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string>italic</string>
-                <key>foreground</key>
-                <string>#66D9EF</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Library variable</string>
-            <key>scope</key>
-            <string>support.other.variable</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string></string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Invalid</string>
-            <key>scope</key>
-            <string>invalid</string>
-            <key>settings</key>
-            <dict>
-                <key>background</key>
-                <string>#F92672</string>
-                <key>fontStyle</key>
-                <string></string>
-                <key>foreground</key>
-                <string>#F8F8F0</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Invalid deprecated</string>
-            <key>scope</key>
-            <string>invalid.deprecated</string>
-            <key>settings</key>
-            <dict>
-                <key>background</key>
-                <string>#AE81FF</string>
-                <key>foreground</key>
-                <string>#F8F8F0</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>JSON String</string>
-            <key>scope</key>
-            <string>meta.structure.dictionary.json string.quoted.double.json</string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#CFCFC2</string>
-            </dict>
-        </dict>
-
-        <dict>
-            <key>name</key>
-            <string>diff.header</string>
-            <key>scope</key>
-            <string>meta.diff, meta.diff.header</string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#75715E</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>diff.deleted</string>
-            <key>scope</key>
-            <string>markup.deleted</string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#F92672</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>diff.inserted</string>
-            <key>scope</key>
-            <string>markup.inserted</string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#A6E22E</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>diff.changed</string>
-            <key>scope</key>
-            <string>markup.changed</string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#E6DB74</string>
-            </dict>
-        </dict>
-    </array>
-    <key>uuid</key>
-    <string>5EAF4173-5DDE-4D64-A1E8-C1671C7EE339</string>
-</dict>
-</plist>

sublime/Custom-Themes/README

@@ -1 +0,0 @@
-Symlink this folder in Sublime's Packages/ folder

sublime/Default (Linux).sublime-keymap

@@ -1,10 +0,0 @@
-[
-    { "keys": ["ctrl+d"], "command": "run_macro_file", "args": {"file": "Packages/Default/Delete Line.sublime-macro"} },
-    { "keys": ["ctrl+shift+k"], "command": "find_under_expand" },
-
-    { "keys": ["ctrl+shift+1"], "command": "open_related_rails_model" },
-    { "keys": ["ctrl+shift2"], "command": "open_related_rails_controller" },
-    { "keys": ["ctrl+shift3"], "command": "open_related_rails_view" },
-    { "keys": ["ctrl+shift4"], "command": "open_related_rspec_model" },
-    { "keys": ["ctrl+shift5"], "command": "open_related_rspec_controller" }
-]

sublime/Default (OSX).sublime-keymap

@@ -1,13 +0,0 @@
-[
-    { "keys": ["ctrl+tab"], "command": "next_view" },
-    { "keys": ["ctrl+shift+tab"], "command": "prev_view" },
-    { "keys": ["f11"], "command": "toggle_full_screen" },
-    { "keys": ["shift+f11"], "command": "toggle_distraction_free" },
-    { "keys": ["ctrl+d"], "command": "run_macro_file", "args": {"file": "Packages/Default/Delete Line.sublime-macro"} },
-    { "keys": ["ctrl+shift+k"], "command": "find_under_expand" },
-    { "keys": ["alt+shift+t"], "command": "delete_trailing_spaces" },
-    { "keys": ["ctrl+t"], "command": "new_file" },
-    { "keys": ["ctrl+w"], "command": "close" },
-    { "keys": ["ctrl+d"], "command": "run_macro_file", "args": {"file": "Packages/Default/Delete Line.sublime-macro"} },
-    { "keys": ["ctrl+shift+d"], "command": "duplicate_line" }
-]

sublime/Default (Windows).sublime-keymap

@@ -1,4 +0,0 @@
-[
-    { "keys": ["ctrl+d"], "command": "run_macro_file", "args": {"file": "Packages/Default/Delete Line.sublime-macro"} },
-    { "keys": ["ctrl+shift+k"], "command": "find_under_expand" }
-]

sublime/Preferences.sublime-settings

@@ -1,19 +0,0 @@
-{
-	"color_scheme": "Packages/Color Scheme - Default/Monokai.tmTheme",
-	"ensure_newline_at_eof_on_save": true,
-	"fallback_encoding": "Cyrillic (Windows 1251)",
-	"font_size": 10.0,
-	"highlight_line": true,
-	"ignored_packages":
-	[
-		"Vintage"
-	],
-	"rulers":
-	[
-		80
-	],
-	"scroll_speed": 0,
-	"translate_tabs_to_spaces": true,
-	"trim_trailing_white_space_on_save": true,
-	"word_wrap": true
-}

sublime/README

@@ -1,2 +0,0 @@
-* Symlink these files in the Sublime's Packages/User folder
-* The `package_control_packages` is just a useful list of packages. You have to install them manually and keep track of them yourself

sublime/RSpec.sublime-settings

@@ -1,3 +0,0 @@
-{
-  "tab_size": 2
-}

sublime/Ruby.sublime-settings

@@ -1,4 +0,0 @@
-{
-  "tab_size": 2,
-  "translate_tabs_to_spaces": true
-}

sublime/package_control_packages

@@ -1,23 +0,0 @@
-{
-	"bootstrapped": true,
-	"in_process_packages":
-	[
-	],
-	"installed_packages":
-	[
-		"Alignment",
-		"Cucumber",
-		"Cucumber Step Finder",
-		"Git",
-		"GitGutter",
-		"Guard",
-		"Package Control",
-		"Rake",
-		"RSpec",
-		"RubyTest",
-		"SublimeREPL"
-		"Git Commit Message Syntax",
-		"Gitignore",
-		"Jade"
-	]
-}