i3-sway: fix indentation of bar blocks (#3978)

The `indent` function unindents the first and last line by default, so
the `"bar {"` `"}"` wrapper should go inside the list.

modules/services/window-managers/i3-sway/lib/functions.nix

@@ -72,31 +72,26 @@ rec {
     , workspaceNumbers, command, statusCommand, colors, trayOutput, trayPadding
     , extraConfig, ... }:
     let colorsNotNull = lib.filterAttrs (n: v: v != null) colors != { };
-    in ''
+    in concatMapStrings (x: x + "\n") (indent (lists.subtractLists [ "" null ]
-      bar {
-        ${
-          concatStringsSep "\n" (indent (lists.subtractLists [ "" null ]
       (flatten [
+        "bar {"
         (optionalString (id != null) "id ${id}")
         (fontConfigStr fonts)
         (optionalString (mode != null) "mode ${mode}")
-              (optionalString (hiddenState != null)
+        (optionalString (hiddenState != null) "hidden_state ${hiddenState}")
-                "hidden_state ${hiddenState}")
         (optionalString (position != null) "position ${position}")
         (optionalString (statusCommand != null)
           "status_command ${statusCommand}")
         "${moduleName}bar_command ${command}"
         (optionalString (workspaceButtons != null)
           "workspace_buttons ${lib.hm.booleans.yesNo workspaceButtons}")
-              (optionalString (workspaceNumbers != null)
+        (optionalString (workspaceNumbers != null) "strip_workspace_numbers ${
-                "strip_workspace_numbers ${
             lib.hm.booleans.yesNo (!workspaceNumbers)
           }")
         (optionalString (trayOutput != null) "tray_output ${trayOutput}")
         (optionalString (trayPadding != null)
           "tray_padding ${toString trayPadding}")
-              (optionals colorsNotNull (indent
+        (optionals colorsNotNull (indent (lists.subtractLists [ "" null ] [
-                (lists.subtractLists [ "" null ] [
           "colors {"
           (optionalString (colors.background != null)
             "background ${colors.background}")
@@ -111,15 +106,11 @@ rec {
           (optionalString (colors.focusedSeparator != null)
             "focused_separator ${colors.focusedSeparator}")
           (optionalString (colors.focusedWorkspace != null)
-                    "focused_workspace ${
+            "focused_workspace ${barColorSetStr colors.focusedWorkspace}")
-                      barColorSetStr colors.focusedWorkspace
-                    }")
           (optionalString (colors.activeWorkspace != null)
             "active_workspace ${barColorSetStr colors.activeWorkspace}")
           (optionalString (colors.inactiveWorkspace != null)
-                    "inactive_workspace ${
+            "inactive_workspace ${barColorSetStr colors.inactiveWorkspace}")
-                      barColorSetStr colors.inactiveWorkspace
-                    }")
           (optionalString (colors.urgentWorkspace != null)
             "urgent_workspace ${barColorSetStr colors.urgentWorkspace}")
           (optionalString (colors.bindingMode != null)
@@ -127,10 +118,8 @@ rec {
           "}"
         ]) { }))
         extraConfig
-            ])) { })
+        "}"
-        }
+      ])) { });
-      }
-    '';
 
   gapsStr = with cfg.config.gaps;
     concatStringsSep "\n" (lists.subtractLists [ "" null ] [

tests/modules/services/window-managers/i3/i3-bar-focused-colors-expected.conf

@@ -94,6 +94,6 @@ bar {
     inactive_workspace #333333 #222222 #888888
     urgent_workspace #2f343a #900000 #ffffff
     binding_mode #2f343a #900000 #ffffff
-}
+  }
 }
 

tests/modules/services/window-managers/i3/i3-followmouse-expected.conf

@@ -91,6 +91,6 @@ bar {
     inactive_workspace #333333 #222222 #888888
     urgent_workspace #2f343a #900000 #ffffff
     binding_mode #2f343a #900000 #ffffff
-}
+  }
 }
 

tests/modules/services/window-managers/i3/i3-fonts-expected.conf

@@ -91,6 +91,6 @@ bar {
     inactive_workspace #333333 #222222 #888888
     urgent_workspace #2f343a #900000 #ffffff
     binding_mode #2f343a #900000 #ffffff
-}
+  }
 }
 

tests/modules/services/window-managers/i3/i3-keybindings-expected.conf

@@ -92,6 +92,6 @@ bar {
     inactive_workspace #333333 #222222 #888888
     urgent_workspace #2f343a #900000 #ffffff
     binding_mode #2f343a #900000 #ffffff
-}
+  }
 }
 

