From 9c82ab55b1ae40c162aaf7d91c9314f66ad4e075 Mon Sep 17 00:00:00 2001 From: figsoda Date: Tue, 7 Sep 2021 18:57:37 -0400 Subject: nixos/xserver: fix extraLayouts with displayManager.sx.enable --- nixos/modules/services/x11/display-managers/sx.nix | 2 ++ nixos/modules/services/x11/extra-layouts.nix | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'nixos') diff --git a/nixos/modules/services/x11/display-managers/sx.nix b/nixos/modules/services/x11/display-managers/sx.nix index 132531c0ddc0..73d27390a580 100644 --- a/nixos/modules/services/x11/display-managers/sx.nix +++ b/nixos/modules/services/x11/display-managers/sx.nix @@ -34,4 +34,6 @@ in { }; systemd.services.display-manager.enable = false; }; + + meta.maintainers = with maintainers; [ figsoda ]; } diff --git a/nixos/modules/services/x11/extra-layouts.nix b/nixos/modules/services/x11/extra-layouts.nix index f48216ff446f..0e2edc6a5309 100644 --- a/nixos/modules/services/x11/extra-layouts.nix +++ b/nixos/modules/services/x11/extra-layouts.nix @@ -166,7 +166,8 @@ in services.xserver = { xkbDir = "${pkgs.xkb_patched}/etc/X11/xkb"; - exportConfiguration = config.services.xserver.displayManager.startx.enable; + exportConfiguration = config.services.xserver.displayManager.startx.enable + || config.services.xserver.displayManager.sx.enable; }; }; -- cgit 1.4.1