Unverified Commit 2240a1aa authored by Aleksana's avatar Aleksana Committed by GitHub
Browse files

Merge pull request #324163 from SuperSandro2000/271914 

nixos/kmscon: fix eval
parents 2ad8f10a 6868a97e

nixos/modules/services/ttys/kmscon.nix

+2 −2
Original line number Diff line number Diff line
@@ -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);