From f2a28f85770e7f34e61a128cc6a470d1d07c96cb Mon Sep 17 00:00:00 2001
From: nevaforget <dom@moonarch.de>
Date: Tue, 31 Mar 2026 09:36:20 +0200
Subject: [PATCH] docs: fix README, remove gtklock and wlogout remnants
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

README: fix keybind (wlogout → moonset), remove gtklock from project
structure, correct package counts, remove nonexistent install-themes.sh,
mark update.sh as legacy wrapper.
Remove gtklock packages (5) and wlogout from package lists.
Remove defaults/xdg/gtklock/ config directory.
Remove stale foot/waybar overrides from transform.sh.
---
 README.md                       |  12 ++-
 defaults/xdg/gtklock/config.ini |  29 -------
 defaults/xdg/gtklock/gtklock.ui | 138 --------------------------------
 defaults/xdg/gtklock/style.css  |  12 ---
 packages/aur.txt                |   2 -
 packages/official.txt           |   4 -
 scripts/transform.sh            |   4 -
 7 files changed, 5 insertions(+), 196 deletions(-)
 delete mode 100644 defaults/xdg/gtklock/config.ini
 delete mode 100644 defaults/xdg/gtklock/gtklock.ui
 delete mode 100644 defaults/xdg/gtklock/style.css

diff --git a/README.md b/README.md
index 7cbe83c..1807500 100644
--- a/README.md
+++ b/README.md
@@ -50,7 +50,7 @@ desktop that can be rebuilt from scratch in minutes.
 4. Reboot again — done.
 
 The archinstall config clones this repo to `/opt/moonarch` via custom-commands.
-post-install.sh handles the remaining ~100 packages, all configs, themes, services,
+post-install.sh handles the remaining ~95 packages, all configs, themes, services,
 and user setup.
 
 ### Transform (Existing Arch+Wayland System)
@@ -99,15 +99,14 @@ config/
   user_configuration.json       archinstall config (locale, audio, services, custom-commands)
 
 packages/
-  official.txt                  Arch repo packages (~100), one per line
-  aur.txt                       AUR packages (~15), one per line
+  official.txt                  Arch repo packages (~80), one per line
+  aur.txt                       AUR packages (~20), one per line
 
 scripts/
   lib.sh                        Shared helpers sourced by all scripts
   post-install.sh               Main automation (packages, configs, themes, services)
   transform.sh                  Convert existing Arch+Wayland system to Moonarch
-  install-themes.sh             Cursor theme installer (Sweet-cursors)
-  update.sh                     System updater (symlinked to moonarch-update)
+  update.sh                     Legacy wrapper — prints notice, forwards to moonarch-update
 
 defaults/
   xdg/                          System-wide XDG configs (deployed to /etc/xdg/)
@@ -117,7 +116,6 @@ defaults/
     foot/foot.ini                 Terminal: font, colors, keybinds
     dunst/dunstrc                 Notifications: geometry, colors, behavior
     kanshi/config                 Display profiles (empty, user-configured)
-    gtklock/                      Lock screen: config, UI layout, CSS
     stasis/stasis.rune            Idle manager: AC/battery power plans
     pipewire/                     Audio: RNNoise input denoising
     waypaper/config.ini           Wallpaper manager: backend, folder, transitions
@@ -178,7 +176,7 @@ greetd ─► niri (greeter instance) ─► moongreet ─► user authenticates
 | `Super+E` | File manager |
 | `Super+A` | Audio control (walker) |
 | `Super+N` | VPN manager |
-| `Super+Alt+L` | Session menu (wlogout) |
+| `Super+Alt+L` | Session menu (moonset) |
 | `Print` | Screenshot |
 | `Ctrl+Print` | Screenshot screen |
 | `Alt+Print` | Screenshot window |