tests/modules/services/window-managers/i3/i3-workspace-default-expected.conf

@@ -90,6 +90,6 @@ bar {
     inactive_workspace #333333 #222222 #888888
     urgent_workspace #2f343a #900000 #ffffff
     binding_mode #2f343a #900000 #ffffff
-}
+  }
 }
 

tests/modules/services/window-managers/i3/i3-workspace-output-expected.conf

@@ -91,7 +91,7 @@ bar {
     inactive_workspace #333333 #222222 #888888
     urgent_workspace #2f343a #900000 #ffffff
     binding_mode #2f343a #900000 #ffffff
-}
+  }
 }
 
 workspace "1" output eDP

tests/modules/services/window-managers/sway/sway-bar-focused-colors.conf

@@ -103,7 +103,7 @@ bar {
     inactive_workspace #333333 #222222 #888888
     urgent_workspace #2f343a #900000 #ffffff
     binding_mode #2f343a #900000 #ffffff
-}
+  }
 }
 
 exec "/nix/store/00000000000000000000000000000000-dbus/bin/dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP XDG_SESSION_TYPE NIXOS_OZONE_WL; systemctl --user start sway-session.target"

tests/modules/services/window-managers/sway/sway-bindkeys-to-code-and-extra-config.conf

@@ -102,7 +102,7 @@ bar {
     inactive_workspace #333333 #222222 #888888
     urgent_workspace #2f343a #900000 #ffffff
     binding_mode #2f343a #900000 #ffffff
-}
+  }
 }
 
 exec "/nix/store/00000000000000000000000000000000-dbus/bin/dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP XDG_SESSION_TYPE NIXOS_OZONE_WL; systemctl --user start sway-session.target"

tests/modules/services/window-managers/sway/sway-default.conf

@@ -100,7 +100,7 @@ bar {
     inactive_workspace #333333 #222222 #888888
     urgent_workspace #2f343a #900000 #ffffff
     binding_mode #2f343a #900000 #ffffff
-}
+  }
 }
 
 exec "/nix/store/00000000000000000000000000000000-dbus/bin/dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP XDG_SESSION_TYPE NIXOS_OZONE_WL; systemctl --user start sway-session.target"

tests/modules/services/window-managers/sway/sway-modules.conf

@@ -112,7 +112,7 @@ bar {
     inactive_workspace #333333 #222222 #888888
     urgent_workspace #2f343a #900000 #ffffff
     binding_mode #2f343a #900000 #ffffff
-}
+  }
 }
 
 exec "/nix/store/00000000000000000000000000000000-dbus/bin/dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP XDG_SESSION_TYPE NIXOS_OZONE_WL; systemctl --user start sway-session.target"

tests/modules/services/window-managers/sway/sway-null-package.conf

@@ -100,7 +100,7 @@ bar {
     inactive_workspace #333333 #222222 #888888
     urgent_workspace #2f343a #900000 #ffffff
     binding_mode #2f343a #900000 #ffffff
-}
+  }
 }
 
 exec "/nix/store/00000000000000000000000000000000-dbus/bin/dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP XDG_SESSION_TYPE NIXOS_OZONE_WL; systemctl --user start sway-session.target"

tests/modules/services/window-managers/sway/sway-workspace-default-expected.conf

@@ -99,7 +99,7 @@ bar {
     inactive_workspace #333333 #222222 #888888
     urgent_workspace #2f343a #900000 #ffffff
     binding_mode #2f343a #900000 #ffffff
-}
+  }
 }
 
 exec "/nix/store/00000000000000000000000000000000-dbus/bin/dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP XDG_SESSION_TYPE NIXOS_OZONE_WL; systemctl --user start sway-session.target"

tests/modules/services/window-managers/sway/sway-workspace-output-expected.conf

@@ -100,7 +100,7 @@ bar {
     inactive_workspace #333333 #222222 #888888
     urgent_workspace #2f343a #900000 #ffffff
     binding_mode #2f343a #900000 #ffffff
-}
+  }
 }
 
 workspace "1" output eDP