2 files changed, 12 insertions, 7 deletions
diff --git a/modules/communication/neomutt/default.nix b/modules/communication/neomutt/default.nix
index da64a13..6bc363b 100644
--- a/modules/communication/neomutt/default.nix
+++ b/modules/communication/neomutt/default.nix
@@ -42,16 +42,22 @@ let
   };
 
   neomuttLauncher = pkgs.writeShellApplication {
-    name = "neomutt";
+    name = "neomutt-launcher";
     runtimeInputs = [
       pkgs.systemd
       pkgs.procps
       pkgs.neomutt
       pkgs.urlscan
     ];
-    text = builtins.replaceStrings [ "@@PROFILE_BIN@@" ] [ "${config.home.profileDirectory}/bin" ] (
-      builtins.readFile ./neomutt-launcher.sh
-    );
+    text =
+      builtins.replaceStrings
+        [
+          "@@NEOMUTT_BIN@@"
+        ]
+        [
+          (lib.getExe pkgs.neomutt)
+        ]
+        (builtins.readFile ./neomutt-launcher.sh);
   };
 
   neomuttSyncCompletion =
@@ -113,7 +119,7 @@ in
             pkgs.neomutt
             neomuttSync
           ];
-          meta.mainProgram = "neomutt";
+          meta.mainProgram = "neomutt-launcher";
         };
         sidebar.enable = true;
         sort = "reverse-threads";
diff --git a/modules/communication/neomutt/neomutt-launcher.sh b/modules/communication/neomutt/neomutt-launcher.sh
index 3caa9df..62cbe09 100644
--- a/modules/communication/neomutt/neomutt-launcher.sh
+++ b/modules/communication/neomutt/neomutt-launcher.sh
@@ -9,5 +9,4 @@ stop_service() {
 }
 trap stop_service EXIT
 
-export PATH="@@PROFILE_BIN@@:$PATH"
-neomutt "$@"
+"@@NEOMUTT_BIN@@" "$@"