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)
This commit is contained in:
parent
541b701773
commit
eaf30724aa
@ -1,16 +1,13 @@
|
|||||||
#!/usr/bin/bash
|
#!/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.
|
# 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
|
# 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}') &&
|
||||||
|
|
||||||
|
pactl set-default-sink "$sink" &&
|
||||||
ponymix set-default -d $sink &&
|
for input in $(pactl list sink-inputs short | awk '{print $1}'); do
|
||||||
for input in $(ponymix list -t sink-input|grep -Po '[0-9]+(?=:)');do
|
pactl move-sink-input "$input" "$sink"
|
||||||
echo "$input -> $sink"
|
|
||||||
ponymix -t sink-input -d $input move $sink
|
|
||||||
done
|
done
|
||||||
|
|||||||
@ -41,8 +41,8 @@ else
|
|||||||
micon=''
|
micon=''
|
||||||
fi
|
fi
|
||||||
|
|
||||||
currentsink=$(ponymix defaults|awk '/^sink/ {s=$1" "$2;getline;gsub(/^ +/,"",$0);print s" "$0}' | cut -d':' -f2)
|
currentsink=$(pactl get-default-sink)
|
||||||
currentsource=$(ponymix defaults|awk '/^source/ {s=$1" "$2;getline;gsub(/^ +/,"",$0);print s" "$0}' | cut -d':' -f2)
|
currentsource=$(pactl get-default-source)
|
||||||
|
|
||||||
|
|
||||||
# Theme Elements
|
# Theme Elements
|
||||||
|
|||||||
@ -36,6 +36,10 @@ sshfs
|
|||||||
nmap
|
nmap
|
||||||
wget
|
wget
|
||||||
|
|
||||||
|
# Bluetooth
|
||||||
|
bluez
|
||||||
|
bluez-utils
|
||||||
|
|
||||||
# Audio (PipeWire)
|
# Audio (PipeWire)
|
||||||
pipewire
|
pipewire
|
||||||
pipewire-alsa
|
pipewire-alsa
|
||||||
@ -56,6 +60,9 @@ xwayland-satellite
|
|||||||
waybar
|
waybar
|
||||||
dunst
|
dunst
|
||||||
cliphist
|
cliphist
|
||||||
|
wl-clipboard
|
||||||
|
libnotify
|
||||||
|
upower
|
||||||
swww
|
swww
|
||||||
brightnessctl
|
brightnessctl
|
||||||
gtklock
|
gtklock
|
||||||
@ -90,7 +97,6 @@ go
|
|||||||
neovim
|
neovim
|
||||||
npm
|
npm
|
||||||
rustup
|
rustup
|
||||||
stow
|
|
||||||
|
|
||||||
# System
|
# System
|
||||||
docker
|
docker
|
||||||
|
|||||||
@ -154,12 +154,6 @@ if [[ ! -f "$HOME/.zshrc" ]]; then
|
|||||||
echo "source /etc/zsh/zshrc.moonarch" >> "$HOME/.zshrc"
|
echo "source /etc/zsh/zshrc.moonarch" >> "$HOME/.zshrc"
|
||||||
fi
|
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 ---
|
# --- greetd / moongreet configuration ---
|
||||||
|
|
||||||
log "Configuring greetd + moongreet..."
|
log "Configuring greetd + moongreet..."
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user