diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2021-09-11 14:51:05 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-11 14:51:05 +0200 |
| commit | 667711513d4aea73b03ae686bd84a45a905a9b25 (patch) | |
| tree | d98f03ad82ec4760f93671913747f8a107aee580 /nixos | |
| parent | a50c09f5c05e379090fc6a66c1b53099f2c7a347 (diff) | |
| parent | 9c82ab55b1ae40c162aaf7d91c9314f66ad4e075 (diff) | |
| download | nixlib-667711513d4aea73b03ae686bd84a45a905a9b25.tar nixlib-667711513d4aea73b03ae686bd84a45a905a9b25.tar.gz nixlib-667711513d4aea73b03ae686bd84a45a905a9b25.tar.bz2 nixlib-667711513d4aea73b03ae686bd84a45a905a9b25.tar.lz nixlib-667711513d4aea73b03ae686bd84a45a905a9b25.tar.xz nixlib-667711513d4aea73b03ae686bd84a45a905a9b25.tar.zst nixlib-667711513d4aea73b03ae686bd84a45a905a9b25.zip | |
Merge pull request #137039 from figsoda/sx-extra-layouts
Diffstat (limited to 'nixos')
| -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 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; }; }; |