From eaf30724aaf024ce5530472b08e9839c6297b97f Mon Sep 17 00:00:00 2001
From: nevaforget <dom@moonarch.de>
Date: Sun, 29 Mar 2026 14:00:51 +0200
Subject: [PATCH] fix missing packages, remove dead code, replace ponymix with
 pactl

- Add wl-clipboard, libnotify, upower, bluez, bluez-utils to official.txt
- Remove stow (installed but never used)
- Remove dead moonlock.service cp block from post-install.sh
- Rewrite moonarch-sink-switcher and moonarch-volume to use pactl
  instead of ponymix (already available via libpulse)
---
 defaults/bin/moonarch-sink-switcher | 15 ++++++---------
 defaults/bin/moonarch-volume        |  4 ++--
 packages/official.txt               |  8 +++++++-
 scripts/post-install.sh             |  6 ------
 4 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/defaults/bin/moonarch-sink-switcher b/defaults/bin/moonarch-sink-switcher
index 40d323e..0c5b097 100755
--- a/defaults/bin/moonarch-sink-switcher
+++ b/defaults/bin/moonarch-sink-switcher
@@ -1,16 +1,13 @@
 #!/usr/bin/bash
-# ABOUTME: Rofi-based PulseAudio sink switcher using ponymix.
+# ABOUTME: Rofi-based PulseAudio sink switcher using pactl.
 # ABOUTME: Changes the default sink and moves all active streams to it.
 
-# choose pulseaudio sink via rofi or dmenu
+# choose audio sink via rofi
 # changes default sink and moves all streams to that sink
-#https://gist.github.com/Nervengift/844a597104631c36513c?permalink_comment_id=1826282
 
-sink=$(ponymix -t sink list|awk '/^sink/ {s=$1" "$2;getline;gsub(/^ +/,"",$0);print s" "$0}'|rofi -dmenu -theme '/etc/xdg/rofi/themes/volume.rasi' -mesg '󱡫 Sink Switcher' -p 'pulseaudio sink:' -location 6 -width 100|grep -Po '[0-9]+(?=:)') &&
+sink=$(pactl list sinks short | awk '{print $1, $2}' | rofi -dmenu -theme '/etc/xdg/rofi/themes/volume.rasi' -mesg '󱡫 Sink Switcher' -p 'audio sink:' -location 6 -width 100 | awk '{print $1}') &&
 
-
-ponymix set-default -d $sink &&
-for input in $(ponymix list -t sink-input|grep -Po '[0-9]+(?=:)');do
-	echo "$input -> $sink"
-	ponymix -t sink-input -d $input move $sink
+pactl set-default-sink "$sink" &&
+for input in $(pactl list sink-inputs short | awk '{print $1}'); do
+	pactl move-sink-input "$input" "$sink"
 done
diff --git a/defaults/bin/moonarch-volume b/defaults/bin/moonarch-volume
index 257f756..bdc861d 100755
--- a/defaults/bin/moonarch-volume
+++ b/defaults/bin/moonarch-volume
@@ -41,8 +41,8 @@ else
 	micon=''
 fi
 
-currentsink=$(ponymix defaults|awk '/^sink/ {s=$1" "$2;getline;gsub(/^ +/,"",$0);print s" "$0}' | cut -d':' -f2)
-currentsource=$(ponymix defaults|awk '/^source/ {s=$1" "$2;getline;gsub(/^ +/,"",$0);print s" "$0}' | cut -d':' -f2)
+currentsink=$(pactl get-default-sink)
+currentsource=$(pactl get-default-source)
 
 
 # Theme Elements
diff --git a/packages/official.txt b/packages/official.txt
index f9f1da2..9489e79 100644
--- a/packages/official.txt
+++ b/packages/official.txt
@@ -36,6 +36,10 @@ sshfs
 nmap
 wget
 
+# Bluetooth
+bluez
+bluez-utils
+
 # Audio (PipeWire)
 pipewire
 pipewire-alsa
@@ -56,6 +60,9 @@ xwayland-satellite
 waybar
 dunst
 cliphist
+wl-clipboard
+libnotify
+upower
 swww
 brightnessctl
 gtklock
@@ -90,7 +97,6 @@ go
 neovim
 npm
 rustup
-stow
 
 # System
 docker
diff --git a/scripts/post-install.sh b/scripts/post-install.sh
index ed48824..162c725 100755
--- a/scripts/post-install.sh
+++ b/scripts/post-install.sh
@@ -154,12 +154,6 @@ if [[ ! -f "$HOME/.zshrc" ]]; then
     echo "source /etc/zsh/zshrc.moonarch" >> "$HOME/.zshrc"
 fi
 
-# --- moonlock systemd user service ---
-
-log "Configuring moonlock user service..."
-sudo mkdir -p /etc/systemd/user
-sudo cp "$DEFAULTS_DIR/etc/systemd/user/moonlock.service" /etc/systemd/user/moonlock.service
-
 # --- greetd / moongreet configuration ---
 
 log "Configuring greetd + moongreet..."