From 3db603677509eb0b8c396a3234b1d4b70d023894 Mon Sep 17 00:00:00 2001
From: Bruno Inec <7051978+sweenu@users.noreply.github.com>
Date: Sun, 19 Dec 2021 06:21:15 +0100
Subject: [PATCH] waybar: allow using attrs for settings (#2547)

Co-authored-by: Bruno Inec <binec@scaleway.com>
---
 modules/programs/waybar.nix                   | 23 ++++--
 tests/modules/programs/waybar/default.nix     |  1 +
 .../waybar/settings-complex-expected.json     | 16 ++++
 .../programs/waybar/settings-complex.nix      | 79 +++++++++++--------
 .../programs/waybar/settings-with-attrs.nix   | 29 +++++++
 5 files changed, 105 insertions(+), 43 deletions(-)
 create mode 100644 tests/modules/programs/waybar/settings-with-attrs.nix

diff --git a/modules/programs/waybar.nix b/modules/programs/waybar.nix
index e7963e827..1d76b5658 100644
--- a/modules/programs/waybar.nix
+++ b/modules/programs/waybar.nix
@@ -156,7 +156,7 @@ in {
     };
 
     settings = mkOption {
-      type = listOf waybarBarConfig;
+      type = either (listOf waybarBarConfig) (attrsOf waybarBarConfig);
       default = [ ];
       description = ''
         Configuration for Waybar, see <link
@@ -164,8 +164,8 @@ in {
         for supported values.
       '';
       example = literalExpression ''
-        [
-          {
+        {
+          mainBar = {
             layer = "top";
             position = "top";
             height = 30;
@@ -190,8 +190,8 @@ in {
                 ''';
               };
             };
-          }
-        ]
+          };
+        }
       '';
     };
 
@@ -242,8 +242,15 @@ in {
         settingsModules =
           optionalAttrs (configuration.modules != { }) configuration.modules;
       in removeNulls (settingsWithoutModules // settingsModules);
+
+    # Allow using attrs for settings instead of a list in order to more easily override
+    settings = if builtins.isAttrs cfg.settings then
+      lib.attrValues cfg.settings
+    else
+      cfg.settings;
+
     # The clean list of configurations
-    finalConfiguration = map makeConfiguration cfg.settings;
+    finalConfiguration = map makeConfiguration settings;
 
     configSource = jsonFormat.generate "waybar-config.json" finalConfiguration;
 
@@ -255,7 +262,7 @@ in {
         ({
           assertion =
             if lib.versionAtLeast config.home.stateVersion "22.05" then
-              all (x: !hasAttr "modules" x) cfg.settings
+              all (x: !hasAttr "modules" x) settings
             else
               true;
           message = ''
@@ -267,7 +274,7 @@ in {
 
       home.packages = [ cfg.package ];
 
-      xdg.configFile."waybar/config" = mkIf (cfg.settings != [ ]) {
+      xdg.configFile."waybar/config" = mkIf (settings != [ ]) {
         source = configSource;
         onChange = ''
           ${pkgs.procps}/bin/pkill -u $USER -USR2 waybar || true
diff --git a/tests/modules/programs/waybar/default.nix b/tests/modules/programs/waybar/default.nix
index 07949fa80..bcff35bc4 100644
--- a/tests/modules/programs/waybar/default.nix
+++ b/tests/modules/programs/waybar/default.nix
@@ -3,5 +3,6 @@
     ./systemd-with-graphical-session-target.nix;
   waybar-styling = ./styling.nix;
   waybar-settings-complex = ./settings-complex.nix;
+  waybar-settings-with-attrs = ./settings-with-attrs.nix;
   waybar-deprecated-modules-option = ./deprecated-modules-option.nix;
 }
diff --git a/tests/modules/programs/waybar/settings-complex-expected.json b/tests/modules/programs/waybar/settings-complex-expected.json
index c5c21a6e4..87e4f690d 100644
--- a/tests/modules/programs/waybar/settings-complex-expected.json
+++ b/tests/modules/programs/waybar/settings-complex-expected.json
@@ -43,5 +43,21 @@
       "all-outputs": true,
       "disable-scroll": true
     }
+  },
+  {
+    "modules-center": [
+      "clock"
+    ],
+    "modules-left": [
+      "sway/mode"
+    ],
+    "modules-right": [],
+    "output": [
+      "!DP-1"
+    ],
+    "position": "bottom",
+    "sway/mode": {
+      "tooltip": true
+    }
   }
 ]
diff --git a/tests/modules/programs/waybar/settings-complex.nix b/tests/modules/programs/waybar/settings-complex.nix
index 1dd5ea207..2e205a7df 100644
--- a/tests/modules/programs/waybar/settings-complex.nix
+++ b/tests/modules/programs/waybar/settings-complex.nix
@@ -9,43 +9,52 @@ with lib;
     programs.waybar = {
       package = config.lib.test.mkStubPackage { outPath = "@waybar@"; };
       enable = true;
-      settings = [{
-        layer = "top";
-        position = "top";
-        height = 30;
-        output = [ "DP-1" ];
-        modules-left = [ "sway/workspaces" "sway/mode" "custom/my-module" ];
-        modules-center = [ "sway/window" ];
-        modules-right = [
-          "idle_inhibitor"
-          "pulseaudio"
-          "network"
-          "cpu"
-          "memory"
-          "backlight"
-          "tray"
-          "battery#bat1"
-          "battery#bat2"
-          "clock"
-        ];
+      settings = [
+        {
+          layer = "top";
+          position = "top";
+          height = 30;
+          output = [ "DP-1" ];
+          modules-left = [ "sway/workspaces" "sway/mode" "custom/my-module" ];
+          modules-center = [ "sway/window" ];
+          modules-right = [
+            "idle_inhibitor"
+            "pulseaudio"
+            "network"
+            "cpu"
+            "memory"
+            "backlight"
+            "tray"
+            "battery#bat1"
+            "battery#bat2"
+            "clock"
+          ];
 
-        modules = {
-          "sway/workspaces" = {
-            disable-scroll = true;
-            all-outputs = true;
+          modules = {
+            "sway/workspaces" = {
+              disable-scroll = true;
+              all-outputs = true;
+            };
+            "sway/mode" = { tooltip = false; };
+            "sway/window" = { max-length = 120; };
+            "idle_inhibitor" = { format = "{icon}"; };
+            "custom/my-module" = {
+              format = "hello from {}";
+              exec = let
+                dummyScript =
+                  config.lib.test.mkStubPackage { outPath = "@dummy@"; };
+              in "${dummyScript}/bin/dummy";
+            };
           };
-          "sway/mode" = { tooltip = false; };
-          "sway/window" = { max-length = 120; };
-          "idle_inhibitor" = { format = "{icon}"; };
-          "custom/my-module" = {
-            format = "hello from {}";
-            exec = let
-              dummyScript =
-                config.lib.test.mkStubPackage { outPath = "@dummy@"; };
-            in "${dummyScript}/bin/dummy";
-          };
-        };
-      }];
+        }
+        {
+          position = "bottom";
+          output = [ "!DP-1" ];
+          modules-left = [ "sway/mode" ];
+          modules-center = [ "clock" ];
+          modules = { "sway/mode" = { tooltip = true; }; };
+        }
+      ];
     };
 
     nmt.script = ''
diff --git a/tests/modules/programs/waybar/settings-with-attrs.nix b/tests/modules/programs/waybar/settings-with-attrs.nix
new file mode 100644
index 000000000..ac7e20fac
--- /dev/null
+++ b/tests/modules/programs/waybar/settings-with-attrs.nix
@@ -0,0 +1,29 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+{
+  config = {
+    home.stateVersion = "21.11";
+
+    programs.waybar = {
+      package = config.lib.test.mkStubPackage { outPath = "@waybar@"; };
+      enable = true;
+      settings = let
+        settingsComplex = (import ./settings-complex.nix {
+          inherit config lib pkgs;
+        }).config.programs.waybar.settings;
+      in {
+        mainBar = builtins.head settingsComplex;
+        secondaryBar = builtins.elemAt settingsComplex 1;
+      };
+    };
+
+    nmt.script = ''
+      assertPathNotExists home-files/.config/waybar/style.css
+      assertFileContent \
+        home-files/.config/waybar/config \
+        ${./settings-complex-expected.json}
+    '';
+  };
+}