Merge branch 'dev/scooner'

Conflicts:
	bash/.bash_aliases.macosx

bash/.bash_aliases.macosx

@@ -36,18 +36,11 @@ alias glola="git lola"
 
 # Dir shortcuts
 alias gh="cd ~/programming/github"
-alias tlbn="cd ~/programming/tlbninjas"
+alias tlb="cd ~/programming/tlbninjas"
 
 # Editors
 alias ec="emacsclient"
 alias ovim="open -a ~/Applications/MacVim.app $1"
 
-# MySQL
-alias mysqld_load="launchctl load -w ~/Library/LaunchAgents/com.mysql.mysqld.plist"
-alias mysqld_unload="launchctl unload -w ~/Library/LaunchAgents/com.mysql.mysqld.plist"
-
-# Mixbook
-alias mixbook_deploy="pdsh -w app[1-6].mixbook.com -l neuro \"sudo service chef-client restart && tail -f /var/log/chef/client.log\""
-
 # Synergy
 alias synergys_server="/usr/bin/synergys --config ~/.synergy.conf --daemon --log ~/.synergy.log --restart"

bash/.bash_aliases.ubuntu

@@ -29,6 +29,8 @@ alias gst="git st"
 alias glol="git lol"
 alias glola="git lola"
 
+# Firefox Development
+alias ffdev="firefox -P dev -no-remote -purgecaches"
 # Twidge
 alias tweetsn="twidge lsrecent -su"
 
@@ -37,10 +39,7 @@ alias agi="sudo apt-get -y install"
 
 # Dir shortcuts
 alias gh="cd ~/programming/github"
-# Mixbook 
-alias mb="cd ~/programming/mixbook"
-alias mbchef="cd ~/programming/mixbook/chef-repo; rvm gemset use chefdev"
-alias mbcom="cd ~/programming/mixbook/mixbook_com; rvm gemset use mixbook_com"
+alias tlb="cd ~/programming/tlbninjas"
 
 # Editors
 alias ec="emacsclient"

bash/.bashrc-linux.ubuntu

@@ -90,3 +90,5 @@ if [ $TERM == "screen" ]; then
   echo -ne "\ek${HOSTNAME}\e\\";
 fi  
 
+
+[[ -s "/home/neuro/.rvm/scripts/rvm" ]] && source "/home/neuro/.rvm/scripts/rvm" # Load RVM into a shell session *as a function*

conky/.conkyrc.ubuntu

@@ -1,4 +1,4 @@
-alignment top_right
+alignment bottom_left
 background yes
 border_width 1
 cpu_avg_samples 2

create_symlinks.sh

@@ -27,8 +27,8 @@ if [ $system_type == "Darwin" ]; then
 
     # Emacs
     ln -snf $PWD/editors/emacs/.emacs.$system_type ~/.emacs
-    ln -snf $PWD/editors/emacs/.emacs.d/plugins ~/.emacs.d/plugins
+    mkdir ~/.emacs.d; ln -snf $PWD/editors/emacs/.emacs.d/plugins ~/.emacs.d/plugins
 
     # Tmux
     ln -snf $PWD/tmux/.tmux.conf.$system_type ~/.tmux.conf
-fi
+fi

editors/vim/.vimrc-linux.ubuntu

@@ -28,14 +28,15 @@ set wildmode=list:longest,full
 " Mouse hotness in console
 if has("mouse")
   set mouse=a
+  set nomousehide
 endif
 
 " Omni Complete
 let g:rubycomplete_rails = 1
 
 " Set the GUI Font
 if has("gui")
-  set guifont=lime\ 9
+  set guifont=drift\ 11 
   set t_Co=256 " many pretty colors
   colorscheme vividchalk
 else

synergy/.synergy-home.conf

@@ -1,13 +1,13 @@
 section: screens
-	 prometheus:
-	 zeus:
+	 adones:
+	 hercules:
 end
 
 section: links
-	 prometheus:
-		right = zeus
-	zeus:
-		left = prometheus
+	adones:
+		left = hercules
+	hercules:
+		right = adones
 end
 
 section: options

tmux/.tmux.conf.ubuntu

@@ -3,7 +3,7 @@ set-option -g lock-server off
 set-option -g status-bg blue
 
 # set-option -g default-terminal "screen-256color"
-set-option -g mouse-select-pane on
+#set-option -g mouse-select-pane on
 set-option -g status-keys vi
 #set-option -g bell-action any
 set-option -g set-titles on

xmodmap/.xmodmaprc

@@ -1,6 +1,10 @@
+! Mouse settings
+! mac style scrolling
+pointer = 1 2 3 5 4 6 7 8 9 10 11 12 13 14 
+
+! Make caps lock left control
 remove Lock = Caps_Lock
 remove Control = Control_L
 keysym Caps_Lock = Control_L
 add Lock = Caps_Lock
 add Control = Control_L
-