Merge 67d4b476ba into 94605dcade

modules/lib/generators.nix

@@ -1,6 +1,37 @@
 { lib }:
 
 {
+  toSwayConf = { outerBlock ? true, indent ? "", indentSpace ? "  " }@args:
+    v:
+    let
+      outroSpace = "\n" + lib.strings.removeSuffix indentSpace indent;
+      outro = outroSpace + lib.optionalString (!outerBlock) "}";
+      intro = lib.optionalString (!outerBlock) ''
+        {
+      '' + indent;
+
+      innerArgs = args // {
+        outerBlock = false;
+        indent = indent + indentSpace;
+      };
+      genInner = key: value:
+        builtins.toString key + indentSpace
+        + lib.hm.generators.toSwayConf innerArgs value;
+      concatItems = lib.concatStringsSep ''
+
+        ${indent}'';
+    in if lib.isInt v || lib.isFloat v || lib.isString v then
+      (builtins.toString v)
+    else if lib.isList v then
+      intro + concatItems v + outro
+    else if lib.isAttrs v then
+      (if v == { } then
+        abort "toSwayConfig: empty attribute set is unsupported"
+      else
+        intro + concatItems (lib.mapAttrsToList genInner v) + outro)
+    else
+      (abort "toSwayConfig: type ${builtins.typeOf v} is unsupported");
+
   toHyprconf = { attrs, indentLevel ? 0, importantPrefixes ? [ "$" ], }:
     let
       inherit (lib)

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

@@ -271,63 +271,73 @@ let
       ${pkgs.xvfb-run}/bin/xvfb-run ${cfg.package}/bin/sway --config "$target" --validate --unsupported-gpu
     '';
 
-    text = concatStringsSep "\n"
-      ((optional (cfg.extraConfigEarly != "") cfg.extraConfigEarly)
-        ++ (if cfg.config != null then
-          with cfg.config;
-          ([
-            (fontConfigStr fonts)
-            "floating_modifier ${floating.modifier}"
-            (windowBorderString window floating)
-            "hide_edge_borders ${window.hideEdgeBorders}"
-            "focus_wrapping ${focus.wrapping}"
-            "focus_follows_mouse ${focus.followMouse}"
-            "focus_on_window_activation ${focus.newWindow}"
-            "mouse_warping ${
-              if builtins.isString (focus.mouseWarping) then
-                focus.mouseWarping
-              else if focus.mouseWarping then
-                "output"
-              else
-                "none"
-            }"
-            "workspace_layout ${workspaceLayout}"
-            "workspace_auto_back_and_forth ${
-              lib.hm.booleans.yesNo workspaceAutoBackAndForth
-            }"
-            "client.focused ${colorSetStr colors.focused}"
-            "client.focused_inactive ${colorSetStr colors.focusedInactive}"
-            "client.unfocused ${colorSetStr colors.unfocused}"
-            "client.urgent ${colorSetStr colors.urgent}"
-            "client.placeholder ${colorSetStr colors.placeholder}"
-            "client.background ${colors.background}"
-            (keybindingsStr {
-              keybindings = keybindingDefaultWorkspace;
-              bindsymArgs =
-                lib.optionalString (cfg.config.bindkeysToCode) "--to-code";
-            })
-            (keybindingsStr {
-              keybindings = keybindingsRest;
-              bindsymArgs =
-                lib.optionalString (cfg.config.bindkeysToCode) "--to-code";
-            })
-            (keycodebindingsStr keycodebindings)
-          ] ++ mapAttrsToList inputStr input
-            ++ mapAttrsToList outputStr output # outputs
-            ++ mapAttrsToList seatStr seat # seats
-            ++ mapAttrsToList (modeStr cfg.config.bindkeysToCode) modes # modes
-            ++ mapAttrsToList assignStr assigns # assigns
-            ++ map barStr bars # bars
-            ++ optional (gaps != null) gapsStr # gaps
-            ++ map floatingCriteriaStr floating.criteria # floating
-            ++ map windowCommandsStr window.commands # window commands
-            ++ map startupEntryStr startup # startup
-            ++ map workspaceOutputStr workspaceOutputAssign # custom mapping
-          )
-        else
-          [ ]) ++ (optional cfg.systemd.enable systemdActivation)
-        ++ (optional (!cfg.xwayland) "xwayland disable")
-        ++ [ cfg.extraConfig ]);
+    text = let
+      # include and set should be at the top of the configuration
+      setSettings = lib.filterAttrs (key: _: key == "set") cfg.settings;
+      includeSettings = lib.filterAttrs (key: _: key == "include") cfg.settings;
+      otherSettings =
+        lib.filterAttrs (key: _: key != "set" && key != "include") cfg.settings;
+    in lib.optionalString (setSettings != { })
+    (lib.hm.generators.toSwayConf { } setSettings)
+    + lib.optionalString (includeSettings != { })
+    (lib.hm.generators.toSwayConf { } includeSettings)
+    + lib.optionalString (otherSettings != { })
+    (lib.hm.generators.toSwayConf { } otherSettings) + concatStringsSep "\n"
+    ((optional (cfg.extraConfigEarly != "") cfg.extraConfigEarly)
+      ++ (if cfg.config != null then
+        with cfg.config;
+        ([
+          (fontConfigStr fonts)
+          "floating_modifier ${floating.modifier}"
+          (windowBorderString window floating)
+          "hide_edge_borders ${window.hideEdgeBorders}"
+          "focus_wrapping ${focus.wrapping}"
+          "focus_follows_mouse ${focus.followMouse}"
+          "focus_on_window_activation ${focus.newWindow}"
+          "mouse_warping ${
+            if builtins.isString (focus.mouseWarping) then
+              focus.mouseWarping
+            else if focus.mouseWarping then
+              "output"
+            else
+              "none"
+          }"
+          "workspace_layout ${workspaceLayout}"
+          "workspace_auto_back_and_forth ${
+            lib.hm.booleans.yesNo workspaceAutoBackAndForth
+          }"
+          "client.focused ${colorSetStr colors.focused}"
+          "client.focused_inactive ${colorSetStr colors.focusedInactive}"
+          "client.unfocused ${colorSetStr colors.unfocused}"
+          "client.urgent ${colorSetStr colors.urgent}"
+          "client.placeholder ${colorSetStr colors.placeholder}"
+          "client.background ${colors.background}"
+          (keybindingsStr {
+            keybindings = keybindingDefaultWorkspace;
+            bindsymArgs =
+              lib.optionalString (cfg.config.bindkeysToCode) "--to-code";
+          })
+          (keybindingsStr {
+            keybindings = keybindingsRest;
+            bindsymArgs =
+              lib.optionalString (cfg.config.bindkeysToCode) "--to-code";
+          })
+          (keycodebindingsStr keycodebindings)
+        ] ++ mapAttrsToList inputStr input
+          ++ mapAttrsToList outputStr output # outputs
+          ++ mapAttrsToList seatStr seat # seats
+          ++ mapAttrsToList (modeStr cfg.config.bindkeysToCode) modes # modes
+          ++ mapAttrsToList assignStr assigns # assigns
+          ++ map barStr bars # bars
+          ++ optional (gaps != null) gapsStr # gaps
+          ++ map floatingCriteriaStr floating.criteria # floating
+          ++ map windowCommandsStr window.commands # window commands
+          ++ map startupEntryStr startup # startup
+          ++ map workspaceOutputStr workspaceOutputAssign # custom mapping
+        )
+      else
+        [ ]) ++ (optional cfg.systemd.enable systemdActivation)
+      ++ (optional (!cfg.xwayland) "xwayland disable") ++ [ cfg.extraConfig ]);
   };
 
 in {
@@ -336,6 +346,7 @@ in {
     alexarice
     sumnerevans
     oxalica
+    sinanmohd
   ];
 
   imports = let modulePath = [ "wayland" "windowManager" "sway" ];
@@ -475,6 +486,20 @@ in {
       '';
     };
 
+    settings = lib.mkOption {
+      type = with lib.types;
+        let
+          valueType =
+            oneOf [ int float str path (listOf str) (attrsOf valueType) ] // {
+              description = "Sway configuration value";
+            };
+        in valueType;
+      default = { };
+      description = ''
+        Configuration for `sway`. See `sway(5)` for supported values.
+      '';
+    };
+
     config = mkOption {
       type = types.nullOr configModule;
       default = { };
@@ -526,6 +551,14 @@ in {
           message =
             "programs.sway.checkConfig requires non-null programs.sway.package";
         }
+        {
+          assertion = cfg.settings != { } -> cfg.extraConfigEarly == "";
+          message = ''
+            `wayland.windowManager.sway.extraConfigEarly` is not needed when
+            using `wayland.windowManager.sway.settings`, it'll properly handle
+            `set` and `include` configuration.
+          '';
+        }
       ];
 
       home.packages = optional (cfg.package != null) cfg.package