13 files changed, 96 insertions, 69 deletions
diff --git a/.local/etc/wrapper.d/awesome.sh b/.local/etc/wrapper.d/awesome.sh
new file mode 100644
index 0000000..5d72452
--- /dev/null
+++ b/.local/etc/wrapper.d/awesome.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+WRAPPER_BINS="
+	/usr/bin/awesome
+	/run/current-system/sw/bin/awesome
+"
diff --git a/.local/etc/wrapper.d/firefox.rc b/.local/etc/wrapper.d/firefox.rc
deleted file mode 100644
index 43e745c..0000000
--- a/.local/etc/wrapper.d/firefox.rc
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-WRAPPER_BINS="
-	/usr/bin/librewolf
-	/usr/bin/librewolf-bin
-"
-
-WRAPPER_OPTS="--profile \"$HOME/.config/firefox\""
-
-FIREJAIL_PROFILE="$HOME/.local/etc/firejail/firefox.profile"
diff --git a/.local/etc/wrapper.d/firefox.sh b/.local/etc/wrapper.d/firefox.sh
new file mode 100644
index 0000000..af0905d
--- /dev/null
+++ b/.local/etc/wrapper.d/firefox.sh
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+WRAPPER_BINS="
+	/usr/bin/librewolf
+	/usr/bin/librewolf-bin
+	/usr/bin/firefox
+	/usr/bin/firefox-esr
+	/usr/bin/firefox-bin
+	/run/current-system/sw/bin/firefox
+"
+
+WRAPPER_OPTS="
+	--profile $HOME/.config/firefox
+"
diff --git a/.local/etc/wrapper.d/herbstluftwm.sh b/.local/etc/wrapper.d/herbstluftwm.sh
new file mode 100644
index 0000000..d213bc7
--- /dev/null
+++ b/.local/etc/wrapper.d/herbstluftwm.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+WRAPPER_BINS="
+	/run/current-system/sw/bin/herbstluftwm
+	/usr/bin/herbstluftwm
+"
diff --git a/.local/etc/wrapper.d/irc.sh b/.local/etc/wrapper.d/irc.sh
new file mode 100644
index 0000000..965abfa
--- /dev/null
+++ b/.local/etc/wrapper.d/irc.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+WRAPPER_BINS="
+	/usr/bin/alacritty
+"
+
+WRAPPER_OPTS="
+	--class irc
+	--command mosh oolah .local/bin/ta irc
+"
diff --git a/.local/etc/wrapper.d/jellyfin.rc b/.local/etc/wrapper.d/jellyfin.sh
index 08105db..08105db 100644
--- a/.local/etc/wrapper.d/jellyfin.rc
+++ b/.local/etc/wrapper.d/jellyfin.sh
diff --git a/.local/etc/wrapper.d/mpv.rc b/.local/etc/wrapper.d/mpv.rc
deleted file mode 100644
index de66126..0000000
--- a/.local/etc/wrapper.d/mpv.rc
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-
-wrap_before() {
-	if command -v mpc > /dev/null && mpc status | awk 'NR==2 { print }' | grep -iq playing
-	then
-		wrap_run mpc pause > /dev/null
-		WRAPPER_X_MPD_PAUSED="yes"
-	fi
-}
-
-wrap_after() {
-	if [ "$WRAPPER_X_MPD_PAUSED" ]
-	then
-		wrap_run mpc play > /dev/null
-	fi
-}
diff --git a/.local/etc/wrapper.d/mpv.sh b/.local/etc/wrapper.d/mpv.sh
new file mode 100644
index 0000000..3ed6eb4
--- /dev/null
+++ b/.local/etc/wrapper.d/mpv.sh
@@ -0,0 +1,31 @@
+#!/bin/sh
+
+wrap_before() {
+	if command -v mpc > /dev/null && mpc status | awk 'NR==2 { print }' | grep -iq playing
+	then
+		wrap_log "> mpc pause"
+		mpc pause > /dev/null
+		WRAPPER_X_MPD_PAUSED="yes"
+	fi
+
+	if [ "$(cat "$XDG_RUNTIME_DIR/xblank/paused")" = "0" ]
+	then
+		wrap_log "> xblank-toggle"
+		xblank-toggle
+		WRAPPER_X_XBLANK_PAUSED="yes"
+	fi
+}
+
+wrap_after() {
+	if [ "$WRAPPER_X_MPD_PAUSED" ]
+	then
+		wrap_log "> mpc play"
+		mpc play > /dev/null
+	fi
+
+	if [ "$WRAPPER_X_XBLANK_PAUSED" ]
+	then
+		wrap_log "> xblank-toggle"
+		xblank-toggle
+	fi
+}
diff --git a/.local/etc/wrapper.d/signal.rc b/.local/etc/wrapper.d/signal.sh
index 19f7352..19f7352 100644
--- a/.local/etc/wrapper.d/signal.rc
+++ b/.local/etc/wrapper.d/signal.sh
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