From 0150050d6eed373b04fd85e08bd2ae7b5cc8d3b2 Mon Sep 17 00:00:00 2001
From: 1444 <54070204+0x5a4@users.noreply.github.com>
Date: Fri, 11 Jul 2025 13:00:32 +0200
Subject: [PATCH] wayfire: mixup between wayfire and wf-shell settings (#1670)

Fixes: aa5e3c03330b ("treewide: use mkTarget (batch 3) (#1371)")
Link: https://github.com/nix-community/stylix/pull/1670

Reviewed-by: NAHO <90870942+trueNAHO@users.noreply.github.com>
---
 modules/wayfire/hm.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/modules/wayfire/hm.nix b/modules/wayfire/hm.nix
index 34c75282..2d35ba6d 100644
--- a/modules/wayfire/hm.nix
+++ b/modules/wayfire/hm.nix
@@ -31,12 +31,15 @@ mkTarget {
         '';
       in
       {
-        wayland.windowManager.wayfire.wf-shell.settings = {
-          background.image = lib.mkIf cfg.useWallpaper (toString wayfireBackground);
+        wayland.windowManager.wayfire.settings = {
           cube = {
             cubemap_image = lib.mkIf cfg.useWallpaper (toString wayfireBackground);
             skydome_texture = lib.mkIf cfg.useWallpaper (toString wayfireBackground);
           };
+        };
+
+        wayland.windowManager.wayfire.wf-shell.settings = {
+          background.image = lib.mkIf cfg.useWallpaper (toString wayfireBackground);
           background.fill_mode =
             if imageScalingMode == "stretch" then
               "stretch"
@@ -44,7 +47,6 @@ mkTarget {
               "preserve_aspect"
             else
               "fill_and_crop";
-
         };
       }
     )