fix: icons for desktop items are working

4 files changed, 20 insertions, 28 deletions

diff --git a/modules/communication/neomutt/default.nix b/modules/communication/neomutt/default.nix
index 3354213..da64a13 100644
--- a/modules/communication/neomutt/default.nix
+++ b/modules/communication/neomutt/default.nix
@@ -41,24 +41,18 @@ let
     text = builtins.readFile ./neomutt-sync-daemon.sh;
   };
 
-  neomuttLauncher = pkgs.writeShellScriptBin "neomutt" (
-    builtins.replaceStrings
-      [
-        "@@SYSTEMCTL@@"
-        "@@PGREP@@"
-        "@@NEOMUTT@@"
-        "@@PROFILE_BIN@@"
-        "@@URLSCAN_BIN@@"
-      ]
-      [
-        (lib.getExe' pkgs.systemd "systemctl")
-        (lib.getExe' pkgs.procps "pgrep")
-        (lib.getExe pkgs.neomutt)
-        "${config.home.profileDirectory}/bin"
-        (lib.makeBinPath [ pkgs.urlscan ])
-      ]
-      (builtins.readFile ./neomutt-launcher.sh)
-  );
+  neomuttLauncher = pkgs.writeShellApplication {
+    name = "neomutt";
+    runtimeInputs = [
+      pkgs.systemd
+      pkgs.procps
+      pkgs.neomutt
+      pkgs.urlscan
+    ];
+    text = builtins.replaceStrings [ "@@PROFILE_BIN@@" ] [ "${config.home.profileDirectory}/bin" ] (
+      builtins.readFile ./neomutt-launcher.sh
+    );
+  };
 
   neomuttSyncCompletion =
     pkgs.runCommand "neomutt-sync-completion"
@@ -108,7 +102,7 @@ in
         builtins.replaceStrings [ "@@HTML_VIEWER@@" ] [ (lib.getExe config.web.chawan.package) ]
           (builtins.readFile ./mailcap);
       home.file.".local/share/icons/hicolor/scalable/apps/neomutt.svg".source =
-        config.lib.file.mkOutOfStoreSymlink "${config.programs.neomutt.package}/share/neomutt/logo/neomutt.svg";
+        "${config.programs.neomutt.package}/share/neomutt/logo/neomutt.svg";
 
       programs.neomutt = {
         enable = true;
@@ -116,6 +110,7 @@ in
           name = "neomutt-wrapped";
           paths = [
             neomuttLauncher
+            pkgs.neomutt
             neomuttSync
           ];
           meta.mainProgram = "neomutt";
diff --git a/modules/communication/neomutt/neomutt-launcher.sh b/modules/communication/neomutt/neomutt-launcher.sh
index d677680..3caa9df 100644
--- a/modules/communication/neomutt/neomutt-launcher.sh
+++ b/modules/communication/neomutt/neomutt-launcher.sh
@@ -2,15 +2,12 @@
 # Wrapped neomutt: keeps the neomutt-sync systemd daemon alive for the
 # lifetime of a neomutt session.
 set -uo pipefail
-SYSTEMCTL='@@SYSTEMCTL@@'
-PGREP='@@PGREP@@'
-NEOMUTT='@@NEOMUTT@@'
 
-"$SYSTEMCTL" --user start neomutt-sync.service || true
+systemctl --user start neomutt-sync.service || true
 stop_service() {
-  "$PGREP" -x neomutt >/dev/null || "$SYSTEMCTL" --user stop neomutt-sync.service || true
+  pgrep -x neomutt >/dev/null || systemctl --user stop neomutt-sync.service || true
 }
 trap stop_service EXIT
 
-export PATH="@@PROFILE_BIN@@:@@URLSCAN_BIN@@:$PATH"
-"$NEOMUTT" "$@"
+export PATH="@@PROFILE_BIN@@:$PATH"
+neomutt "$@"
diff --git a/modules/file-management/yazi/default.nix b/modules/file-management/yazi/default.nix
index 72a4568..b56c816 100644
--- a/modules/file-management/yazi/default.nix
+++ b/modules/file-management/yazi/default.nix
@@ -65,7 +65,7 @@ in
       };
 
       home.file.".local/share/icons/hicolor/scalable/apps/yazi.png" = {
-        source = config.lib.file.mkOutOfStoreSymlink "${cfg.package}/share/pixmaps/yazi.png";
+        source = "${cfg.package}/share/pixmaps/yazi.png";
       };
 
       home.sessionVariables = {
diff --git a/modules/gaming/heroic/default.nix b/modules/gaming/heroic/default.nix
index 61eceb5..cf4c03d 100644
--- a/modules/gaming/heroic/default.nix
+++ b/modules/gaming/heroic/default.nix
@@ -35,7 +35,7 @@ in
     home.packages = [ cfg.package ];
 
     home.file.".local/share/icons/hicolor/scalable/apps/com.heroicgameslauncher.hgl.svg".source =
-      config.lib.file.mkOutOfStoreSymlink "${pkgs.heroic}/share/icons/hicolor/scalable/apps/com.heroicgameslauncher.hgl.svg";
+      "${pkgs.heroic}/share/icons/hicolor/scalable/apps/com.heroicgameslauncher.hgl.svg";
 
     xdg.desktopEntries."heroic" = {
       name = "Heroic Games Launcher";