From a090dbe73ebace880bf55177d0dbbb3d47ce7681 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?m=C3=BCde?= <git@darkest.space>
Date: Fri, 11 Sep 2026 23:04:00 +0200
Subject: [PATCH] use getExe everywhere

---
 homeConfigurations/muede/claude.nix   | 2 +-
 homeConfigurations/muede/default.nix  | 2 +-
 homeConfigurations/muede/niri.nix     | 6 +++---
 homeConfigurations/muede/swayidle.nix | 6 +++---
 homeConfigurations/ronja/default.nix  | 4 ++--
 nixosModules/constellation-swarm.nix  | 2 +-
 nixosModules/openssh.nix              | 2 +-
 7 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/homeConfigurations/muede/claude.nix b/homeConfigurations/muede/claude.nix
index 2185c77..6e6cd09 100644
--- a/homeConfigurations/muede/claude.nix
+++ b/homeConfigurations/muede/claude.nix
@@ -76,7 +76,7 @@ let
     hdr=${lib.escapeShellArg headerFile}
     if [ -r "$hdr" ]; then
     ${exports}  export OTEL_EXPORTER_OTLP_HEADERS="$(cat "$hdr")"
-      export OTEL_RESOURCE_ATTRIBUTES=${lib.escapeShellArg resourceAttributes}",host.name=$(${pkgs.coreutils}/bin/uname -n)"
+      export OTEL_RESOURCE_ATTRIBUTES=${lib.escapeShellArg resourceAttributes}",host.name=$(${lib.getExe' pkgs.coreutils "uname"} -n)"
     fi
 
     exec ${claude-code}/bin/claude "$@"
diff --git a/homeConfigurations/muede/default.nix b/homeConfigurations/muede/default.nix
index 300d39e..07c120b 100644
--- a/homeConfigurations/muede/default.nix
+++ b/homeConfigurations/muede/default.nix
@@ -99,7 +99,7 @@
     ];
 
     home.file = {
-      "idea.properties".text = "idea.filewatcher.executable.path = ${pkgs.fsnotifier}/bin/fsnotifier";
+      "idea.properties".text = "idea.filewatcher.executable.path = ${pkgs.lib.getExe pkgs.fsnotifier}";
     };
 
     services.poweralertd.enable = true;
diff --git a/homeConfigurations/muede/niri.nix b/homeConfigurations/muede/niri.nix
index a1385c8..ffbc45c 100644
--- a/homeConfigurations/muede/niri.nix
+++ b/homeConfigurations/muede/niri.nix
@@ -180,8 +180,8 @@
           "Mod+Shift+Numbersign".action.show-hotkey-overlay = { };
 
           # Suggested binds for running programs: terminal, app launcher, screen locker.
-          "Mod+T".action.spawn = "${lib.getBin pkgs.gnome-console}/bin/kgx";
-          "Mod+D".action.spawn = "${lib.getBin config.programs.fuzzel.package}/bin/fuzzel";
+          "Mod+T".action.spawn = lib.getExe pkgs.gnome-console;
+          "Mod+D".action.spawn = lib.getExe config.programs.fuzzel.package;
 
           # You can also use a shell. Do this if you need pipes, multiple commands, etc.
           # Note: the entire command goes as a single argument in the end.
@@ -430,7 +430,7 @@
           "Mod+O".action.toggle-overview = { };
 
           "Super+Alt+L" = {
-            action.spawn = "${pkgs.systemd}/bin/loginctl lock-session";
+            action.spawn = "${lib.getExe' pkgs.systemd "loginctl"} lock-session";
             allow-when-locked = true;
           };
         };
diff --git a/homeConfigurations/muede/swayidle.nix b/homeConfigurations/muede/swayidle.nix
index 166c471..7a7fdfb 100644
--- a/homeConfigurations/muede/swayidle.nix
+++ b/homeConfigurations/muede/swayidle.nix
@@ -2,7 +2,7 @@
 {
   services.swayidle =
     let
-      lock-command = "${pkgs.systemd}/bin/loginctl lock-session";
+      lock-command = "${pkgs.lib.getExe' pkgs.systemd "loginctl"} lock-session";
     in
     {
       enable = true;
@@ -14,11 +14,11 @@
         }
         {
           timeout = 60 * 10;
-          command = "${pkgs.systemd}/bin/systemctl suspend";
+          command = "${pkgs.lib.getExe' pkgs.systemd "systemctl"} suspend";
         }
       ];
       events = {
-        before-sleep = "${pkgs.playerctl}/bin/playerctl pause; ${lock-command}";
+        before-sleep = "${pkgs.lib.getExe pkgs.playerctl} pause; ${lock-command}";
       };
     };
 }
diff --git a/homeConfigurations/ronja/default.nix b/homeConfigurations/ronja/default.nix
index 8ef3e07..315d940 100644
--- a/homeConfigurations/ronja/default.nix
+++ b/homeConfigurations/ronja/default.nix
@@ -36,8 +36,8 @@
           ];
         };
         shellAliases = {
-          myos-update = ''echo "Enter sudo password" && sudo nixos-rebuild boot --flake git+https://forge.darkest.space/mara/nixos-configs.git --show-trace --log-format internal-json -v |& ${pkgs.nix-output-monitor}/bin/nom --json'';
-          myos-apply = ''echo "Enter sudo password" && sudo nixos-rebuild switch --flake .# --show-trace --log-format internal-json -v |& ${pkgs.nix-output-monitor}/bin/nom --json'';
+          myos-update = ''echo "Enter sudo password" && sudo nixos-rebuild boot --flake git+https://forge.darkest.space/mara/nixos-configs.git --show-trace --log-format internal-json -v |& ${pkgs.lib.getExe pkgs.nix-output-monitor} --json'';
+          myos-apply = ''echo "Enter sudo password" && sudo nixos-rebuild switch --flake .# --show-trace --log-format internal-json -v |& ${pkgs.lib.getExe pkgs.nix-output-monitor} --json'';
         };
       };
 
diff --git a/nixosModules/constellation-swarm.nix b/nixosModules/constellation-swarm.nix
index 4a1b453..1d9ad78 100644
--- a/nixosModules/constellation-swarm.nix
+++ b/nixosModules/constellation-swarm.nix
@@ -91,7 +91,7 @@ in
         set -eu
         umask 077
         for user in ${lib.escapeShellArgs adminUsers}; do
-          ${pkgs.coreutils}/bin/install -m0400 -o "$user" -g root \
+          ${lib.getExe' pkgs.coreutils "install"} -m0400 -o "$user" -g root \
             ${lib.escapeShellArg otelCredential} "$RUNTIME_DIRECTORY/$user"
         done
       '';
diff --git a/nixosModules/openssh.nix b/nixosModules/openssh.nix
index 92eb5f6..b1ef877 100644
--- a/nixosModules/openssh.nix
+++ b/nixosModules/openssh.nix
@@ -30,7 +30,7 @@
           PIDFILE="/run/ssh-inhibitor-''${PPID}.pid"
           case "''${PAM_TYPE:-}" in
             open_session)
-              ${pkgs.systemd}/bin/systemd-inhibit \
+              ${lib.getExe' pkgs.systemd "systemd-inhibit"} \
                 --what=sleep \
                 --who=sshd \
                 --why="SSH session active" \