2 files changed, 18 insertions, 25 deletions
diff --git a/modules/communication/neomutt/default.nix b/modules/communication/neomutt/default.nix
index 4bd1800..1512465 100644
--- a/modules/communication/neomutt/default.nix
+++ b/modules/communication/neomutt/default.nix
@@ -2,7 +2,6 @@
 {
   config,
   lib,
-  pkgs,
   ...
 }:
 {
@@ -20,28 +19,8 @@
 
     package = lib.mkOption {
       type = lib.types.package;
-      default = pkgs.symlinkJoin {
-        name = "neomutt-wrapped";
-        paths = [ pkgs.neomutt ];
-        nativeBuildInputs = [ pkgs.makeWrapper ];
-        postBuild = ''
-          wrapProgram $out/bin/neomutt \
-            --prefix PATH : ${lib.makeBinPath [ pkgs.urlscan ]}
-        '';
-        meta.mainProgram = "neomutt";
-      };
-      defaultText = lib.literalExpression ''
-        pkgs.symlinkJoin {
-          name = "neomutt-wrapped";
-          paths = [ pkgs.neomutt ];
-          nativeBuildInputs = [ pkgs.makeWrapper ];
-          postBuild = '''
-            wrapProgram $out/bin/neomutt \
-              --prefix PATH : ''${lib.makeBinPath [ pkgs.urlscan ]}
-          ''';
-          meta.mainProgram = "neomutt";
-        }
-      '';
+      readOnly = true;
+      default = config.programs.neomutt.package;
       description = "The neomutt package to use, wrapped with urlscan in PATH.";
     };
   };
diff --git a/modules/communication/neomutt/neomutt.nix b/modules/communication/neomutt/neomutt.nix
index 7dab1e9..997c948 100644
--- a/modules/communication/neomutt/neomutt.nix
+++ b/modules/communication/neomutt/neomutt.nix
@@ -1,5 +1,10 @@
 # neomutt - Terminal email client
-{ config, lib, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
 {
   config = lib.mkIf config.communication.neomutt.enable {
     xdg.desktopEntries."neomutt" = {
@@ -27,7 +32,16 @@
     '';
     programs.neomutt = {
       enable = true;
-      package = config.communication.neomutt.package;
+      package = pkgs.symlinkJoin {
+        name = "neomutt-wrapped";
+        paths = [ pkgs.neomutt ];
+        nativeBuildInputs = [ pkgs.makeWrapper ];
+        postBuild = ''
+          wrapProgram $out/bin/neomutt \
+            --prefix PATH : ${lib.makeBinPath [ pkgs.urlscan ]}
+        '';
+        meta.mainProgram = "neomutt";
+      };
       sidebar.enable = true;
       sort = "reverse-threads";
       vimKeys = true;