swaync: port s6 -> systemd

hosts/common/programs/swaynotificationcenter/default.nix

@@ -10,7 +10,7 @@
 # configuration:
 # - defaults: /run/current-system/etc/profiles/per-user/colin/etc/xdg/swaync/
 # - `man 5 swaync`
-# - view document tree: `GTK_DEBUG=interactive swaync`  (`s6 stop swaync` first)
+# - view document tree: `GTK_DEBUG=interactive swaync`  (`systemctl stop swaync` first)
 # - examples:
 #   - thread: <https://github.com/ErikReider/SwayNotificationCenter/discussions/183>
 #   - buttons-grid and menubar: <https://gist.github.com/JannisPetschenka/fb00eec3efea9c7fff8c38a01ce5d507>
@@ -32,12 +32,15 @@ in
       pname = "swaync-service-dispatcher";
       srcRoot = ./.;
       pkgs = [
-        "s6"
-        "s6-rc"
+        "systemdMinimal"
       ];
     };
-    sandbox.whitelistS6 = true;
+    sandbox.whitelistSystemctl = true;
     sandbox.keepPidsAndProc = true;  #< XXX: not sure why, but swaync segfaults under load without this!
+
+    suggestedPrograms = [
+      "systemctl"
+    ];
   };
 
   sane.programs.swaync-fbcli = {
@@ -106,7 +109,7 @@ in
       "user"  # mpris; portal
       "system"  # backlight
     ];
-    sandbox.whitelistS6 = true;
+    sandbox.whitelistSystemctl = true;
     sandbox.whitelistWayland = true;
     sandbox.extraPaths = [
       "/sys/class/backlight"

hosts/common/programs/swaynotificationcenter/swaync-service-dispatcher

@@ -1,9 +1,5 @@
 #!/usr/bin/env nix-shell
-#!nix-shell -i bash -p bash -p s6 -p s6-rc
-
-# for default $PATH to take precedence over nix-shell PATH if invoked interactively,
-# otherwise we invoke a s6-rc which does not know where to find files.
-export PATH="/etc/profiles/per-user/$(whoami)/bin:/run/current-system/sw/bin:$PATH"
+#!nix-shell -i bash -p bash -p systemdMinimal
 
 usage() {
   echo "swaync-service-dispatcher <action> <service>"
@@ -27,22 +23,15 @@ log() {
 }
 
 checkActive() {
-  # simulate a dry-run start. if no actions would be performed, then the service is up.
-  # alternative is s6-svstat, but that doesn't support oneshots
-  local s6Output=$(s6-rc -n 0 -b start "$service")
-  if [ -z "$s6Output" ]; then
-    echo true
-  else
-    echo false
-  fi
+  systemctl is-active "$service.service" > /dev/null && echo true || echo false
 }
 startService() {
   log "startService: $service"
-  s6-rc -b start "$service"
+  systemctl start "$service"
 }
 stopService() {
   log "stopService: $service"
-  s6-rc -b stop "$service"
+  systemctl stop "$service"
 }
 
 case "$action" in
@@ -59,7 +48,7 @@ case "$action" in
         ;;
     esac
     ;;
-  # these aren't needed by swaync; just handy because i can never remember how to use s6
+  # these aren't needed by swaync; just handy for testing/debugging
   (up)
     startService
     ;;