From 24d70db2cf1e6c25181de52b58e6c7b2fe9622e0 Mon Sep 17 00:00:00 2001
From: nevaforget <dom@moonarch.de>
Date: Sun, 29 Mar 2026 14:14:06 +0200
Subject: [PATCH] fix: migrate swww to awww, add per-user GTK4 symlinks
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

swww was renamed to awww (codeberg.org/LGFae/awww). Update package
list, README references, and add compatibility symlinks in post-install
so waypaper keeps working until it supports awww natively.

Also add per-user ~/.config/gtk-4.0/ symlinks — libadwaita ignores the
system-wide /etc/xdg/ fallback, so apps like Nautilus need user-level
CSS links to pick up the Catppuccin theme.
---
 README.md               |  2 +-
 packages/official.txt   |  2 +-
 scripts/post-install.sh | 16 ++++++++++++++++
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index c303f01..07f2cf3 100644
--- a/README.md
+++ b/README.md
@@ -29,7 +29,7 @@ desktop that can be rebuilt from scratch in minutes.
 | **Icons** | Colloid-Grey-Catppuccin-Dark | Catppuccin-colored icon set matching the GTK theme. |
 | **Cursor** | Sweet-cursors | Visible on dark backgrounds without clashing. |
 | **Font** | UbuntuSans Nerd Font | Clean sans-serif with full Nerd Font glyph coverage for bar/terminal icons. |
-| **Wallpaper** | [waypaper](https://github.com/anufrievroman/waypaper) + [swww](https://github.com/LGFae/swww) | waypaper provides GUI selection, swww handles animated transitions (60 FPS, 2s crossfade). |
+| **Wallpaper** | [waypaper](https://github.com/anufrievroman/waypaper) + [awww](https://codeberg.org/LGFae/awww) | waypaper provides GUI selection, awww handles animated transitions (60 FPS, 2s crossfade). |
 | **Firewall** | UFW | Simple deny-incoming/allow-outgoing default. Sane baseline without iptables complexity. |
 | **AUR Helper** | [paru](https://github.com/Morganamilo/paru) | Rust-based, pacman-compatible. Supports custom PKGBUILD repos for moongreet/moonlock/moonset. |
 
diff --git a/packages/official.txt b/packages/official.txt
index 9489e79..e395d30 100644
--- a/packages/official.txt
+++ b/packages/official.txt
@@ -63,7 +63,7 @@ cliphist
 wl-clipboard
 libnotify
 upower
-swww
+awww
 brightnessctl
 gtklock
 gtklock-playerctl-module
diff --git a/scripts/post-install.sh b/scripts/post-install.sh
index 162c725..f452769 100755
--- a/scripts/post-install.sh
+++ b/scripts/post-install.sh
@@ -117,6 +117,14 @@ if [[ -d "$THEME_GTK4" ]]; then
     # Assets symlink: remove first if exists (ln -sf on directories follows the link)
     sudo rm -f "$GTK4_XDG/assets"
     sudo ln -s "$THEME_GTK4/assets" "$GTK4_XDG/assets"
+    # libadwaita only reads user CSS from ~/.config/gtk-4.0/, not /etc/xdg/ fallback.
+    # Create per-user symlinks so the theme applies to libadwaita apps (e.g. Nautilus).
+    USER_GTK4="$HOME/.config/gtk-4.0"
+    mkdir -p "$USER_GTK4"
+    ln -sf "$THEME_GTK4/gtk-dark.css" "$USER_GTK4/gtk.css"
+    ln -sf "$THEME_GTK4/gtk-dark.css" "$USER_GTK4/gtk-dark.css"
+    rm -f "$USER_GTK4/assets"
+    ln -s "$THEME_GTK4/assets" "$USER_GTK4/assets"
 else
     err "GTK4 theme not found: $THEME_GTK4 — libadwaita apps will use fallback theme."
 fi
@@ -134,6 +142,14 @@ gsettings set org.gnome.desktop.interface font-name 'UbuntuSans Nerd Font 11'
 log "Installing Moonarch helper scripts to /usr/local/bin/..."
 sudo install -m 755 "$DEFAULTS_DIR/bin/moonarch-"* /usr/local/bin/
 
+# --- awww compatibility symlinks (waypaper still calls swww) ---
+
+if command -v awww &>/dev/null && ! command -v swww &>/dev/null; then
+    log "Creating swww -> awww compatibility symlinks..."
+    sudo ln -s /usr/bin/awww /usr/local/bin/swww
+    sudo ln -s /usr/bin/awww-daemon /usr/local/bin/swww-daemon
+fi
+
 # --- Zsh configuration ---
 
 log "Installing Zsh default config..."