diff options
| author | figsoda <figsoda@pm.me> | 2021-09-07 18:57:37 -0400 |
|---|---|---|
| committer | figsoda <figsoda@pm.me> | 2021-09-10 18:48:14 -0400 |
| commit | 9c82ab55b1ae40c162aaf7d91c9314f66ad4e075 (patch) | |
| tree | d36b4107f77b2ef34355a7bd09559e4ffc48e6f9 | |
| parent | 82d19cb068d7213c8beaa96220f1d81d57a28381 (diff) | |
| download | nixpkgs-9c82ab55b1ae40c162aaf7d91c9314f66ad4e075.tar nixpkgs-9c82ab55b1ae40c162aaf7d91c9314f66ad4e075.tar.gz nixpkgs-9c82ab55b1ae40c162aaf7d91c9314f66ad4e075.tar.bz2 nixpkgs-9c82ab55b1ae40c162aaf7d91c9314f66ad4e075.tar.lz nixpkgs-9c82ab55b1ae40c162aaf7d91c9314f66ad4e075.tar.xz nixpkgs-9c82ab55b1ae40c162aaf7d91c9314f66ad4e075.tar.zst nixpkgs-9c82ab55b1ae40c162aaf7d91c9314f66ad4e075.zip | |
nixos/xserver: fix extraLayouts with displayManager.sx.enable
| -rw-r--r-- | nixos/modules/services/x11/display-managers/sx.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/services/x11/extra-layouts.nix | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/nixos/modules/services/x11/display-managers/sx.nix b/nixos/modules/services/x11/display-managers/sx.nix index 132531c0ddc..73d27390a58 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 f48216ff446..0e2edc6a530 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; }; }; |