From f32b1c0875ee573ecf5967a76e125317e1f202a2 Mon Sep 17 00:00:00 2001
From: 1444 <54070204+0x5a4@users.noreply.github.com>
Date: Thu, 3 Apr 2025 19:36:11 +0200
Subject: [PATCH] wayfire: fix broken wallpaper option (#1087)

---
 modules/wayfire/hm.nix | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/modules/wayfire/hm.nix b/modules/wayfire/hm.nix
index 19559172..1cc6d9ba 100644
--- a/modules/wayfire/hm.nix
+++ b/modules/wayfire/hm.nix
@@ -22,18 +22,16 @@ in
 
       wayfireConfig = config.wayland.windowManager.wayfire;
 
-      wayfireBackground = lib.mkIf cfg.useWallpaper (
-        pkgs.runCommand "wayfire-background.png" { } ''
-          ${lib.getExe' pkgs.imagemagick "convert"} ${config.stylix.image} $out
-        ''
-      );
+      wayfireBackground = pkgs.runCommand "wayfire-background.png" { } ''
+        ${lib.getExe' pkgs.imagemagick "convert"} ${config.stylix.image} $out
+      '';
     in
     {
       wayland.windowManager.wayfire.settings = lib.mkIf wayfireConfig.enable {
         cube = {
           background = rgb colors.base00;
-          cubemap_image = lib.mkIf cfg.useWallpaper "${wayfireBackground}";
-          skydome_texture = lib.mkIf cfg.useWallpaper "${wayfireBackground}";
+          cubemap_image = lib.mkIf cfg.useWallpaper (toString wayfireBackground);
+          skydome_texture = lib.mkIf cfg.useWallpaper (toString wayfireBackground);
         };
 
         expo.background = rgb colors.base00;
@@ -42,7 +40,7 @@ in
         core.background_color = rgb colors.base00;
 
         decoration = {
-          font = "${config.stylix.fonts.monospace.name} ${builtins.toString config.stylix.fonts.sizes.desktop}";
+          font = "${config.stylix.fonts.monospace.name} ${toString config.stylix.fonts.sizes.desktop}";
           active_color = rgb colors.base0D;
           inactive_color = rgb colors.base03;
         };
@@ -51,7 +49,7 @@ in
       wayland.windowManager.wayfire.wf-shell.settings =
         lib.mkIf wayfireConfig.wf-shell.enable
           {
-            background.image = lib.mkIf cfg.useWallpaper "${wayfireBackground}";
+            background.image = lib.mkIf cfg.useWallpaper (toString wayfireBackground);
             background.fill_mode =
               if config.stylix.imageScalingMode == "stretch" then
                 "stretch"