From 9b793ef4b8484c7625adb6b1ab4cb9188aa272c9 Mon Sep 17 00:00:00 2001
From: Colin <colin@uninsane.org>
Date: Thu, 21 Mar 2024 05:23:38 +0000
Subject: [PATCH] programs: services: no need to fully-qualify paths anymore
 (s6 doesn't require)

---
 hosts/common/programs/abaddon.nix                        | 2 +-
 hosts/common/programs/bonsai.nix                         | 2 +-
 hosts/common/programs/calls.nix                          | 2 +-
 hosts/common/programs/dino.nix                           | 2 +-
 hosts/common/programs/dissent.nix                        | 2 +-
 hosts/common/programs/fcitx5.nix                         | 7 ++-----
 hosts/common/programs/fractal.nix                        | 2 +-
 hosts/common/programs/geary.nix                          | 2 +-
 hosts/common/programs/gnome-keyring/default.nix          | 9 +++------
 hosts/common/programs/pipewire.nix                       | 4 ++--
 hosts/common/programs/signal-desktop.nix                 | 2 +-
 hosts/common/programs/sway-autoscaler/default.nix        | 2 +-
 hosts/common/programs/sway/default.nix                   | 2 +-
 hosts/common/programs/swayidle.nix                       | 2 +-
 hosts/common/programs/swaynotificationcenter/default.nix | 2 +-
 hosts/common/programs/sysvol.nix                         | 2 +-
 hosts/common/programs/waybar/default.nix                 | 2 +-
 hosts/common/programs/wireplumber.nix                    | 7 ++-----
 hosts/common/programs/wvkbd.nix                          | 7 ++-----
 19 files changed, 25 insertions(+), 37 deletions(-)

diff --git a/hosts/common/programs/abaddon.nix b/hosts/common/programs/abaddon.nix
index edbd069f..d367f4cd 100644
--- a/hosts/common/programs/abaddon.nix
+++ b/hosts/common/programs/abaddon.nix
@@ -88,7 +88,7 @@ in
     services.abaddon = {
       description = "unofficial Discord chat client";
       wantedBy = lib.mkIf cfg.config.autostart [ "graphical-session.target" ];
-      serviceConfig.ExecStart = "${cfg.package}/bin/abaddon";
+      serviceConfig.ExecStart = "abaddon";
     };
   };
 }
diff --git a/hosts/common/programs/bonsai.nix b/hosts/common/programs/bonsai.nix
index 9fc9047d..bf4f7b00 100644
--- a/hosts/common/programs/bonsai.nix
+++ b/hosts/common/programs/bonsai.nix
@@ -123,7 +123,7 @@ in
 
       script = ''
         ${pkgs.coreutils}/bin/rm -f $XDG_RUNTIME_DIR/bonsai
-        exec ${cfg.package}/bin/bonsaid -t ${cfg.config.configFile}
+        exec bonsaid -t ${cfg.config.configFile}
       '';
     };
   };
diff --git a/hosts/common/programs/calls.nix b/hosts/common/programs/calls.nix
index 903005e3..a8c47e38 100644
--- a/hosts/common/programs/calls.nix
+++ b/hosts/common/programs/calls.nix
@@ -46,7 +46,7 @@ in
       description = "gnome-calls daemon to monitor incoming SIP calls";
       wantedBy = lib.mkIf cfg.config.autostart [ "graphical-session.target" ];
       # add --verbose for more debugging
-      serviceConfig.ExecStart = "env G_MESSAGES_DEBUG=all ${cfg.package}/bin/gnome-calls --daemon";
+      serviceConfig.ExecStart = "env G_MESSAGES_DEBUG=all gnome-calls --daemon";
     };
   };
   programs.calls = lib.mkIf cfg.enabled {
diff --git a/hosts/common/programs/dino.nix b/hosts/common/programs/dino.nix
index 29316a7c..a3e14ac1 100644
--- a/hosts/common/programs/dino.nix
+++ b/hosts/common/programs/dino.nix
@@ -80,7 +80,7 @@ in
       #
       # note that debug logging during calls produces so much journal spam that it pegs the CPU and causes dropped audio
       # env G_MESSAGES_DEBUG = "all";
-      serviceConfig.ExecStart = "env PULSE_LATENCY_MSEC=20 ${cfg.package}/bin/dino";
+      serviceConfig.ExecStart = "env PULSE_LATENCY_MSEC=20 dino";
     };
   };
 }
