modules: optional image

danth · Jan 1, 2025 · 63b1088 · 63b1088
1 parent f48cab3
commit 63b1088
Show file tree

Hide file tree

Showing 11 changed files with 15 additions and 10 deletions.
diff --git a/modules/feh/hm.nix b/modules/feh/hm.nix
@@ -10,6 +10,7 @@
     lib.mkIf (
       config.stylix.enable
       && config.stylix.targets.feh.enable
+      && config.stylix.image != null
       && (
         with config.xsession.windowManager;
         bspwm.enable

diff --git a/modules/feh/nixos.nix b/modules/feh/nixos.nix
@@ -10,6 +10,7 @@
     lib.mkIf (
       config.stylix.enable
       && config.stylix.targets.feh.enable
+      && config.stylix.image != null
       && (
         with config.services.xserver.windowManager;
         xmonad.enable

diff --git a/modules/gnome/hm.nix b/modules/gnome/hm.nix
@@ -26,8 +26,8 @@ in {
           then "centered"
           # Seemingly no tile support... :(
           else "zoom";
-        picture-uri = "file://${config.stylix.image}";
-        picture-uri-dark = "file://${config.stylix.image}";
+        picture-uri = lib.mkIf config.stylix.image != null "file://${config.stylix.image}";
+        picture-uri-dark = lib.mkIf config.stylix.image != null "file://${config.stylix.image}";
       };
 
       "org/gnome/desktop/interface" = {

diff --git a/modules/grub/nixos.nix b/modules/grub/nixos.nix
@@ -107,7 +107,7 @@ in {
       mkdir $out
       cp $themeTxtPath $out/theme.txt
 
-      ${if config.stylix.targets.grub.useImage
+      ${if config.stylix.targets.grub.useImage && config.stylix.image != null
       # Make sure the background image is .png by asking to convert it
       then
         "${pkgs.imagemagick}/bin/convert ${config.stylix.image} png32:$out/background.png"

diff --git a/modules/hyprlock/hm.nix b/modules/hyprlock/hm.nix
@@ -6,7 +6,10 @@ with config.lib.stylix;
 
   config = lib.mkIf (config.stylix.enable && config.stylix.targets.hyprlock.enable) {
     programs.hyprlock.settings = {
-      background.path = "${config.stylix.image}";
+      background = {
+        path = lib.mkIf config.stylix.image != null config.stylix.image;
+        color = "rgb(${base00})";
+      };
       input-field = with colors; {
         outer_color = "rgb(${base03})";
         inner_color = "rgb(${base00})";

diff --git a/modules/hyprpaper/hm.nix b/modules/hyprpaper/hm.nix
@@ -4,7 +4,7 @@
 
   config =
     lib.mkIf
-    (config.stylix.enable && config.stylix.targets.hyprpaper.enable)
+    (config.stylix.enable && config.stylix.targets.hyprpaper.enable && config.stylix.image != null)
     {
       services.hyprpaper.settings = {
         preload = [ "${config.stylix.image}" ];

diff --git a/modules/lightdm/nixos.nix b/modules/lightdm/nixos.nix
@@ -5,5 +5,5 @@
     config.lib.stylix.mkEnableTarget "LightDM" true;
 
   config.services.xserver.displayManager.lightdm.background =
-    lib.mkIf (config.stylix.enable && config.stylix.targets.lightdm.enable) config.stylix.image;
+    lib.mkIf (config.stylix.enable && config.stylix.targets.lightdm.enable && config.stylix.image != null) config.stylix.image;
 }
diff --git a/modules/regreet/nixos.nix b/modules/regreet/nixos.nix
@@ -13,7 +13,7 @@
       (config.stylix.enable && config.stylix.targets.regreet.enable && pkgs.stdenv.hostPlatform.isLinux)
       {
         programs.regreet = {
-          settings.background = {
+          settings.background = lib.mkIf config.stylix.image != null {
             path = config.stylix.image;
             fit = let
               inherit (config.stylix) imageScalingMode;

diff --git a/modules/sway/hm.nix b/modules/sway/hm.nix
@@ -54,7 +54,7 @@ in {
           };
         };
 
-        output."*".bg = "${config.stylix.image} ${config.stylix.imageScalingMode}";
+        output."*".bg = lib.mkIf config.stylix.image != null "${config.stylix.image} ${config.stylix.imageScalingMode}";
         seat."*".xcursor_theme = ''"${config.stylix.cursor.name}" ${toString config.stylix.cursor.size}'';
       };
     })

diff --git a/modules/swaylock/hm.nix b/modules/swaylock/hm.nix
@@ -48,7 +48,7 @@ in {
       text-caps-lock-color = text;
       text-ver-color = text;
       text-wrong-color = text;
-    } // lib.optionalAttrs config.stylix.targets.swaylock.useImage {
+    } // lib.optionalAttrs config.stylix.targets.swaylock.useImage && config.stylix.image != null {
       image = "${config.stylix.image}";
     };
   };

diff --git a/modules/wpaperd/hm.nix b/modules/wpaperd/hm.nix
@@ -3,7 +3,7 @@
 {
   options.stylix.targets.wpaperd.enable = config.lib.stylix.mkEnableTarget "wpaperd" true;
 
-  config = lib.mkIf (config.stylix.enable && config.stylix.targets.wpaperd.enable) {
+  config = lib.mkIf (config.stylix.enable && config.stylix.targets.wpaperd.enable && config.stylix.image != null ) {
     programs.wpaperd.settings.any = {
       path = "${config.stylix.image}";
       mode = let
-Original file line number
+Diff line change
@@ Expand Up / @@ -54,7 +54,7 @@ in { @@
               };
             };
-            output."*".bg = "${config.stylix.image} ${config.stylix.imageScalingMode}";
+            output."*".bg = lib.mkIf config.stylix.image != null "${config.stylix.image} ${config.stylix.imageScalingMode}";
             seat."*".xcursor_theme = ''"${config.stylix.cursor.name}" ${toString config.stylix.cursor.size}'';
           };
         })
@@ Expand Down @@