From f76cac70ebfa0ab794c9cbc51e0f9b780e33a68f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Pankowski?= <lukpank@o2.pl>
Date: Mon, 29 Sep 2025 22:18:53 +0200
Subject: [PATCH] lupan-set-theme follow links, awesome lighter fg_normal

- awesome: fg_normal is common between themes so make it somewhat
lighter then it was on dark theme
---
 awesome/.config/awesome/theme_dark.lua  |  2 +-
 awesome/.config/awesome/theme_light.lua |  2 +-
 xsession/bin/lupan-set-theme            | 31 ++++++++++++++-----------
 3 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/awesome/.config/awesome/theme_dark.lua b/awesome/.config/awesome/theme_dark.lua
index 041a11f..8e7f09b 100644
--- a/awesome/.config/awesome/theme_dark.lua
+++ b/awesome/.config/awesome/theme_dark.lua
@@ -16,7 +16,7 @@ theme.bg_minimize              = "#454f54" -- hsl(200 10% 30%)
 theme.bg_systray               = theme.bg_normal
 theme.tasklist_bg_focus        = "#1c3b4a" -- hsl(200 45% 20%)
 
-theme.fg_normal                = "#73848c" -- hsl(200 10% 50%)
+theme.fg_normal                = "#8f9ca3" -- hsl(200 10% 60%)
 theme.fg_focus                 = "#abb5ba" -- hsl(200 10% 70%)
 theme.fg_urgent                = theme.bg_focus
 theme.fg_minimize              = theme.fg_normal
diff --git a/awesome/.config/awesome/theme_light.lua b/awesome/.config/awesome/theme_light.lua
index 08482b6..c8c0c68 100644
--- a/awesome/.config/awesome/theme_light.lua
+++ b/awesome/.config/awesome/theme_light.lua
@@ -16,7 +16,7 @@ theme.bg_minimize              = "#8596ad" -- hsl(214 20% 60%)
 theme.bg_systray               = theme.bg_normal
 theme.tasklist_bg_focus        = "#a6c7f2" -- hsl(214 75% 80%)
 
-theme.fg_normal                = "#a9bcd6" -- hsl(214 35% 75%)
+theme.fg_normal                = "#8f9ca3" -- hsl(200 10% 60%)
 theme.fg_focus                 = "#454b54" -- hsl(214 10% 30%)
 theme.fg_urgent                = "#70675c" -- hsl(34 10% 40%)
 theme.fg_minimize              = "#70675c" -- hsl(34 10% 40%)
diff --git a/xsession/bin/lupan-set-theme b/xsession/bin/lupan-set-theme
index e08165d..dfe57fc 100755
--- a/xsession/bin/lupan-set-theme
+++ b/xsession/bin/lupan-set-theme
@@ -2,8 +2,9 @@
 
 THEME="$1"
 
+XSET=$(readlink -e ~/.config/xsettingsd/xsettingsd.conf)
 if [ "$THEME" = "toggle" ]; then
-    if  grep Materia-dark ~/.config/xsettingsd/xsettingsd.conf > /dev/null; then
+    if  grep Materia-dark "$XSET" > /dev/null; then
         THEME=light
     else
         THEME=dark
@@ -19,22 +20,25 @@ else
     exit 1
 fi
 
-if [ -f ~/.Xresources ]; then
+XRES=$(readlink -e ~/.Xresources)
+if [ -n "$XRES" ]; then
     if [ "$THEME" = dark ]; then
-        sed -i 's/^#undef THEME_DARK/#define THEME_DARK/' ~/.Xresources
+        sed -i 's/^#undef THEME_DARK/#define THEME_DARK/' "$XRES"
     elif [ "$THEME" = light ]; then
-        sed -i 's/^#define THEME_DARK/#undef THEME_DARK/' ~/.Xresources
+        sed -i 's/^#define THEME_DARK/#undef THEME_DARK/' "$XRES"
     fi
-    xrdb -merge ~/.Xresources
+    xrdb -merge "$XRES"
     killall -USR1 st
 fi
 
 # Alacritty
-if [ -f ~/.config/alacritty/alacritty.yml ]; then
-    sed -i "s/^colors: [*].*/colors: *$THEME/" ~/.config/alacritty/alacritty.yml
+AYML=$(readlink -e ~/.config/alacritty/alacritty.yml)
+if [ -n "$AYML" ]; then
+    sed -i "s/^colors: [*].*/colors: *$THEME/" "$AYML"
 fi
-if [ -f ~/.config/alacritty/alacritty.toml ]; then
-    sed -i "s#^import =.*#import = [\"~/.config/alacritty/$THEME.toml\"]#" ~/.config/alacritty/alacritty.toml
+ATOML=$(readlink -e ~/.config/alacritty/alacritty.toml)
+if [ -f "$ATOML" ]; then
+    sed -i "s#^import =.*#import = [\"~/.config/alacritty/$THEME.toml\"]#" "$ATOML"
 fi
 
 if [ "$THEME" = dark ]; then
@@ -44,13 +48,14 @@ elif [ "$THEME" = light ]; then
 fi
 
 # GTK
-if [ -f ~/.config/xsettingsd/xsettingsd.conf ]; then
-    sed -i -E "s#(Net/ThemeName) .*#\\1 \"${GTK_THEME}\"#" ~/.config/xsettingsd/xsettingsd.conf
+if [ -n "$XSET" ]; then
+    sed -i -E "s#(Net/ThemeName) .*#\\1 \"${GTK_THEME}\"#" "$XSET"
     pkill -HUP -x xsettingsd
     gsettings set org.gnome.desktop.interface gtk-theme "${GTK_THEME}"
 fi
 
 # waybar
-if [ -f ~/.config/waybar/style.css ]; then
-    sed -i -E "s#file:///.*/(light|dark)[.]css#file://$HOME/.config/waybar/$THEME.css#" ~/.config/waybar/style.css
+WCSS=$(readlink -e ~/.config/waybar/style.css)
+if [ -f "$WCSS" ]; then
+    sed -i -E "s#file:///.*/(light|dark)[.]css#file://$HOME/.config/waybar/$THEME.css#" "$WCSS"
 fi