diff --git a/hosts/common/programs/dissent.nix b/hosts/common/programs/dissent.nix
index 3ff3c48f..c335fd39 100644
--- a/hosts/common/programs/dissent.nix
+++ b/hosts/common/programs/dissent.nix
@@ -60,7 +60,7 @@ in
       after = [ "graphical-session.target" ];
       wantedBy = lib.mkIf cfg.config.autostart [ "graphical-session.target" ];
 
-      serviceConfig.ExecStart = "${cfg.package}/bin/dissent";
+      serviceConfig.ExecStart = "dissent";
     };
   };
 }
diff --git a/hosts/common/programs/fcitx5.nix b/hosts/common/programs/fcitx5.nix
index b8a5fa59..63f0d27d 100644
--- a/hosts/common/programs/fcitx5.nix
+++ b/hosts/common/programs/fcitx5.nix
@@ -24,10 +24,7 @@
 #   - nixpkgs has a few themes: `fcitx5-{material-color,nord,rose-pine}`
 #   - NUR has a few themes
 #   - <https://github.com/catppuccin/fcitx5>
-{ config, lib, pkgs, ... }:
-let
-  cfg = config.sane.programs.fcitx5;
-in
+{ lib, pkgs, ... }:
 {
   sane.programs.fcitx5 = {
     packageUnwrapped = pkgs.fcitx5-with-addons.override {
@@ -103,7 +100,7 @@ in
       after = [ "graphical-session.target" ];
       wantedBy = [ "graphical-session.target" ];
 
-      serviceConfig.ExecStart = "${cfg.package}/bin/fcitx5";
+      serviceConfig.ExecStart = "fcitx5";
     };
 
     env.XMODIFIERS = "@im=fcitx";
diff --git a/hosts/common/programs/fractal.nix b/hosts/common/programs/fractal.nix
index 456388d0..f697347e 100644
--- a/hosts/common/programs/fractal.nix
+++ b/hosts/common/programs/fractal.nix
@@ -73,7 +73,7 @@ in
       wantedBy = lib.mkIf cfg.config.autostart [ "graphical-session.target" ];
 
       # env "G_MESSAGES_DEBUG=all"
-      serviceConfig.ExecStart = "${cfg.package}/bin/fractal";
+      serviceConfig.ExecStart = "fractal";
     };
   };
 }
diff --git a/hosts/common/programs/geary.nix b/hosts/common/programs/geary.nix
index d8ade4d8..d97e0261 100644
--- a/hosts/common/programs/geary.nix
+++ b/hosts/common/programs/geary.nix
@@ -91,7 +91,7 @@ in
       # partOf = [ "graphical-session.target" ];
       wantedBy = lib.mkIf cfg.config.autostart [ "graphical-session.target" ];
 
-      serviceConfig.ExecStart = "${cfg.package}/bin/geary";
+      serviceConfig.ExecStart = "geary";
     };
   };
 
diff --git a/hosts/common/programs/gnome-keyring/default.nix b/hosts/common/programs/gnome-keyring/default.nix
index 336f0dc8..c7118a34 100644
--- a/hosts/common/programs/gnome-keyring/default.nix
+++ b/hosts/common/programs/gnome-keyring/default.nix
@@ -1,7 +1,4 @@
-{ config, lib, pkgs, ... }:
-let
-  cfg = config.sane.programs.gnome-keyring;
-in
+{ lib, pkgs, ... }:
 {
   sane.programs.gnome-keyring = {
     packageUnwrapped = pkgs.rmDbusServices pkgs.gnome.gnome-keyring;
@@ -54,8 +51,8 @@ in
       after = [ "graphical-session.target" ];
       wantedBy = [ "graphical-session.target" ];
       serviceConfig = {
-        ExecStart = "${cfg.package}/bin/gnome-keyring-daemon --start --foreground --components=secrets";
-        ExecStartPre = "${pkgs.coreutils}/bin/mkdir -m 0700 -p %t/keyring";
+        ExecStart = "gnome-keyring-daemon --start --foreground --components=secrets";
+        ExecStartPre = "mkdir -m 0700 -p %t/keyring";
       };
     };
   };
