From 071717a513505e6724836b3dcd6d6cb0e0567d09 Mon Sep 17 00:00:00 2001
From: Matheus <matheusuky@gmail.com>
Date: Mon, 29 Jun 2026 20:35:33 -0300
Subject: [PATCH] distro: handle Xresources

---
 distro-files/etc/skel/.Xdefaults           | 2 --
 distro-files/etc/skel/.Xresources          | 2 ++
 distro-files/home/astral/.Xdefaults        | 2 --
 distro-files/home/astral/.Xresources       | 2 ++
 distro-files/root/.Xdefaults               | 2 --
 distro-files/root/.Xresources              | 2 ++
 distro-files/usr/libexec/astral/startnscde | 7 +++++++
 distro-files/usr/libexec/astral/startwm    | 7 +++++++
 recipes/distro-files                       | 2 +-
 recipes/xdm                                | 6 ++++++
 10 files changed, 27 insertions(+), 7 deletions(-)
 delete mode 100644 distro-files/etc/skel/.Xdefaults
 create mode 100644 distro-files/etc/skel/.Xresources
 delete mode 100644 distro-files/home/astral/.Xdefaults
 create mode 100644 distro-files/home/astral/.Xresources
 delete mode 100644 distro-files/root/.Xdefaults
 create mode 100644 distro-files/root/.Xresources

diff --git a/distro-files/etc/skel/.Xdefaults b/distro-files/etc/skel/.Xdefaults
deleted file mode 100644
index c7562ee9..00000000
--- a/distro-files/etc/skel/.Xdefaults
+++ /dev/null
@@ -1,2 +0,0 @@
-xterm*background:   black
-xterm*foreground:   white
diff --git a/distro-files/etc/skel/.Xresources b/distro-files/etc/skel/.Xresources
new file mode 100644
index 00000000..d3403a3c
--- /dev/null
+++ b/distro-files/etc/skel/.Xresources
@@ -0,0 +1,2 @@
+XFile*FileList.foreground: black
+XTerm*visualBellDelay: 0
diff --git a/distro-files/home/astral/.Xdefaults b/distro-files/home/astral/.Xdefaults
deleted file mode 100644
index c7562ee9..00000000
--- a/distro-files/home/astral/.Xdefaults
+++ /dev/null
@@ -1,2 +0,0 @@
-xterm*background:   black
-xterm*foreground:   white
diff --git a/distro-files/home/astral/.Xresources b/distro-files/home/astral/.Xresources
new file mode 100644
index 00000000..d3403a3c
--- /dev/null
+++ b/distro-files/home/astral/.Xresources
@@ -0,0 +1,2 @@
+XFile*FileList.foreground: black
+XTerm*visualBellDelay: 0
diff --git a/distro-files/root/.Xdefaults b/distro-files/root/.Xdefaults
deleted file mode 100644
index c7562ee9..00000000
--- a/distro-files/root/.Xdefaults
+++ /dev/null
@@ -1,2 +0,0 @@
-xterm*background:   black
-xterm*foreground:   white
diff --git a/distro-files/root/.Xresources b/distro-files/root/.Xresources
new file mode 100644
index 00000000..d3403a3c
--- /dev/null
+++ b/distro-files/root/.Xresources
@@ -0,0 +1,2 @@
+XFile*FileList.foreground: black
+XTerm*visualBellDelay: 0
diff --git a/distro-files/usr/libexec/astral/startnscde b/distro-files/usr/libexec/astral/startnscde
index 449d4d98..28d32bcf 100644
--- a/distro-files/usr/libexec/astral/startnscde
+++ b/distro-files/usr/libexec/astral/startnscde
@@ -16,6 +16,13 @@ do
 
   sleep 0.5
 done
+
+[ -f /etc/X11/Xresources ] && xrdb -merge /etc/X11/Xresources
+
+[ -f "$HOME/.Xresources" ] && xrdb -merge "$HOME/.Xresources"
+
+[ -f "$HOME/.Xdefaults" ] && xrdb -merge "$HOME/.Xdefaults"
+
 stty -echo -echoctl -isig -icanon min 0 time 0
 nscde &> /tmp/.nscdestderr > /tmp/.nscdestdout
 stty -echo -echoctl -isig -icanon min 0 time 0
diff --git a/distro-files/usr/libexec/astral/startwm b/distro-files/usr/libexec/astral/startwm
index 3cc8bf87..cef304a1 100755
--- a/distro-files/usr/libexec/astral/startwm
+++ b/distro-files/usr/libexec/astral/startwm
@@ -16,6 +16,13 @@ do
 
   sleep 0.5
 done
+
+[ -f /etc/X11/Xresources ] && xrdb -merge /etc/X11/Xresources
+
+[ -f "$HOME/.Xresources" ] && xrdb -merge "$HOME/.Xresources"
+
+[ -f "$HOME/.Xdefaults" ] && xrdb -merge "$HOME/.Xdefaults"
+
 stty -echo -echoctl -isig -icanon min 0 time 0
 xterm -e "bash -l" & &> /tmp/.xtermstderr > /tmp/.xtermstdout
 fvwm3 &> /tmp/.fvwm3stderr > /tmp/.fvwm3stdout
diff --git a/recipes/distro-files b/recipes/distro-files
index b5d45bc8..99f99270 100644
--- a/recipes/distro-files
+++ b/recipes/distro-files
@@ -1,5 +1,5 @@
 name=distro-files
-revision=6
+revision=7
 from_source=distro-files
 
 package() {
diff --git a/recipes/xdm b/recipes/xdm
index 95c383b8..7c33f4eb 100644
--- a/recipes/xdm
+++ b/recipes/xdm
@@ -40,6 +40,12 @@ if [ -r /etc/profile ]; then
 	source /etc/profile
 fi
 
+[ -f /etc/X11/Xresources ] && xrdb -merge /etc/X11/Xresources
+
+[ -f "$HOME/.Xresources" ] && xrdb -merge "$HOME/.Xresources"
+
+[ -f "$HOME/.Xdefaults" ] && xrdb -merge "$HOME/.Xdefaults"
+
 for session in /usr/bin/nscde /usr/bin/fvwm3 /usr/bin/twm /usr/bin/xterm; do
 	if [ -x "$session" ]; then
 		exec "$session"