From 0cd43b9e540259f11d2283e1eff1584fb8aacfa9 Mon Sep 17 00:00:00 2001
From: funman300 <funman300@gmail.com>
Date: Wed, 22 Apr 2026 17:15:17 -0700
Subject: [PATCH] Switch greeter from tuigreet to regreet

- Replace greetd-tuigreet with greetd-regreet + cage in packages.txt
- Add greetd/config.toml and greetd/regreet.toml (Materia-dark theme)
- Update install.sh to deploy greetd configs to /etc/greetd/
- Fix powermenu.sh awk parsing (use $NF instead of $2 for icon glyphs)
---
 greetd/config.toml   |  6 ++++++
 greetd/regreet.toml  | 13 +++++++++++++
 install.sh           |  4 ++++
 packages.txt         |  3 ++-
 scripts/powermenu.sh |  2 +-
 5 files changed, 26 insertions(+), 2 deletions(-)
 create mode 100644 greetd/config.toml
 create mode 100644 greetd/regreet.toml

diff --git a/greetd/config.toml b/greetd/config.toml
new file mode 100644
index 0000000..dc7fc9f
--- /dev/null
+++ b/greetd/config.toml
@@ -0,0 +1,6 @@
+[terminal]
+vt = 1
+
+[default_session]
+command = "cage -s -- regreet"
+user = "greeter"
diff --git a/greetd/regreet.toml b/greetd/regreet.toml
new file mode 100644
index 0000000..de31c65
--- /dev/null
+++ b/greetd/regreet.toml
@@ -0,0 +1,13 @@
+[GTK]
+application_prefer_dark_theme = true
+cursor_theme_name = "Adwaita"
+font_name = "Sans 10"
+icon_theme_name = "Papirus-Dark"
+theme_name = "Materia-dark"
+
+[commands]
+reboot = ["systemctl", "reboot"]
+poweroff = ["systemctl", "poweroff"]
+
+[appearance]
+greeting_msg = "Welcome back!"
diff --git a/install.sh b/install.sh
index bfd1d59..c23f1a5 100755
--- a/install.sh
+++ b/install.sh
@@ -34,4 +34,8 @@ ln -sf "$(pwd)/scripts/clipboard.sh" ~/.local/bin/clipboard-picker
 echo "==> Enabling systemd user services"
 mkdir -p ~/.config/systemd/user
 
+echo "==> Deploying greetd config"
+sudo cp "$(pwd)/greetd/config.toml" /etc/greetd/config.toml
+sudo cp "$(pwd)/greetd/regreet.toml" /etc/greetd/regreet.toml
+
 echo "==> Done. Start Niri with: niri-session"
diff --git a/packages.txt b/packages.txt
index b02f790..791766f 100644
--- a/packages.txt
+++ b/packages.txt
@@ -17,7 +17,8 @@ polkit-gnome
 xdg-desktop-portal-wlr
 thunar
 greetd
-greetd-tuigreet
+greetd-regreet
+cage
 cliphist
 blueman
 wlsunset
diff --git a/scripts/powermenu.sh b/scripts/powermenu.sh
index 5dcb2e9..3020d62 100755
--- a/scripts/powermenu.sh
+++ b/scripts/powermenu.sh
@@ -8,7 +8,7 @@ CHOICE=$(printf "  Logout\n  Restart\n  Sleep\n  Shutdown" \
            --hide-scroll \
            --no-actions \
            --insensitive \
-    | awk '{print $2}')
+    | awk '{print $NF}')
 
 case "$CHOICE" in
     Logout)   niri msg action quit ;;