diff options
| author | piegames <git@piegames.de> | 2022-03-05 14:48:35 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-05 14:48:35 +0100 |
| commit | cd7e516b266b96519b378c1751cd105401755232 (patch) | |
| tree | 13856bd38fb1a61bdb56a0d16a5a8b01b7b30d42 /nixos/modules/services/x11 | |
| parent | 36812feb85dc046a42d0818e0885767f267dc726 (diff) | |
| parent | 8a95d9fede1dd191228af37b8a75d706b88fa481 (diff) | |
| download | nixpkgs-cd7e516b266b96519b378c1751cd105401755232.tar nixpkgs-cd7e516b266b96519b378c1751cd105401755232.tar.gz nixpkgs-cd7e516b266b96519b378c1751cd105401755232.tar.bz2 nixpkgs-cd7e516b266b96519b378c1751cd105401755232.tar.lz nixpkgs-cd7e516b266b96519b378c1751cd105401755232.tar.xz nixpkgs-cd7e516b266b96519b378c1751cd105401755232.tar.zst nixpkgs-cd7e516b266b96519b378c1751cd105401755232.zip | |
Merge pull request #156858: nixos/polkit: don't enable by default
Diffstat (limited to 'nixos/modules/services/x11')
| -rw-r--r-- | nixos/modules/services/x11/display-managers/lightdm.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/services/x11/xserver.nix | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix index 84b75c83aea..27dfed3cc14 100644 --- a/nixos/modules/services/x11/display-managers/lightdm.nix +++ b/nixos/modules/services/x11/display-managers/lightdm.nix @@ -267,6 +267,8 @@ in # Enable the accounts daemon to find lightdm's dbus interface environment.systemPackages = [ lightdm ]; + security.polkit.enable = true; + security.pam.services.lightdm.text = '' auth substack login account include login diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix index ec6d86d59bd..0c50d82b23b 100644 --- a/nixos/modules/services/x11/xserver.nix +++ b/nixos/modules/services/x11/xserver.nix @@ -620,9 +620,6 @@ in in optional (driver != null) ({ inherit name; modules = []; driverName = name; display = true; } // driver)); assertions = [ - { assertion = config.security.polkit.enable; - message = "X11 requires Polkit to be enabled (‘security.polkit.enable = true’)."; - } (let primaryHeads = filter (x: x.primary) cfg.xrandrHeads; in { assertion = length primaryHeads < 2; message = "Only one head is allowed to be primary in " |