From 8f45eed26b466083b17e2a2872a5983a95de1945 Mon Sep 17 00:00:00 2001
From: Patrick Spek <p.spek@tyil.nl>
Date: Mon, 11 Dec 2023 14:53:23 +0100
Subject: Update awesome

---
 .local/bin/x                    |  5 ++++-
 .local/etc/x/autostart          |  8 ++++++++
 .local/etc/x/xinit.d/awesome.rc | 10 ----------
 .local/etc/x/xinitrc            | 35 +++++++++--------------------------
 4 files changed, 21 insertions(+), 37 deletions(-)
 create mode 100644 .local/etc/x/autostart

diff --git a/.local/bin/x b/.local/bin/x
index d00fda0..94f10ae 100755
--- a/.local/bin/x
+++ b/.local/bin/x
@@ -12,7 +12,10 @@ then
 		exit 1
 	fi
 
-	cp -v -- "$HOME/.local/etc/x/xinit.d/$1.rc" "$HOME/.xinitrc"
+	cat \
+		"$HOME/.local/etc/x/xinitrc" \
+		"$HOME/.local/etc/x/xinit.d/$1.rc" \
+		> "$HOME/.xinitrc"
 fi
 
 # Make sure the xinitrc exists, just in case
diff --git a/.local/etc/x/autostart b/.local/etc/x/autostart
new file mode 100644
index 0000000..373dc0b
--- /dev/null
+++ b/.local/etc/x/autostart
@@ -0,0 +1,8 @@
+redshift -l 51.50:4.59 -t 6500:3500
+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 b545d03..a5f5e37 100644
--- a/.local/etc/x/xinit.d/awesome.rc
+++ b/.local/etc/x/xinit.d/awesome.rc
@@ -1,11 +1 @@
-export WINIT_X11_SCALE_FACTOR=1
-
-redshift -l 51.50:4.59 -t 6500:3500 &
-sxhkd &
-chwp &
-xcompmgr &
-
-ntfy subscribe --from-config &
-nm-applet &
-
 exec dbus-launch --exit-with-session awesome
diff --git a/.local/etc/x/xinitrc b/.local/etc/x/xinitrc
index 3b10135..4d17b98 100644
--- a/.local/etc/x/xinitrc
+++ b/.local/etc/x/xinitrc
@@ -1,3 +1,5 @@
+#!/bin/sh
+
 # start dbus if necessary
 [ -f "/etc/X11/xinit/xinitrc.d/80-dbus" ] && source /etc/X11/xinit/xinitrc.d/80-dbus
 
@@ -7,13 +9,6 @@ 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
-
 # set the default mousepointer
 xsetroot -cursor_name left_ptr
 
@@ -39,23 +34,11 @@ setxkbmap \
 # 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 &
+# Export variables for a better X11 experience
+export WINIT_X11_SCALE_FACTOR=1
 
-# Start x11vnc
-x11vnc -display "$DISPLAY" &
+# Autostart desired applications
+while read -r application
+do
+	$application &
+done < "$HOME/.local/etc/x/autostart"
-- 
cgit v1.1