From: Samir Benmendil <samir.benmendil@gmail.com>
Date: Thu, 28 Feb 2013 21:49:39 +0000 (+0100)
Subject: Merge branch 'master' of tardis:/dotfiles
X-Git-Url: https://git.rmz.io/dotfiles.git/commitdiff_plain/67480405d80eacad822bf853bf4600f77fd8c91e?hp=ee99efb0df6b146d098b5b65cdbed8a61ecd9ff1

Merge branch 'master' of tardis:/dotfiles
---

diff --git a/Xmodmap_darwin b/Xmodmap_darwin
new file mode 100644
index 0000000..d01a9f7
--- /dev/null
+++ b/Xmodmap_darwin
@@ -0,0 +1,18 @@
+keycode 37 = Super_L
+keycode 49 = less greater less greater bar brokenbar bar
+keycode 94 = grave asciitilde dead_grave dead_tilde
+keycode 104 = ISO_Level3_Shift
+keycode 133 = Control_L
+keycode 134 = Control_R
+
+clear control
+clear Mod4
+clear Mod5
+
+add control = Control_L Control_R
+add Mod4 = Super_L
+add Mod5 = ISO_Level3_Shift
+
+! remap Caps_Lock as Escape
+remove Lock = Caps_Lock
+keysym Caps_Lock = Escape
diff --git a/zsh/themes/ramsi.zsh-theme b/zsh/themes/ramsi.zsh-theme
index e0d852f..772777f 100644
--- a/zsh/themes/ramsi.zsh-theme
+++ b/zsh/themes/ramsi.zsh-theme
@@ -1,5 +1,6 @@
-[[ $(hostname) == "tardis" ]] && hostcolor=red
-[[ $(hostname) == "shada" ]]  && hostcolor=green
+[[ $(hostname) == "tardis" ]]  && hostcolor=red
+[[ $(hostname) == "shada" ]]   && hostcolor=green
+[[ $(hostname) == "darwin" ]]  && hostcolor=green
 PROMPT='%(?..%{$fg_bold[white]%}[%?])%{$reset_color%}[%D{%k:%M} %n@%{$fg[$hostcolor]%}%m%{$reset_color%}$(git_prompt_info)]%# '
 RPROMPT='%{$fg[green]%}%~%{$reset_color%}'