From f34b93e0b52eb71d95e0252d269ce34b7d98c6c3 Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Thu, 5 Dec 2024 11:12:38 -0300 Subject: [PATCH] Revert "fix?" This reverts commit b525135c1e69533f8bfcf38142de5eac8a01bb0c. --- modules/workspace.nix | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/modules/workspace.nix b/modules/workspace.nix index faaf4fad..e28e69b5 100644 --- a/modules/workspace.nix +++ b/modules/workspace.nix @@ -464,9 +464,12 @@ in lib.optionalString (cfg.workspace.wallpaperBackground != null || cfg.workspace.wallpaperBackground != { }) ''desktop.writeConfig("${ - if cfg.workspace.wallpaperBackground.blur != null then "Blur" else "Color" + if cfg.workspace.wallpaperBackground ? blur && cfg.workspace.wallpaperBackground.blur != null then + "Blur" + else + "Color" }", "${ - if cfg.workspace.wallpaperBackground.blur != null then + if cfg.workspace.wallpaperBackground ? blur && cfg.workspace.wallpaperBackground.blur != null then lib.boolToString cfg.workspace.wallpaperBackground.blur else cfg.workspace.wallpaperBackground.color @@ -500,9 +503,12 @@ in lib.optionalString (cfg.workspace.wallpaperBackground != null || cfg.workspace.wallpaperBackground != { }) ''desktop.writeConfig("${ - if cfg.workspace.wallpaperBackground.blur != null then "Blur" else "Color" + if cfg.workspace.wallpaperBackground ? blur && cfg.workspace.wallpaperBackground.blur != null then + "Blur" + else + "Color" }", "${ - if cfg.workspace.wallpaperBackground.blur != null then + if cfg.workspace.wallpaperBackground ? blur && cfg.workspace.wallpaperBackground.blur != null then lib.boolToString cfg.workspace.wallpaperBackground.blur else cfg.workspace.wallpaperBackground.color @@ -557,9 +563,12 @@ in lib.optionalString (cfg.workspace.wallpaperBackground != null || cfg.workspace.wallpaperBackground != { }) ''desktop.writeConfig("${ - if cfg.workspace.wallpaperBackground.blur != null then "Blur" else "Color" + if cfg.workspace.wallpaperBackground ? blur && cfg.workspace.wallpaperBackground.blur != null then + "Blur" + else + "Color" }", "${ - if cfg.workspace.wallpaperBackground.blur != null then + if cfg.workspace.wallpaperBackground ? blur && cfg.workspace.wallpaperBackground.blur != null then lib.boolToString cfg.workspace.wallpaperBackground.blur else cfg.workspace.wallpaperBackground.color