summaryrefslogtreecommitdiffstats
path: root/.xinitrc
diff options
context:
space:
mode:
authorGravatar Tom Willemsen2012-02-24 00:22:49 +0100
committerGravatar Tom Willemsen2012-02-24 00:22:49 +0100
commitf1532bd57803c201ec0ca23f169c74d9234c1bd7 (patch)
tree78196393b47724c6f5726c60e1154c15e57140d8 /.xinitrc
parent4857418dbde4c11f34a66774c5fb047119a96fe2 (diff)
parent136e988c22fdd0e846b785b9f229e7d6263ec1da (diff)
downloaddotfiles-f1532bd57803c201ec0ca23f169c74d9234c1bd7.tar.gz
dotfiles-f1532bd57803c201ec0ca23f169c74d9234c1bd7.zip
Merge remote-tracking branch 'gitorious/master' into phoenix
Diffstat (limited to '.xinitrc')
-rw-r--r--.xinitrc32
1 files changed, 14 insertions, 18 deletions
diff --git a/.xinitrc b/.xinitrc
index 0d1c74e..e637ab5 100644
--- a/.xinitrc
+++ b/.xinitrc
@@ -1,30 +1,26 @@
-# -*- mode: shell-script; eval: (git-auto-commit-mode 1) -*-
-
-# -----[ Set background ]---------------------------------------------
-hsetroot -center ~/pictures/wallpapers/3600x1080/wallpaper-1460625.jpg
-
-# -----[ Modify keys ]------------------------------------------------
+#_ Modify keys
xmodmap ~/.Xmodmap
-
-# -----[ Start some programs ]----------------------------------------
-conky
+#_ Start some programs
numlockx &
-emacs --daemon
-xbindkeys
-
-# mpdscribble
+emacs --daemon &
+xbindkeys &
+#_. mpdscribble
pidof mpdscribble >& /dev/null
if [ $? -ne 0 ]
then
mpdscribble &
fi
-
+#_. mpdnotify
mpc idleloop player | { while read; do notify-send "`mpc current`"; done } &
-
-# -----[ Start notifier ]---------------------------------------------
+#_ Start notifier
/usr/bin/dunst \
-fn "-misc-tamsyn-medium-r-normal-*-14-*-*-*-*-*-iso8859-*" \
-nb "#000000" -nf "#15abc3" &
-
-# -----[ Start session ]----------------------------------------------
+#_ Start session
exec ck-launch-session /usr/bin/herbstluftwm 2>&1 > ~/.xsession_errors
+#_ Local Variables
+# Local Variables:
+# mode: shell-script
+# eval: (git-auto-commit-mode 1)
+# eval: (allout-mode 1)
+# End: