Update linux dotfiles

.bash_aliases

@@ -35,12 +35,6 @@ alias c="clear"
 alias be="bundle exec"
 alias share="python -m SimpleHTTPServer"
 
-##### 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"
@@ -49,22 +43,11 @@ 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"
-
-
 if [ -f ~/.bash_local_aliases ]; then
     . ~/.bash_local_aliases
 fi

.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

@@ -45,161 +45,74 @@ esac
 
 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
+# Colors
+PS1='\[\e[1;32m\]\w\[\e[m\]\[\e[1;0m\] \[\e[m\] \[\e[1;37m\]'
+export TERM=xterm-256color
+
+shopt -s autocd
+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
+
+if [ -f ~/.bash-git-prompt/share/gitprompt.sh ]; then
+    source ~/.bash-git-prompt/share/gitprompt.sh
 fi
 
-# Reset
-Color_Off="\[\033[0m\]"       # Text Reset
+GIT_PROMPT_ONLY_IN_REPO=1
+GIT_PROMPT_START="\[\e[1;32m\]\w\[\e[m\]"
+GIT_PROMPT_END="\[\e[1;37m\]  \[\e[1;37m\]"
+GIT_PROMPT_THEME=Georgi
 
-# 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'
 fi
 
 # some more ls aliases
-alias ll='ls -alF'
-alias la='ls -A'
-alias l='ls -CF'
-
-# 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$//'\'')"'
-
-# 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.
+alias ls='ls -G'
+alias ll='ls -alFG'
+alias la='ls -AG'
+alias l='ls -CFG'
 
 if [ -f ~/.bash_aliases ]; then
     . ~/.bash_aliases
 fi
 
-if [ -f ~/.bash_local_aliases ]; then
-    . ~/.bash_local_aliases
-fi
+######################
+# Completion         #
+######################
 
 # enable programmable completion features (you don't need to enable
 # this, if it's already enabled in /etc/bash.bashrc and /etc/profile
@@ -207,3 +120,24 @@ fi
 if [ -f /etc/bash_completion ] && ! shopt -oq posix; then
     . /etc/bash_completion
 fi
+
+# Git completion
+if [ -f ~/.git-completion.bash  ]; then
+ . ~/.git-completion.bash
+fi
+
+######################
+# Sources & exports  #
+######################
+
+if [ -f ~/.bashrc_local  ]; then
+ . ~/.bashrc_local
+fi
+
+# Editor
+export EDITOR='subl -w'
+
+
+# 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$//'\'')"'

.gitconfig

@@ -1,4 +1,3 @@
-
 [color]
     diff = auto
     status = auto
@@ -21,7 +20,8 @@
     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"
 
     # various pretty loggers from various places
     l = log --pretty=oneline --abbrev-commit
@@ -32,11 +32,11 @@
     lola = log --graph --decorate --pretty=oneline --abbrev-commit --all
     ll = log --graph --date=short
 [push]
-	default = simple
+    default = simple
 [filter "media"]
-	clean = git media clean %f
-	smudge = git media smudge %f
-	required = true
+    clean = git media clean %f
+    smudge = git media smudge %f
+    required = true
 
 # local user config, usernames, etc
 [include]

.tmux.conf

@@ -6,10 +6,6 @@
 set -g prefix C-a
 unbind C-b
 
-# Start in Zsh
-set -g default-command '/bin/zsh --login'
-set -g default-shell /bin/zsh
-
 # Disable delay
 set -sg escape-time 1
 
@@ -106,5 +102,4 @@ bind -r L resize-pane -R 5
 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 C-c run-shell "bash -c 'tmux show-buffer | xclip'" \; display 'Copied to clipboard'

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