Merge master into staging-next (3cdfe757) · Commits · nix / nixpkgs

maintainers/maintainer-list.nix

+6 −0

Original line number	Diff line number	Diff line
		@@ -21463,6 +21463,12 @@
		githubId = 4033651;
		name = "Keagan McClelland";
		};
		prophetofxenu = {
		email = "xenu@prophetofxenu.net";
		github = "prophetofxenu";
		githubId = 20529712;
		name = "William Harrell";
		};
		protoben = {
		email = "protob3n@gmail.com";
		github = "protoben";

nixos/doc/manual/release-notes/rl-2605.section.md

+2 −0

Original line number	Diff line number	Diff line
		@@ -163,6 +163,8 @@ See <https://github.com/NixOS/nixpkgs/issues/481673>.

		<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->

		- [hardware.xpadneo](#opt-hardware.xpadneo.enable) now supports configuring kernel module parameters via a freeform [settings](#opt-hardware.xpadneo.settings) option, with convenience options for [rumble attenuation](#opt-hardware.xpadneo.rumbleAttenuation) and [controller quirks](#opt-hardware.xpadneo.quirks).

		- Wine has been updated to the 11.0 branch. Please check the [upstream announcement](https://gitlab.winehq.org/wine/wine/-/releases/wine-11.0) for more details.

		- Cinnamon has been updated to 6.6, please check the [upstream announcement](https://www.linuxmint.com/rel_zena_whatsnew.php) for more details.

nixos/modules/hardware/xpadneo.nix

+112 −3

Original line number	Diff line number	Diff line
		{ config, lib, ... }:
		let
		cfg = config.hardware.xpadneo;

		modprobeConfig =
		let
		params = lib.mapAttrsToList (name: value: "${name}=${toString value}") cfg.settings;
		in
		lib.optionalString (params != [ ]) "options hid_xpadneo ${lib.concatStringsSep " " params}";
		in
		{
		options.hardware.xpadneo = {
		enable = lib.mkEnableOption "the xpadneo driver for Xbox One wireless controllers";

		rumbleAttenuation = lib.mkOption {
		type = lib.types.submodule {
		options = {
		overall = lib.mkOption {
		type = lib.types.ints.between 0 100;
		default = 0;
		description = ''
		Overall force feedback attenuation as a percentage.
		`0` means full rumble, `100` means no rumble.
		Applies to both main and trigger rumble.
		'';
		};
		triggers = lib.mkOption {
		type = lib.types.nullOr (lib.types.ints.between 0 100);
		default = null;
		description = ''
		Extra attenuation for trigger rumble as a percentage, applied
		on top of {option}`overall`. For example, `overall = 50` and
		`triggers = 50` results in 50% main rumble and 25% trigger rumble.
		Set to `100` to disable trigger rumble while keeping main rumble.
		`null` means no extra trigger attenuation.
		'';
		};
		};
		};
		default = { };
		example = lib.literalExpression ''
		{
		overall = 50; # 50% overall rumble
		triggers = 50; # 25% trigger rumble (50% of 50%)
		}
		'';
		description = ''
		Force feedback attenuation settings. Higher values reduce rumble strength.

		See <https://github.com/atar-axis/xpadneo/blob/master/docs/CONFIGURATION.md>
		for more information.
		'';
		};

		quirks = lib.mkOption {
		type = lib.types.attrsOf (lib.types.ints.u16);
		default = { };
		example = lib.literalExpression ''
		{
		"11:22:33:44:55:66" = 7; # Applies flags 1 + 2 + 4
		}
		'';
		description = ''
		Controller-specific quirk flags, keyed by MAC address.
		Flags are combined as a bitmask to address compatibility issues
		with specific controllers.

		The value is a sum of individual flag values. For example, to apply
		flags 1, 2, and 4, use `7` (1 + 2 + 4). To apply flags 2, 4, and 32,
		use `38` (2 + 4 + 32).

		See <https://github.com/atar-axis/xpadneo/blob/master/docs/CONFIGURATION.md>
		for available quirk flags and their values.
		'';
		};

		settings = lib.mkOption {
		type = lib.types.attrsOf (
		lib.types.oneOf [
		lib.types.int
		lib.types.str
		]
		);
		default = { };
		example = lib.literalExpression ''
		{
		disable_deadzones = 1;
		trigger_rumble_mode = 2;
		disable_shift_mode = 1;
		}
		'';
		description = ''
		Kernel module parameters for hid_xpadneo. These are passed directly
		to the module via modprobe.

		See <https://github.com/atar-axis/xpadneo/blob/master/docs/CONFIGURATION.md>
		for available parameters and their values.
		'';
		};
		};

		config = lib.mkIf cfg.enable {
		hardware.xpadneo.settings =
		lib.optionalAttrs (cfg.rumbleAttenuation.overall != 0 \|\| cfg.rumbleAttenuation.triggers != null) {
		rumble_attenuation =
		toString cfg.rumbleAttenuation.overall
		+ lib.optionalString (cfg.rumbleAttenuation.triggers != null) (
		"," + toString cfg.rumbleAttenuation.triggers
		);
		}
		// lib.optionalAttrs (cfg.quirks != { }) {
		quirks = lib.concatStringsSep "," (
		lib.mapAttrsToList (mac: flags: "${mac}:${toString flags}") cfg.quirks
		);
		};

		boot = {
		extraModprobeConfig = lib.mkMerge [
		# Must disable Enhanced Retransmission Mode to support bluetooth pairing
		# https://wiki.archlinux.org/index.php/Gamepad#Connect_Xbox_Wireless_Controller_with_Bluetooth
		extraModprobeConfig = lib.mkIf (lib.versionOlder config.boot.kernelPackages.kernel.version "5.12") "options bluetooth disable_ertm=1";
		(lib.mkIf (lib.versionOlder config.boot.kernelPackages.kernel.version "5.12") "options bluetooth disable_ertm=1")
		modprobeConfig
		];
		extraModulePackages = with config.boot.kernelPackages; [ xpadneo ];
		kernelModules = [ "hid_xpadneo" ];
		};

nixos/modules/services/torrent/cross-seed.nix

+5 −4

Original line number	Diff line number	Diff line
		@@ -105,7 +105,7 @@ in
		};

		outputDir = mkOption {
		type = types.path;
		type = types.nullOr types.path;
		default = "${cfg.configDir}/output";
		defaultText = "\${cfg.configDir}/output";
		description = "Directory where cross-seed will place torrent files it finds.";
		@@ -193,7 +193,8 @@ in
		inherit (cfg) group user;
		mode = "700";
		};

		}
		// lib.optionalAttrs (cfg.settings.outputDir != null) {
		${cfg.settings.outputDir}.d = {
		inherit (cfg) group user;
		mode = "750";
		@@ -222,7 +223,7 @@ in
		LoadCredential = lib.mkIf (cfg.settingsFile != null) "secretSettingsFile:${cfg.settingsFile}";

		StateDirectory = "cross-seed";
		ReadWritePaths = [ cfg.settings.outputDir ];
		ReadWritePaths = lib.optional (cfg.settings.outputDir != null) cfg.settings.outputDir;
		ReadOnlyPaths = lib.optional (cfg.settings.torrentDir != null) cfg.settings.torrentDir;
		};

		@@ -231,7 +232,7 @@ in
		RequiresMountsFor = lib.flatten [
		cfg.settings.dataDirs
		cfg.settings.linkDirs
		cfg.settings.outputDir
		(lib.optional (cfg.settings.outputDir != null) cfg.settings.outputDir)
		];
		};
		};

nixos/tests/xpadneo.nix

+16 −1

Original line number	Diff line number	Diff line
		@@ -5,7 +5,17 @@

		nodes = {
		machine = {
		config.hardware.xpadneo.enable = true;
		config.hardware.xpadneo = {
		enable = true;
		rumbleAttenuation = {
		overall = 50;
		triggers = 25;
		};
		settings = {
		disable_deadzones = 1;
		trigger_rumble_mode = 2;
		};
		};
		};
		};

		@@ -15,5 +25,10 @@
		testScript = ''
		machine.start();
		machine.succeed("modinfo hid_xpadneo \| grep 'version:\s\+${pkgs.linuxPackages.xpadneo.version}'")

		machine.succeed("grep 'options hid_xpadneo' /etc/modprobe.d/nixos.conf")
		machine.succeed("grep 'disable_deadzones=1' /etc/modprobe.d/nixos.conf")
		machine.succeed("grep 'trigger_rumble_mode=2' /etc/modprobe.d/nixos.conf")
		machine.succeed("grep 'rumble_attenuation=50,25' /etc/modprobe.d/nixos.conf")
		'';
		}