Merge pull request #324163 from SuperSandro2000/271914

nixos/kmscon: fix eval
2024-07-03 12:38:01 +08:00
parent 2ad8f10ab9 6868a97e5e
commit 2240a1aa31
1 changed files with 2 additions and 2 deletions
@@ -98,11 +98,11 @@ in {
    services.kmscon.extraConfig =
      let
        xkb = optionals cfg.useXkbConfig
-          lib.mapAttrsToList (n: v: "xkb-${n}=${v}") (
+          (lib.mapAttrsToList (n: v: "xkb-${n}=${v}") (
            lib.filterAttrs
              (n: v: builtins.elem n ["layout" "model" "options" "variant"] && v != "")
              config.services.xserver.xkb
-          );
+          ));
        render = optionals cfg.hwRender [ "drm" "hwaccel" ];
        fonts = optional (cfg.fonts != null) "font-name=${lib.concatMapStringsSep ", " (f: f.name) cfg.fonts}";
      in lib.concatStringsSep "\n" (xkb ++ render ++ fonts);