X updates

Signed-off-by: Pierre Habouzit <madcoder@debian.org>

diff --git a/Xkeyboard b/Xkeyboard
index b0050a0..b870f2a 100644 (file)
--- a/Xkeyboard
+++ b/Xkeyboard
@@ -3,7 +3,7 @@ default xkb_keymap "mad_fr" {
     xkb_types     { include "complete" };
     xkb_compat    { include "complete" };
     xkb_symbols   {
-        include "pc(pc105)+us+inet(logiaccess)"
+        include "pc(pc105)+us+inet(logiaccess)+terminate(ctrl_alt_bksp)"
         key <CAPS> { [ Super_L,   Super_L   ] };
         key <LWIN> { [ Super_L,   Super_L   ] };
 

diff --git a/Xsession b/Xsession
deleted file mode 100755 (executable)
index 467207d..0000000
--- a/Xsession
+++ /dev/null
@@ -1,13 +0,0 @@
-#! /bin/zsh
-
-. ~/.zsh/20_environment
-
-xkbcomp -w 0 -R/usr/share/X11/xkb ~/.Xkeyboard :0
-
-for applet in kerneloops-applet nm-applet klipper unclutter; do
-    which $applet 1>/dev/null 2>&1 && (sleep 3 && $applet)&
-done
-
-xsetroot -solid rgb:00/00/0f
-xscreensaver -nosplash &!
-exec awesome

diff --git a/xsessionrc b/xsessionrc
new file mode 100755 (executable)
index 0000000..39440a4
--- /dev/null
+++ b/xsessionrc
@@ -0,0 +1,11 @@
+#! /bin/zsh
+
+. "$HOME/.config/zsh/20_environment"
+
+xkbcomp -w 0 -R/usr/share/X11/xkb ~/.Xkeyboard :0
+
+for applet in klipper; do
+    which $applet 1>/dev/null 2>&1 && $applet&
+done
+
+awesome &