bspwm: re-add support for lists as config option values (#2125)

Removed by mistake in e70524c, but ignore_ewmh_fullscreen still needs it.

modules/services/window-managers/bspwm/default.nix

@@ -10,39 +10,29 @@ let
     builtins.replaceStrings upperChars (map (c: "_${c}") lowerChars);
 
   formatMonitor = monitor: desktops:
-    "bspc monitor ${strings.escapeShellArg monitor} -d ${
+    "bspc monitor ${escapeShellArg monitor} -d ${escapeShellArgs desktops}";
-      strings.escapeShellArgs desktops
-    }";
 
-  formatSetting = n: v:
+  formatValue = v:
-    let
+    if isList v then
-      vStr = if isBool v then
+      concatMapStringsSep "," formatValue v
-        boolToString v
+    else if isBool v then
-      else if isInt v || isFloat v then
-        toString v
-      else if isString v then
-        strings.escapeShellArg v
-      else
-        throw "unsupported setting type for ${n}";
-    in "bspc config ${strings.escapeShellArg n} ${vStr}";
-
-  formatRule = target: directives:
-    let
-      formatDirective = n: v:
-        let
-          vStr = if isBool v then
       if v then "on" else "off"
     else if isInt v || isFloat v then
       toString v
     else if isString v then
       v
     else
-            throw "unsupported rule attribute type for ${n}";
+      throw "unsupported type"; # should not happen
-        in "${camelToSnake n}=${vStr}";
 
-      directivesStr = strings.escapeShellArgs (mapAttrsToList formatDirective
+  formatSetting = n: v: "bspc config ${escapeShellArgs [ n (formatValue v) ]}";
+
+  formatRule = target: directives:
+    let
+      formatDirective = n: v: "${camelToSnake n}=${formatValue v}";
+
+      directivesStr = escapeShellArgs (mapAttrsToList formatDirective
         (filterAttrs (n: v: v != null) directives));
-    in "bspc rule -a ${strings.escapeShellArg target} ${directivesStr}";
+    in "bspc rule -a ${escapeShellArg target} ${directivesStr}";
 
   formatStartupProgram = s: "${s} &";
 

modules/services/window-managers/bspwm/options.nix

@@ -157,7 +157,7 @@ in {
     settings = mkOption {
       type = with types;
         let primitive = either bool (either int (either float str));
-        in attrsOf primitive;
+        in attrsOf (either primitive (listOf primitive));
       default = { };
       description = "General settings given to <literal>bspc config</literal>.";
       example = {

tests/modules/services/window-managers/bspwm/bspwmrc

@@ -1,9 +1,10 @@
 bspc monitor 'focused' -d 'desktop 1' 'd'\''esk top'
 
-bspc config 'border_width' 2
+bspc config 'border_width' '2'
 bspc config 'external_rules_command' '/path/to/external rules command'
-bspc config 'gapless_monocle' true
+bspc config 'gapless_monocle' 'on'
-bspc config 'split_ratio' 0.520000
+bspc config 'ignore_ewmh_fullscreen' 'enter,exit'
+bspc config 'split_ratio' '0.520000'
 
 bspc rule -r '*'
 bspc rule -a '*' 'center=off' 'desktop=d'\''esk top#next' 'split_dir=north' 'sticky=on'

tests/modules/services/window-managers/bspwm/configuration.nix

@@ -13,6 +13,7 @@ with lib;
         split_ratio = 0.52;
         gapless_monocle = true;
         external_rules_command = "/path/to/external rules command";
+        ignore_ewmh_fullscreen = [ "enter" "exit" ];
       };
       rules."*" = {
         sticky = true;