diff --git a/defaults/xdg/gtklock/config.ini b/defaults/xdg/gtklock/config.ini
deleted file mode 100644
index 7cd73d1..0000000
--- a/defaults/xdg/gtklock/config.ini
+++ /dev/null
@@ -1,29 +0,0 @@
-# ABOUTME: Moonarch default gtklock configuration.
-# ABOUTME: User overrides go in ~/.config/gtklock/config.ini
-
-[main]
-modules=powerbar-module;userinfo-module;playerctl-module;dpms
-follow-focus=true
-layout=/etc/xdg/gtklock/gtklock.ui
-
-[powerbar]
-show-labels=false
-linked-buttons=true
-reboot-command=systemctl reboot
-poweroff-command=systemctl -i poweroff
-suspend-command=systemctl suspend
-userswitch-command=
-logout-command=
-
-[playerctl]
-art-size=64
-position=under-clock
-
-[userinfo]
-round-image=true
-horizontal-layout=false
-under-clock=false
-
-[dpms]
-idle-hide=true
-idle-timeout=10
diff --git a/defaults/xdg/gtklock/gtklock.ui b/defaults/xdg/gtklock/gtklock.ui
deleted file mode 100644
index 4b89b3f..0000000
--- a/defaults/xdg/gtklock/gtklock.ui
+++ /dev/null
@@ -1,138 +0,0 @@
-<!-- ABOUTME: Moonarch default gtklock UI layout definition. -->
-<!-- ABOUTME: User overrides go in ~/.config/gtklock/gtklock.ui -->
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-	<object class="GtkBox" id="window-box">
-		<property name="name">window-box</property>
-		<property name="margin">20</property>
-		<property name="halign">center</property>
-		<property name="valign">center</property>
-		<property name="orientation">vertical</property>
-		<property name="spacing">50</property>
-		<child>
-			<object class="GtkBox" id="info-box">
-				<property name="name">info-box</property>
-				<property name="halign">center</property>
-				<property name="orientation">vertical</property>
-				<property name="spacing">5</property>
-				<child>
-					<object class="GtkBox" id="time-box">
-						<property name="name">time-box</property>
-						<property name="halign">center</property>
-						<property name="orientation">vertical</property>
-						<child>
-							<object class="GtkLabel" id="clock-label">
-								<property name="name">clock-label</property>
-								<property name="halign">center</property>
-							</object>
-						</child>
-						<child>
-							<object class="GtkLabel" id="date-label">
-								<property name="name">date-label</property>
-								<property name="halign">center</property>
-							</object>
-						</child>
-					</object>
-				</child>
-			</object>
-		</child>
-		<child>
-			<object class="GtkRevealer" id="body-revealer">
-				<property name="transition-type">none</property>
-				<property name="reveal-child">0</property>
-				<child>
-					<object class="GtkGrid" id="body-grid">
-						<property name="row-spacing">5</property>
-						<property name="column-spacing">5</property>
-						<child>
-							<object class="GtkLabel" id="input-label">
-								<property name="name">input-label</property>
-								<property name="label" translatable="yes">Password:</property>
-							</object>
-							<packing>
-								<property name="left-attach">0</property>
-								<property name="top-attach">0</property>
-							</packing>
-						</child>
-						<child>
-							<object class="GtkEntry" id="input-field">
-								<property name="name">input-field</property>
-								<property name="width-request">380</property>
-								<property name="visibility">0</property>
-								<property name="caps-lock-warning">0</property>
-								<property name="input-purpose">password</property>
-								<property name="secondary-icon-name">view-reveal-symbolic</property>
-								<signal name="icon-release" handler="window_pw_toggle_vis"/>
-								<signal name="activate" handler="window_pw_check"/>
-							</object>
-							<packing>
-								<property name="left-attach">1</property>
-								<property name="top-attach">0</property>
-								<property name="width">2</property>
-							</packing>
-						</child>
-						<child>
-							<object class="GtkRevealer" id="message-revealer">
-								<property name="transition-type">none</property>
-								<property name="no-show-all">1</property>
-								<child>
-									<object class="GtkScrolledWindow" id="message-scrolled-window">
-										<property name="hscrollbar-policy">never</property>
-										<property name="max-content-height">256</property>
-										<property name="propagate-natural-height">1</property>
-										<child>
-											<object class="GtkViewport">
-												<child>
-													<object class="GtkBox" id="message-box">
-														<property name="orientation">vertical</property>
-														<property name="homogeneous">1</property>
-													</object>
-												</child>
-											</object>
-										</child>
-									</object>
-								</child>
-							</object>
-							<packing>
-								<property name="left-attach">1</property>
-								<property name="top-attach">1</property>
-								<property name="width">2</property>
-							</packing>
-						</child>
-						<child>
-							<object class="GtkBox">
-								<property name="halign">end</property>
-								<property name="spacing">5</property>
-								<child>
-									<object class="GtkLabel" id="warning-label">
-										<property name="name">warning-label</property>
-									</object>
-								</child>
-								<child>
-									<object class="GtkLabel" id="error-label">
-										<property name="name">error-label</property>
-									</object>
-								</child>
-								<child>
-									<object class="GtkButton" id="unlock-button">
-										<property name="name">unlock-button</property>
-										<property name="label" translatable="yes">Unlock</property>
-										<style>
-											<class name="suggested-action"/>
-										</style>
-										<signal name="clicked" handler="window_pw_check"/>
-									</object>
-								</child>
-							</object>
-							<packing>
-								<property name="left-attach">1</property>
-								<property name="top-attach">2</property>
-								<property name="width">2</property>
-							</packing>
-						</child>
-					</object>
-				</child>
-			</object>
-		</child>
-	</object>
-</interface>
diff --git a/defaults/xdg/gtklock/style.css b/defaults/xdg/gtklock/style.css
deleted file mode 100644
index c26f3b3..0000000
--- a/defaults/xdg/gtklock/style.css
+++ /dev/null
@@ -1,12 +0,0 @@
-/* ABOUTME: Moonarch default gtklock stylesheet. */
-/* ABOUTME: User overrides go in ~/.config/gtklock/style.css */
-
-window {
-	background-image: url("/usr/share/moonarch/wallpaper.jpg");
-	background-size: cover;
-}
-
-#powerbar {
-	padding-bottom: 100px;
-	background: red;
-}
diff --git a/packages/aur.txt b/packages/aur.txt
index aa7d232..16c6646 100644
--- a/packages/aur.txt
+++ b/packages/aur.txt
@@ -21,8 +21,6 @@ waybar-niri-windows-bin
 waybar-niri-workspaces-enhanced-git
 wdisplays-persistent-gettext
 wl-color-picker
