From 444fc3706a8ff677a23848b1e3783808204d1334 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=2E=20Fernando=20S=C3=A1nchez?= <balkian@gmail.com>
Date: Sun, 9 Mar 2014 00:24:13 +0100
Subject: [PATCH] Updated oh-my-zsh and moved to firefox

---
 i3/config | 8 ++++++--
 oh-my-zsh | 2 +-
 vimrc     | 4 ++--
 zshrc     | 5 ++++-
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/i3/config b/i3/config
index d46847b..ee2a2f5 100644
--- a/i3/config
+++ b/i3/config
@@ -26,7 +26,7 @@ bindsym Control+Mod1+t exec urxvt
 # start lock
 bindsym Control+Mod1+l exec i3lock -c 000000 -t -i ~/Pictures/Wallpapers/Game\ Over\ Hacker.png
 
-bindsym Control+Mod1+w exec i3-one-instance google-chrome
+bindsym Control+Mod1+w exec i3-one-instance firefox
 bindsym Control+Mod1+g exec i3-one-instance gvim
 bindsym $mod+o exec i3-winmenu.py
 bindsym Control+Mod1+f exec pcmanfm
@@ -211,6 +211,8 @@ client.urgent           #2f343a #101010 #93a1a1 #900000
 
 for_window [class="^Google-chrome$"] border none
 assign [class="Google-chrome" window_role="browser"] 2: Web
+for_window [class="^Firefox$"] border none
+assign [class="Firefox" window_role="browser"] 2: Web
 for_window [class="^URxvt$"] border 1px
 assign [title="^tmux$"] 1: Term
 assign [class="^Gvim$"] 3: Edit
@@ -242,7 +244,7 @@ exec urxvt -e tmux attach
 #set $mode_system System (l) lock, (e) logout, (s) suspend, (h) hibernate, (r) reboot, (Shift+s) shutdown
 #mode "$mode_system" {
     #bindsym l exec --no-startup-id i3exit lock, mode "default"
-        #bindsym e exec --no-startup-id i3exit logout, mode "default"
+        #bindsym e exec --no-startup-id i3exit logout, mode "default"e
         #bindsym s exec --no-startup-id i3exit suspend, mode "default"
         #bindsym h exec --no-startup-id i3exit hibernate, mode "default"
         #bindsym r exec --no-startup-id i3exit reboot, mode "default"
@@ -253,3 +255,5 @@ exec urxvt -e tmux attach
         #bindsym Escape mode "default"
 #}
 #bindsym $mod+Pause mode "$mode_system"
+exec --no-startup-id feh --bg-scale Pictures/Wallpapers/little_big_planet.jpg
+exec --no-startup-id compton -b --config ~/.compton.conf 
diff --git a/oh-my-zsh b/oh-my-zsh
index e85128f..5663d3a 160000
--- a/oh-my-zsh
+++ b/oh-my-zsh
@@ -1 +1 @@
-Subproject commit e85128f2b8e82abd8483b24fb7c90bb41abd5e69
+Subproject commit 5663d3a1fe986303ba835fb8fc524236e8af72c3
diff --git a/vimrc b/vimrc
index 16bc2a7..873697d 100644
--- a/vimrc
+++ b/vimrc
@@ -43,7 +43,7 @@ Bundle "vim-scripts/ShowMarks"
 Bundle "atweiden/vim-dragvisuals"
 Bundle "tomasr/molokai"
 Bundle "elzr/vim-json"
-Bundle "niklasl/vim-rdf"
+Bundle "balkian/vim-rdf"
 
 
 filetype plugin indent on     " required!
@@ -125,7 +125,7 @@ nnoremap <C-t>     :tabnew<CR>
 inoremap <C-S-tab> <Esc>:tabprevious<CR>i
 inoremap <C-tab>   <Esc>:tabnext<CR>i
 "inoremap <C-t>     <Esc>:tabnew<CR>
-nnoremap <leader>dd :bd<CR>
+nnoremap <Leader>dd :bd<CR>
 
 
 " Save sessions
diff --git a/zshrc b/zshrc
index 814467b..9d0b5d3 100644
--- a/zshrc
+++ b/zshrc
@@ -37,7 +37,7 @@ export UPDATE_ZSH_DAYS=13
 # Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*)
 # Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/
 # Example format: plugins=(rails git textmate ruby lighthouse)
-plugins=(git)
+plugins=(git colored-man virtualenvwrapper cp python wd systemadmin)
 
 source $ZSH/oh-my-zsh.sh
 
@@ -54,6 +54,9 @@ ssh-add -l >/dev/null || alias ssh='ssh-add -l >/dev/null || ssh-add && unalias
 ### Added by the Heroku Toolbelt
 export PATH="$PATH:/usr/local/heroku/bin:$HOME/.cabal/bin"
 
+### Virtualenvwrapper
+export WORKON_HOME=~/.virtualenvs
+
 setopt extended_glob
 
 ### Get RVM to work with zsh