4 files changed, 29 insertions, 43 deletions
diff --git a/.local/etc/x/autostart b/.local/etc/x/autostart
new file mode 100644
index 0000000..f2f32ba
--- /dev/null
+++ b/.local/etc/x/autostart
@@ -0,0 +1,9 @@
+redshift -l 51.50:4.59 -t 6500:3500
+dunst
+sxhkd
+chwp
+xcompmgr
+xss-lock -- i3lock -c '#000000' -n
+ntfy subscribe --from-config
+nm-applet
+albert
diff --git a/.local/etc/x/xinit.d/awesome.rc b/.local/etc/x/xinit.d/awesome.rc
index bd004e8..a5f5e37 100644
--- a/.local/etc/x/xinit.d/awesome.rc
+++ b/.local/etc/x/xinit.d/awesome.rc
@@ -1,7 +1 @@
-sxhkd &
-chwp &
-xcompmgr &
-
-nm-applet &
-
 exec dbus-launch --exit-with-session awesome
diff --git a/.local/etc/x/xinit.d/kde.rc b/.local/etc/x/xinit.d/kde.rc
new file mode 100644
index 0000000..71e6deb
--- /dev/null
+++ b/.local/etc/x/xinit.d/kde.rc
@@ -0,0 +1,13 @@
+# start dbus if necessary
+[ -f "/etc/X11/xinit/xinitrc.d/80-dbus" ] && source /etc/X11/xinit/xinitrc.d/80-dbus
+
+# Background services
+xcompmgr &
+redshift -l 51.50:4.59 &
+
+# Export additional environment vars
+export KDEWM=awesome
+export WINIT_X11_SCALE_FACTOR=1
+
+# Start KDE
+exec dbus-launch --exit-with-session startplasma-x11
diff --git a/.local/etc/x/xinitrc b/.local/etc/x/xinitrc
index df3590f..3d0f0d9 100644
--- a/.local/etc/x/xinitrc
+++ b/.local/etc/x/xinitrc
@@ -1,24 +1,13 @@
-# start dbus if necessary
-[ -f "/etc/X11/xinit/xinitrc.d/80-dbus" ] && source /etc/X11/xinit/xinitrc.d/80-dbus
-
-# start polkit auth agent
-eval $(/usr/bin/gnome-keyring-daemon --start --components=pkcs11,secrets,ssh,gpg)
-export GNOME_KEYRING_PID
-export GNOME_KEYRING_SOCKET
-export SSH_AUTH_SOCK
-
-# Export additional environment vars
-export WINIT_X11_SCALE_FACTOR=1
-
-# extend the fontpath
-xset +fp ~/.fonts/Terminus/BDF
-#xset +fp /usr/share/fonts/local
+#!/bin/sh
 
 # set the default mousepointer
 xsetroot -cursor_name left_ptr
 
 # load the .Xresources
-xrdb -merge ~/.Xresources
+if command -v xrdb > /dev/null
+then
+	xrdb -merge ~/.Xresources
+fi
 
 # Set a custom layout with xrandr
 if [ -f "$HOME/.local/etc/x/layout.sh" ]
@@ -29,30 +18,11 @@ fi
 # xkbmap options
 setxkbmap \
 	-layout us \
-	 \
 	-option compose:menu \
 	-option caps:escape
 
 # add altgr
 xmodmap -e "keycode 108 = ISO_Level3_Shift"
 
-# Enable sound through PulseAudio
-pulseaudio --start
-
-# set a wallpaper
-chwp &
-
-# Turn off any screen blanking features
-xset s off
-xset -dpms
-
-# start background processes
-redshift -l 51.50:4.59 &
-dunst &
-sxhkd &
-
-# Set up a screenlock
-#xss-lock -- physlock -d &
-
-# Start x11vnc
-x11vnc -display "$DISPLAY" &
+# Export variables for a better X11 experience
+export WINIT_X11_SCALE_FACTOR=1