Move AUR/local deps to optdepends, deploy swaync via install hook
AUR packages can't be resolved by pacman when moonarch-git is installed from the Gitea Package Registry. Move them to optdepends since they're managed separately via packages/aur.txt. swaync config files conflict with the swaync system package — deploy via .install hook like foot and waybar configs.
This commit is contained in:
parent
a1c1687f81
commit
928de71ead
@ -16,14 +16,9 @@ depends=(
|
|||||||
# Compositor & session
|
# Compositor & session
|
||||||
'niri'
|
'niri'
|
||||||
'greetd'
|
'greetd'
|
||||||
'moongreet-git'
|
|
||||||
'moonlock-git'
|
|
||||||
'moonset-git'
|
|
||||||
|
|
||||||
# Bar, launcher, notifications
|
# Bar & notifications
|
||||||
'waybar'
|
'waybar'
|
||||||
'walker-bin'
|
|
||||||
'elephant-bin'
|
|
||||||
'swaync'
|
'swaync'
|
||||||
|
|
||||||
# Terminal
|
# Terminal
|
||||||
@ -33,10 +28,8 @@ depends=(
|
|||||||
'cliphist'
|
'cliphist'
|
||||||
'wl-clipboard'
|
'wl-clipboard'
|
||||||
|
|
||||||
# Display & wallpaper
|
# Display
|
||||||
'kanshi'
|
'kanshi'
|
||||||
'awww'
|
|
||||||
'waypaper'
|
|
||||||
|
|
||||||
# Audio
|
# Audio
|
||||||
'pipewire'
|
'pipewire'
|
||||||
@ -45,12 +38,7 @@ depends=(
|
|||||||
'alsa-utils'
|
'alsa-utils'
|
||||||
'pavucontrol'
|
'pavucontrol'
|
||||||
|
|
||||||
# Idle & lock
|
|
||||||
'stasis'
|
|
||||||
|
|
||||||
# Theming
|
# Theming
|
||||||
'colloid-catppuccin-gtk-theme-git'
|
|
||||||
'sweet-cursors-git'
|
|
||||||
'ttf-ubuntusans-nerd'
|
'ttf-ubuntusans-nerd'
|
||||||
|
|
||||||
# System utilities referenced by helper scripts
|
# System utilities referenced by helper scripts
|
||||||
@ -70,6 +58,21 @@ depends=(
|
|||||||
)
|
)
|
||||||
|
|
||||||
optdepends=(
|
optdepends=(
|
||||||
|
# Moonarch ecosystem (install via paru from AUR/local builds)
|
||||||
|
'moongreet-git: greetd greeter'
|
||||||
|
'moonlock-git: Wayland lockscreen'
|
||||||
|
'moonset-git: session power menu'
|
||||||
|
|
||||||
|
# AUR packages (install via paru)
|
||||||
|
'walker-bin: application launcher'
|
||||||
|
'elephant-bin: walker search daemon'
|
||||||
|
'awww: wallpaper daemon (swww alternative)'
|
||||||
|
'waypaper: wallpaper GUI'
|
||||||
|
'stasis: idle manager'
|
||||||
|
'colloid-catppuccin-gtk-theme-git: Catppuccin GTK theme'
|
||||||
|
'sweet-cursors-git: cursor theme'
|
||||||
|
|
||||||
|
# General tools
|
||||||
'docker: container runtime'
|
'docker: container runtime'
|
||||||
'docker-compose: multi-container orchestration'
|
'docker-compose: multi-container orchestration'
|
||||||
'neovim: editor (EDITOR in zshrc)'
|
'neovim: editor (EDITOR in zshrc)'
|
||||||
@ -117,6 +120,8 @@ package() {
|
|||||||
[[ "$_rel" == "walker/config.toml" ]] && continue
|
[[ "$_rel" == "walker/config.toml" ]] && continue
|
||||||
[[ "$_rel" == "foot/foot.ini" ]] && continue
|
[[ "$_rel" == "foot/foot.ini" ]] && continue
|
||||||
[[ "$_rel" == "waybar/style.css" ]] && continue
|
[[ "$_rel" == "waybar/style.css" ]] && continue
|
||||||
|
[[ "$_rel" == "swaync/config.json" ]] && continue
|
||||||
|
[[ "$_rel" == "swaync/style.css" ]] && continue
|
||||||
if [[ "$file" == *.sh ]]; then
|
if [[ "$file" == *.sh ]]; then
|
||||||
install -Dm755 "$file" "$pkgdir/etc/xdg/$_rel"
|
install -Dm755 "$file" "$pkgdir/etc/xdg/$_rel"
|
||||||
else
|
else
|
||||||
@ -162,6 +167,10 @@ package() {
|
|||||||
"$pkgdir/usr/share/moonarch/foot/foot.ini"
|
"$pkgdir/usr/share/moonarch/foot/foot.ini"
|
||||||
install -Dm644 defaults/xdg/waybar/style.css \
|
install -Dm644 defaults/xdg/waybar/style.css \
|
||||||
"$pkgdir/usr/share/moonarch/waybar/style.css"
|
"$pkgdir/usr/share/moonarch/waybar/style.css"
|
||||||
|
install -Dm644 defaults/xdg/swaync/config.json \
|
||||||
|
"$pkgdir/usr/share/moonarch/swaync/config.json"
|
||||||
|
install -Dm644 defaults/xdg/swaync/style.css \
|
||||||
|
"$pkgdir/usr/share/moonarch/swaync/style.css"
|
||||||
|
|
||||||
# --- Reference configs for greetd/moongreet (deployed by .install, not owned) ---
|
# --- Reference configs for greetd/moongreet (deployed by .install, not owned) ---
|
||||||
install -Dm644 defaults/etc/greetd/config.toml \
|
install -Dm644 defaults/etc/greetd/config.toml \
|
||||||
|
|||||||
@ -25,6 +25,10 @@ post_install() {
|
|||||||
# Deploy waybar style (file owned by waybar package, overwrite deliberately)
|
# Deploy waybar style (file owned by waybar package, overwrite deliberately)
|
||||||
cp /usr/share/moonarch/waybar/style.css /etc/xdg/waybar/style.css
|
cp /usr/share/moonarch/waybar/style.css /etc/xdg/waybar/style.css
|
||||||
|
|
||||||
|
# Deploy swaync config (files owned by swaync package, overwrite deliberately)
|
||||||
|
cp /usr/share/moonarch/swaync/config.json /etc/xdg/swaync/config.json
|
||||||
|
cp /usr/share/moonarch/swaync/style.css /etc/xdg/swaync/style.css
|
||||||
|
|
||||||
# Deploy Walker config override to skel and existing user homes.
|
# Deploy Walker config override to skel and existing user homes.
|
||||||
# Only copies if user has no config yet — never overwrites manual edits.
|
# Only copies if user has no config yet — never overwrites manual edits.
|
||||||
install -Dm644 /usr/share/moonarch/walker-config.toml \
|
install -Dm644 /usr/share/moonarch/walker-config.toml \
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user