diff --git a/hosts/common/programs/pipewire.nix b/hosts/common/programs/pipewire.nix
index fc67ccf3..a4492948 100644
--- a/hosts/common/programs/pipewire.nix
+++ b/hosts/common/programs/pipewire.nix
@@ -35,7 +35,7 @@ in
       serviceConfig = {
         # env PIPEWIRE_LOG_SYSTEMD=false"
         # env PIPEWIRE_DEBUG"*:3,mod.raop*:5,pw.rtsp-client*:5"
-        ExecStart = "${cfg.package}/bin/pipewire";
+        ExecStart = "pipewire";
         ExecStartPost = pkgs.writeShellScript "pipewire-wait-started" ''
           waitFor() {
             while [ ! -e "$1" ]; do
@@ -53,7 +53,7 @@ in
       after = [ "pipewire.service" ];
       wantedBy = [ "pipewire.service" ];
       serviceConfig = {
-        ExecStart = "${cfg.package}/bin/pipewire-pulse";
+        ExecStart = "pipewire-pulse";
         ExecStartPost = pkgs.writeShellScript "pipewire-pulse-wait-started" ''
           waitFor() {
             while [ ! -e "$1" ]; do
diff --git a/hosts/common/programs/signal-desktop.nix b/hosts/common/programs/signal-desktop.nix
index 228b6cba..1897f122 100644
--- a/hosts/common/programs/signal-desktop.nix
+++ b/hosts/common/programs/signal-desktop.nix
@@ -51,7 +51,7 @@ in
       wantedBy = lib.mkIf cfg.config.autostart [ "graphical-session.target" ];
 
       # for some reason the --ozone-platform-hint=auto flag fails when signal-desktop is launched from a service
-      serviceConfig.ExecStart = "env NIXOS_OZONE_WL=1 ${cfg.package}/bin/signal-desktop";
+      serviceConfig.ExecStart = "env NIXOS_OZONE_WL=1 signal-desktop";
     };
   };
 }
diff --git a/hosts/common/programs/sway-autoscaler/default.nix b/hosts/common/programs/sway-autoscaler/default.nix
index acc19bec..30105af3 100644
--- a/hosts/common/programs/sway-autoscaler/default.nix
+++ b/hosts/common/programs/sway-autoscaler/default.nix
@@ -35,7 +35,7 @@ in
       serviceConfig.ExecStart = lib.escapeShellArgs [
         "env"
         "SWAY_DEFAULT_SCALE=${builtins.toString cfg.config.defaultScale}"
-        "${cfg.package}/bin/sway-autoscaler"
+        "sway-autoscaler"
         "--loop-sec"
         (builtins.toString cfg.config.interval)
       ];
diff --git a/hosts/common/programs/sway/default.nix b/hosts/common/programs/sway/default.nix
index bb97f20d..ae1373b5 100644
--- a/hosts/common/programs/sway/default.nix
+++ b/hosts/common/programs/sway/default.nix
@@ -254,7 +254,7 @@ in
     services.sway = {
       description = "sway: tiling wayland desktop environment";
       wantedBy = [ "default.target" ];
-      serviceConfig.ExecStart = "${cfg.package}/bin/sway";
+      serviceConfig.ExecStart = "sway";
     };
   };
 