-wlogout
-gtklock-dpms-module
 
 # Applications
 blueberry
diff --git a/packages/official.txt b/packages/official.txt
index 9bf4892..0d81a97 100644
--- a/packages/official.txt
+++ b/packages/official.txt
@@ -65,10 +65,6 @@ libnotify
 upower
 awww
 brightnessctl
-gtklock
-gtklock-playerctl-module
-gtklock-powerbar-module
-gtklock-userinfo-module
 nwg-look
 greetd
 polkit-gnome
diff --git a/scripts/transform.sh b/scripts/transform.sh
index ad6d7a3..7a23a8f 100755
--- a/scripts/transform.sh
+++ b/scripts/transform.sh
@@ -285,10 +285,6 @@ done
 log "Deploying moonarch config overrides..."
 cp /usr/share/moonarch/walker-config.toml "$HOME/.config/walker/config.toml"
 log "  + walker/config.toml"
-cp /usr/share/moonarch/foot/foot.ini "$HOME/.config/foot/foot.ini"
-log "  + foot/foot.ini"
-cp /usr/share/moonarch/waybar/style.css "$HOME/.config/waybar/style.css"
-log "  + waybar/style.css"
 
 # Deploy user defaults (overwrite, no existence check)
 log "Deploying user config defaults to ~/.config/ (overwrite)..."