Add wallpaperFillMode support for wallpaper option

nix-community · Aug 29, 2024 · 0f0ca7f · 0f0ca7f
1 parent 5c97fe8
commit 0f0ca7f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/modules/panels.nix b/modules/panels.nix
@@ -204,7 +204,7 @@ in
             // Wallpaper to set later: ${cfg.workspace.wallpaper}
           '' else "");
           wallpaperPostCMD = (if (cfg.workspace.wallpaper != null) then ''
-            plasma-apply-wallpaperimage ${cfg.workspace.wallpaper}
+            plasma-apply-wallpaperimage ${cfg.workspace.wallpaper} ${lib.optionalString (cfg.workspace.wallpaperFillMode != null) "--fill-mode ${cfg.workspace.wallpaperFillMode}"}
           '' else "");
           wallpaperSlideShow = (if (cfg.workspace.wallpaperSlideShow != null) then ''
             // Wallpaper slideshow
@@ -217,7 +217,7 @@ in
                   "\"" + (builtins.toString path) + "\"" else
                   "[" + (builtins.concatStringsSep "," (map (s: "\"" + s + "\"") path)) + "]"});
                 desktop.writeConfig("SlideInterval", "${builtins.toString cfg.workspace.wallpaperSlideShow.interval}");
-                ${lib.optionalString (cfg.workspace.wallpaperFillMode != null) ''desktop.writeConfig("FillMode", "${cfg.workspace.wallpaperFillMode}");''}
+                ${lib.optionalString (cfg.workspace.wallpaperFillMode != null) ''desktop.writeConfig("FillMode", "${toString wallpaperFillModeTypes.${cfg.workspace.wallpaperFillMode}}");''}
             }
           '' else "");
           wallpaperPOTD = (if (cfg.workspace.wallpaperPictureOfTheDay != null) then ''
@@ -228,7 +228,7 @@ in
                 desktop.currentConfigGroup = ["Wallpaper", "org.kde.potd", "General"];
                 desktop.writeConfig("Provider", "${cfg.workspace.wallpaperPictureOfTheDay.provider}");
                 desktop.writeConfig("UpdateOverMeteredConnection", "${if (cfg.workspace.wallpaperPictureOfTheDay.updateOverMeteredConnection) then "1" else "0"}");
-                ${lib.optionalString (cfg.workspace.wallpaperFillMode != null) ''desktop.writeConfig("FillMode", "${cfg.workspace.wallpaperFillMode}");''}
+                ${lib.optionalString (cfg.workspace.wallpaperFillMode != null) ''desktop.writeConfig("FillMode", "${toString wallpaperFillModeTypes.${cfg.workspace.wallpaperFillMode}}");''}
               }
           '' else "");
           wallpaperPlainColor = (if (cfg.workspace.wallpaperPlainColor != null) then ''

diff --git a/modules/workspace.nix b/modules/workspace.nix
@@ -141,9 +141,8 @@ in
       example = "stretch";
       description = ''
         Defines how the wallpaper should be displayed on the screen.
-        Applies only to wallpaperPictureOfTheDay or wallpaperSlideShow.
+        Applies only to wallpaper, wallpaperPictureOfTheDay or wallpaperSlideShow.
       '';
-      apply = value: if value == null then null else (builtins.toString wallpaperFillModeTypes.${value});
     };
 
     soundTheme = lib.mkOption {