tuxedo-keyboard: fix compilation for kernel 6.10 and 6.11 (#336633) (a4e9a2f8) · Commits · nix / nixpkgs

maintainers/maintainer-list.nix

+7 −0

Original line number	Diff line number	Diff line
		@@ -11287,6 +11287,13 @@
		github = "keenanweaver";
		githubId = 37268985;
		};
		keksgesicht = {
		name = "Jan Braun";
		email = "git@keksgesicht.de";
		github = "Keksgesicht";
		githubId = 32649612;
		keys = [ { fingerprint = "65DF D21C 22A9 E4CD FD1A 0804 C3D7 16E7 29B3 C86A"; } ];
		};
		keldu = {
		email = "mail@keldu.de";
		github = "keldu";

0 → 100644

+35 −0

Original line number	Diff line number	Diff line
		{ config, lib, ... }:
		let
		cfg = config.hardware.tuxedo-drivers;
		tuxedo-drivers = config.boot.kernelPackages.tuxedo-drivers;
		in
		{
		imports = [
		(lib.mkRenamedOptionModule
		[
		"hardware"
		"tuxedo-keyboard"
		]
		[
		"hardware"
		"tuxedo-drivers"
		]
		)
		];

		options.hardware.tuxedo-drivers = {
		enable = lib.mkEnableOption ''
		The tuxedo-drivers driver enables access to the following on TUXEDO notebooks:
		- Driver for Fn-keys
		- SysFS control of brightness/color/mode for most TUXEDO keyboards
		- Hardware I/O driver for TUXEDO Control Center

		For more inforation it is best to check at the source code description: <https://gitlab.com/tuxedocomputers/development/packages/tuxedo-drivers>
		'';
		};

		config = lib.mkIf cfg.enable {
		boot.kernelModules = [ "tuxedo_keyboard" ];
		boot.extraModulePackages = [ tuxedo-drivers ];
		};
		}

deleted100644 → 0

+0 −32

Original line number	Diff line number	Diff line
		{ config, lib, pkgs, ... }:
		let
		cfg = config.hardware.tuxedo-keyboard;
		tuxedo-keyboard = config.boot.kernelPackages.tuxedo-keyboard;
		in
		{
		options.hardware.tuxedo-keyboard = {
		enable = lib.mkEnableOption ''
		the tuxedo-keyboard driver.

		To configure the driver, pass the options to the {option}`boot.kernelParams` configuration.
		There are several parameters you can change. It's best to check at the source code description which options are supported.
		You can find all the supported parameters at: <https://github.com/tuxedocomputers/tuxedo-keyboard#kernelparam>

		In order to use the `custom` lighting with the maximumg brightness and a color of `0xff0a0a` one would put pass {option}`boot.kernelParams` like this:

		```
		boot.kernelParams = [
		"tuxedo_keyboard.mode=0"
		"tuxedo_keyboard.brightness=255"
		"tuxedo_keyboard.color_left=0xff0a0a"
		];
		```
		'';
		};

		config = lib.mkIf cfg.enable
		{
		boot.kernelModules = ["tuxedo_keyboard"];
		boot.extraModulePackages = [ tuxedo-keyboard ];
		};
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -98,7 +98,7 @@
		./hardware/sensor/iio.nix
		./hardware/steam-hardware.nix
		./hardware/system-76.nix
		./hardware/tuxedo-keyboard.nix
		./hardware/tuxedo-drivers.nix
		./hardware/ubertooth.nix
		./hardware/uinput.nix
		./hardware/uni-sync.nix

+1 −1

Original line number	Diff line number	Diff line
		@@ -14,7 +14,7 @@ in

		config = lib.mkIf cfg.enable (lib.mkMerge [
		{
		hardware.tuxedo-keyboard.enable = true;
		hardware.tuxedo-drivers.enable = true;

		systemd = {
		services.tailord = {