Merge remote-tracking branch 'refs/remotes/origin/master'

2 files changed, 4 insertions, 6 deletions

diff --git a/i3/config b/i3/config
index d7a985e..5597eb3 100644
--- a/i3/config
+++ b/i3/config
@@ -14,7 +14,7 @@
 font xft:Droid Sans Bold 7
 
 # i3 modifier key.
-set $mod Mod1
+set $mod Mod4
 
 # use Mouse+Mod1 to drag floating windows to their wanted position
 floating_modifier $mod
diff --git a/zshrc b/zshrc
index e936d78..76ceb8a 100755
--- a/zshrc
+++ b/zshrc
@@ -49,11 +49,9 @@ export WORDCHARS=''
 # Dvorak
 setopt DVORAK
 
-# alias ls="ls --color"
-if which gvim >/dev/null; then
-  alias vi="gvim --remote"
-  alias e="emacsclient -n"
-fi
+alias e="emacsclient -n"
+alias vi=/usr/games/sl
+
 alias ff="fileutil --gfs_user=gfp-reporting"
 alias diff=colordiff
 alias j=jump