diff options
author | Florian Klink <flokli@flokli.de> | 2020-02-13 23:14:20 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-02-13 23:14:20 +0100 |
commit | aaa1c7b28f8e69d59a18dc207750b8c60c29c182 (patch) | |
tree | 980176dcf865ea2633016a06863876941ec76a2b /nixos/modules | |
parent | d4169851a53c230d88392f3fdc15eefd3612b074 (diff) | |
parent | 5282bc9a748b1dbf2da2a450f522fdbbff192780 (diff) |
Merge pull request #79663 from primeos/brightnessctl-systemd-support
brightnessctl: Add systemd support
Diffstat (limited to 'nixos/modules')
-rw-r--r-- | nixos/modules/hardware/brightnessctl.nix | 31 | ||||
-rw-r--r-- | nixos/modules/module-list.nix | 1 | ||||
-rw-r--r-- | nixos/modules/rename.nix | 6 |
3 files changed, 6 insertions, 32 deletions
diff --git a/nixos/modules/hardware/brightnessctl.nix b/nixos/modules/hardware/brightnessctl.nix deleted file mode 100644 index 2d54398d10df..000000000000 --- a/nixos/modules/hardware/brightnessctl.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; -let - cfg = config.hardware.brightnessctl; -in -{ - - options = { - - hardware.brightnessctl = { - - enable = mkOption { - default = false; - type = types.bool; - description = '' - Enable brightnessctl in userspace. - This will allow brightness control from users in the video group. - ''; - - }; - }; - }; - - - config = mkIf cfg.enable { - services.udev.packages = with pkgs; [ brightnessctl ]; - environment.systemPackages = with pkgs; [ brightnessctl ]; - }; - -} diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 6b032f64bdb1..f7e4ee6cd1ed 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -41,7 +41,6 @@ ./hardware/acpilight.nix ./hardware/all-firmware.nix ./hardware/bladeRF.nix - ./hardware/brightnessctl.nix ./hardware/brillo.nix ./hardware/ckb-next.nix ./hardware/cpu/amd-microcode.nix diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index 3b1b1b8bb55c..2cc6c46e3581 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -42,6 +42,12 @@ with lib; instead, or any other display manager in NixOS as they all support auto-login. '') (mkRemovedOptionModule [ "services" "dnscrypt-proxy" ] "Use services.dnscrypt-proxy2 instead") + (mkRemovedOptionModule ["hardware" "brightnessctl" ] '' + The brightnessctl module was removed because newer versions of + brightnessctl don't require the udev rules anymore (they can use the + systemd-logind API). Instead of using the module you can now + simply add the brightnessctl package to environment.systemPackages. + '') # Do NOT add any option renames here, see top of the file ]; |