From 53935c590caa435d9004ccf1effcd1db633b58bb Mon Sep 17 00:00:00 2001
From: poz <poz@poz.pet>
Date: Thu, 27 Aug 2026 03:31:19 +0200
Subject: [PATCH] nixos/gtklock: ensure `main` config section doesn't get set
 if config is empty

---
 nixos/modules/programs/wayland/gtklock.nix | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/programs/wayland/gtklock.nix b/nixos/modules/programs/wayland/gtklock.nix
index debee91a7475..f0566bebe048 100644
--- a/nixos/modules/programs/wayland/gtklock.nix
+++ b/nixos/modules/programs/wayland/gtklock.nix
@@ -61,13 +61,15 @@ in
   };
 
   config = lib.mkIf cfg.enable {
-    programs.gtklock.config.main = {
-      style = lib.mkIf (cfg.style != null) "${pkgs.writeText "style.css" cfg.style}";
+    programs.gtklock.config.main = lib.mkMerge [
+      (lib.mkIf (cfg.style != null) {
+        style = "${pkgs.writeText "style.css" cfg.style}";
+      })
 
-      modules = lib.mkIf (cfg.modules != [ ]) (
-        map (pkg: "${pkg}/lib/gtklock/${lib.removePrefix "gtklock-" pkg.pname}.so") cfg.modules
-      );
-    };
+      (lib.mkIf (cfg.modules != [ ]) {
+        modules = map (pkg: "${pkg}/lib/gtklock/${lib.removePrefix "gtklock-" pkg.pname}.so") cfg.modules;
+      })
+    ];
 
     environment.etc."xdg/gtklock/config.ini" = lib.mkIf (cfg.config != { }) {
       source = configFormat.generate "config.ini" cfg.config;