diff --git a/hosts/common/programs/swayidle.nix b/hosts/common/programs/swayidle.nix
index 69ac3e91..5a1b04ce 100644
--- a/hosts/common/programs/swayidle.nix
+++ b/hosts/common/programs/swayidle.nix
@@ -59,7 +59,7 @@ in
 
       serviceConfig.ExecStart = lib.escapeShellArgs (
         [
-          "${cfg.package}/bin/swayidle"
+          "swayidle"
           "-w"
         ] ++ lib.flatten (
           lib.mapAttrsToList
diff --git a/hosts/common/programs/swaynotificationcenter/default.nix b/hosts/common/programs/swaynotificationcenter/default.nix
index 961f28d1..9c97f17c 100644
--- a/hosts/common/programs/swaynotificationcenter/default.nix
+++ b/hosts/common/programs/swaynotificationcenter/default.nix
@@ -478,7 +478,7 @@ in
       # partOf = [ "graphical-session.target" ];
       wantedBy = [ "graphical-session.target" ];
 
-      serviceConfig.ExecStart = "env G_MESSAGES_DEBUG=all ${cfg.package}/bin/swaync";
+      serviceConfig.ExecStart = "env G_MESSAGES_DEBUG=all swaync";
       # serviceConfig.BusName = "org.freedesktop.Notifications";
     };
   };
diff --git a/hosts/common/programs/sysvol.nix b/hosts/common/programs/sysvol.nix
index 4e6662ef..748d6dbc 100644
--- a/hosts/common/programs/sysvol.nix
+++ b/hosts/common/programs/sysvol.nix
@@ -76,7 +76,7 @@ in
       # -{H,W} N      to set the height/width of the notifier, in px.
       # -i N          to set the size of the volume icon
       # -P            to hide percentage text
-      serviceConfig.ExecStart = "${cfg.package}/bin/sysvol -p 0 -t 1 -m 22 -H 39 -W 256 -i 32 -P";
+      serviceConfig.ExecStart = "sysvol -p 0 -t 1 -m 22 -H 39 -W 256 -i 32 -P";
     };
   };
 }
diff --git a/hosts/common/programs/waybar/default.nix b/hosts/common/programs/waybar/default.nix
index 435efee2..e4491691 100644
--- a/hosts/common/programs/waybar/default.nix
+++ b/hosts/common/programs/waybar/default.nix
@@ -120,7 +120,7 @@ in
       wantedBy = [ "graphical-session.target" ];
 
       # env G_MESSAGES_DEBUG=all
-      serviceConfig.ExecStart = "${cfg.package}/bin/waybar";
+      serviceConfig.ExecStart = "waybar";
     };
   };
 }
diff --git a/hosts/common/programs/wireplumber.nix b/hosts/common/programs/wireplumber.nix
index 3a93d31d..f44a2c35 100644
--- a/hosts/common/programs/wireplumber.nix
+++ b/hosts/common/programs/wireplumber.nix
@@ -1,7 +1,4 @@
-{ config, ... }:
-let
-  cfg = config.sane.programs.wireplumber;
-in
+{ ... }:
 {
   sane.programs.wireplumber = {
     sandbox.method = "bwrap";
@@ -37,7 +34,7 @@ in
       after = [ "pipewire.service" ];
       bindsTo = [ "pipewire.service" ];
       wantedBy = [ "pipewire.service" ];
-      serviceConfig.ExecStart = "${cfg.package}/bin/wireplumber";
+      serviceConfig.ExecStart = "wireplumber";
     };
   };
 }
diff --git a/hosts/common/programs/wvkbd.nix b/hosts/common/programs/wvkbd.nix
index ea7ed582..2131c1e1 100644
--- a/hosts/common/programs/wvkbd.nix
+++ b/hosts/common/programs/wvkbd.nix
@@ -1,7 +1,4 @@
-{ config, lib, pkgs, ... }:
-let
-  cfg = config.sane.programs.wvkbd;
-in
+{ lib, pkgs, ... }:
 {
   sane.programs.wvkbd = {
     packageUnwrapped = pkgs.wvkbd.overrideAttrs (base: {
@@ -43,7 +40,7 @@ in
         # "WVKBD_LANDSCAPE_HEIGHT=??"  #< default: 120 (pixels)
         # more settings tunable inside config.h when compiling:
         # - KBD_KEY_BORDER = 2
-        "${cfg.package}/bin/wvkbd-mobintl"
+        "wvkbd-mobintl"
         "--hidden"
       ];
     };