1 files changed, 27 insertions, 20 deletions
diff --git a/.xinitrc b/.xinitrc
index f5604cc..aafc0b8 100755
--- a/.xinitrc
+++ b/.xinitrc
@@ -1,22 +1,29 @@
 #!/bin/sh
-if test -f ~/.Xresources; then
-    xrdb -merge -I$HOME ~/.Xresources
-fi
-redshift &
-${HOME}/bin/icd
-# xcompmgr &
-trayer --tint black --edge top --SetDockType true --SetPartialStrut true \
-  --expand true --width 10 --transparent true --height 12 --align right &
-${HOME}/.dzen/battery.sh &
-pavucontrol &
-urxvtd -q -f -o &
-urxvtc &
-${HOME}/.screenlayout/SCREENLAYOUT.sh && nitrogen --restore
-if [ "PULSE" = "True" ]; then
-    sh bin/startaudio &
-fi
-${HOME}/bin/mice.sh
-xset dpms 180 300 600
-pgrep -u $(whoami) parcimonie >/dev/null || parcimonie >/dev/null &
 
-exec /usr/bin/xmonad
+case `uname` in
+    Darwin)
+        . /opt/local/etc/X11/xinit/xinitrc
+        ;;
+    *)
+        if test -f ~/.Xresources; then
+            xrdb -merge -I$HOME ~/.Xresources
+        fi
+        redshift &
+        ${HOME}/bin/icd
+        # xcompmgr &
+        trayer --tint black --edge top --SetDockType true --SetPartialStrut true \
+          --expand true --width 10 --transparent true --height 12 --align right &
+        ${HOME}/.dzen/battery.sh &
+        pavucontrol &
+        urxvtd -q -f -o &
+        urxvtc &
+        ${HOME}/.screenlayout/zeta-home.sh && nitrogen --restore
+        if [ "false" = "True" ]; then
+            sh bin/startaudio &
+        fi
+        ${HOME}/bin/mice.sh
+        xset dpms 180 300 600
+
+        exec /usr/bin/xmonad
+        ;;
+esac