Drop waybar and swaync from the desktop set
Both are marked 'kept as a reserve' in the Arch config, a note left over from the migration to the Quickshell bar. A fresh setup has no reason to carry them, so the packages, their configs and the waybar-only helper scripts stay out.
This commit is contained in:
1 parent
06a0e68bea
commit
d6c42526fb
2 files changed
+12
-9
No files matched your search
+12
-6
@@ -34,7 +34,14 @@ let
|
|||||||
dontBuild = true;
|
dontBuild = true;
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
runHook preInstall
|
runHook preInstall
|
||||||
install -Dm755 defaults/bin/moonarch-* -t "$out/bin/"
|
# moonarch-waybar* are excluded: waybar is not part of this setup, the
|
||||||
|
# Quickshell bar replaced it.
|
||||||
|
for f in defaults/bin/moonarch-*; do
|
||||||
|
case "$(basename "$f")" in
|
||||||
|
moonarch-waybar*) continue ;;
|
||||||
|
esac
|
||||||
|
install -Dm755 "$f" -t "$out/bin/"
|
||||||
|
done
|
||||||
runHook postInstall
|
runHook postInstall
|
||||||
'';
|
'';
|
||||||
|
|
||||||
@@ -56,8 +63,6 @@ in
|
|||||||
"niri/config.kdl".source = "${xdg}/niri/config.kdl";
|
"niri/config.kdl".source = "${xdg}/niri/config.kdl";
|
||||||
"xdg/niri/config.kdl".source = "${xdg}/niri/config.kdl";
|
"xdg/niri/config.kdl".source = "${xdg}/niri/config.kdl";
|
||||||
"xdg/quickshell/moonarch".source = "${xdg}/quickshell/moonarch";
|
"xdg/quickshell/moonarch".source = "${xdg}/quickshell/moonarch";
|
||||||
"xdg/waybar".source = "${xdg}/waybar";
|
|
||||||
"xdg/swaync".source = "${xdg}/swaync";
|
|
||||||
"xdg/foot/foot.ini".source = "${xdg}/foot/foot.ini";
|
"xdg/foot/foot.ini".source = "${xdg}/foot/foot.ini";
|
||||||
"xdg/fastfetch/config.jsonc".source = "${xdg}/fastfetch/config.jsonc";
|
"xdg/fastfetch/config.jsonc".source = "${xdg}/fastfetch/config.jsonc";
|
||||||
"xdg/kanshi/config".source = "${xdg}/kanshi/config";
|
"xdg/kanshi/config".source = "${xdg}/kanshi/config";
|
||||||
@@ -160,10 +165,11 @@ in
|
|||||||
xwayland-satellite
|
xwayland-satellite
|
||||||
kanshi
|
kanshi
|
||||||
|
|
||||||
# Bar, notifications, clipboard
|
# Bar, notifications, clipboard.
|
||||||
waybar
|
# Neither waybar nor swaync are installed: the Quickshell bar owns both
|
||||||
|
# roles. The "kept as a reserve" notes in the Arch config date from the
|
||||||
|
# migration and do not apply to a fresh setup.
|
||||||
quickshell
|
quickshell
|
||||||
swaynotificationcenter
|
|
||||||
libnotify
|
libnotify
|
||||||
cliphist
|
cliphist
|
||||||
wl-clipboard
|
wl-clipboard
|
||||||
|
|||||||
@@ -80,9 +80,6 @@
|
|||||||
Type = "simple";
|
Type = "simple";
|
||||||
ExecStartPre = "${pkgs.coreutils}/bin/sleep 2";
|
ExecStartPre = "${pkgs.coreutils}/bin/sleep 2";
|
||||||
ExecStart = "${lib.getExe pkgs.wlsunset} -T 6500 -t 5000 -S 00:00 -s 00:01";
|
ExecStart = "${lib.getExe pkgs.wlsunset} -T 6500 -t 5000 -S 00:00 -s 00:01";
|
||||||
# Leading '-' keeps a missing waybar non-fatal, otherwise pkill's exit 1
|
|
||||||
# fails the unit and Restart=on-failure spins it in a flicker loop.
|
|
||||||
ExecStartPost = "-${pkgs.procps}/bin/pkill -RTMIN+11 waybar";
|
|
||||||
Restart = "on-failure";
|
Restart = "on-failure";
|
||||||
RestartSec = 3;
|
RestartSec = 3;
|
||||||
};
|
};
|
||||||
|
|||||||
Reference in new issue
Block a user