From 8d911ff893501d830b49f734b4ce3c0b8c627753 Mon Sep 17 00:00:00 2001
From: Tom Alexander <tom@fizz.buzz>
Date: Sun, 19 Jan 2025 10:35:31 -0500
Subject: [PATCH] Wrap tofi without forcing a rebuild.

---
 nix/configuration/configuration.nix       |  2 +-
 nix/configuration/roles/sway/rofimoji.nix | 18 ++++++------------
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/nix/configuration/configuration.nix b/nix/configuration/configuration.nix
index 10c4c57..044cb70 100644
--- a/nix/configuration/configuration.nix
+++ b/nix/configuration/configuration.nix
@@ -109,7 +109,7 @@
     randomizedDelaySec = "14m";
     options = "--delete-older-than 30d";
   };
-  # nix.settings.auto-optimise-store = true;
+  nix.settings.auto-optimise-store = !config.me.buildingIso;
 
   # Use doas instead of sudo
   security.doas.enable = true;
diff --git a/nix/configuration/roles/sway/rofimoji.nix b/nix/configuration/roles/sway/rofimoji.nix
index dd1c32e..52929b5 100644
--- a/nix/configuration/roles/sway/rofimoji.nix
+++ b/nix/configuration/roles/sway/rofimoji.nix
@@ -40,11 +40,6 @@ in
       (final: prev: {
         rofimoji = prev.rofimoji.overrideAttrs (old: {
           propagatedBuildInputs = old.propagatedBuildInputs ++ [ pkgs.tofi ];
-          # postInstall =
-          #   old.postInstall
-          #   + ''
-          #     wrapProgram $out/bin/rofimoji --prefix PATH : ${lib.makeBinPath [ pkgs.wofi ]}
-          #   '';
           src = builtins.fetchGit {
             # https://github.com/fdw/rofimoji/issues/209
             url = "https://github.com/fdw/rofimoji.git";
@@ -53,17 +48,16 @@ in
         });
       })
       (final: prev: {
-        tofi = prev.tofi.overrideAttrs (old: {
-          nativeBuildInputs = old.nativeBuildInputs or [ ] ++ [ pkgs.makeWrapper ];
-          postInstall =
-            old.postInstall or ""
-            + ''
+        tofi = pkgs.symlinkJoin {
+            name = "tofi";
+            paths = [ prev.tofi ];
+            buildInputs = [ pkgs.makeWrapper ];
+            postBuild = ''
               wrapProgram $out/bin/tofi-drun --add-flags --font=${pkgs.source-sans-pro}/share/fonts/opentype/SourceSansPro-Regular.otf --add-flags --config=${./files/tofi-config}
               wrapProgram $out/bin/tofi --add-flags --config=${./files/tofi-config}
             '';
-        });
+          };
       })
-
     ];
   };
 }