Merge remote-tracking branch 'origin/master' into staging-next (b76567c2) · Commits · nix / nixpkgs

nixos/modules/services/hardware/libinput.nix

+78 −3

Original line number	Diff line number	Diff line
		@@ -18,18 +18,21 @@ let cfg = config.services.libinput;
		};

		accelProfile = mkOption {
		type = types.enum [ "flat" "adaptive" ];
		type = types.enum [ "flat" "adaptive" "custom" ];
		default = "adaptive";
		example = "flat";
		description = ''
		Sets the pointer acceleration profile to the given profile.
		Permitted values are `adaptive`, `flat`.
		Permitted values are `adaptive`, `flat`, `custom`.
		Not all devices support this option or all profiles.
		If a profile is unsupported, the default profile for this is used.
		`flat`: Pointer motion is accelerated by a constant
		(device-specific) factor, depending on the current speed.
		`adaptive`: Pointer acceleration depends on the input speed.
		This is the default profile for most devices.
		`custom`: Allows the user to define a custom acceleration function.
		To define custom functions use the accelPoints<Fallback/Motion/Scroll>
		and accelStep<Fallback/Motion/Scroll> options.
		'';
		};

		@@ -37,7 +40,73 @@ let cfg = config.services.libinput;
		type = types.nullOr types.str;
		default = null;
		example = "-0.5";
		description = "Cursor acceleration (how fast speed increases from minSpeed to maxSpeed).";
		description = ''
		Cursor acceleration (how fast speed increases from minSpeed to maxSpeed).
		This only applies to the flat or adaptive profile.
		'';
		};

		accelPointsFallback = mkOption {
		type = types.nullOr (types.listOf types.number);
		default = null;
		example = [ 0.0 1.0 2.4 2.5 ];
		description = ''
		Sets the points of the fallback acceleration function. The value must be a list of
		floating point non-negative numbers. This only applies to the custom profile.
		'';
		};

		accelPointsMotion = mkOption {
		type = types.nullOr (types.listOf types.number);
		default = null;
		example = [ 0.0 1.0 2.4 2.5 ];
		description = ''
		Sets the points of the (pointer) motion acceleration function. The value must be a
		list of floating point non-negative numbers. This only applies to the custom profile.
		'';
		};

		accelPointsScroll = mkOption {
		type = types.nullOr (types.listOf types.number);
		default = null;
		example = [ 0.0 1.0 2.4 2.5 ];
		description = ''
		Sets the points of the scroll acceleration function. The value must be a list of
		floating point non-negative numbers. This only applies to the custom profile.
		'';
		};

		accelStepFallback = mkOption {
		type = types.nullOr types.number;
		default = null;
		example = 0.1;
		description = ''
		Sets the step between the points of the fallback acceleration function. When a step of
		0.0 is provided, libinput's Fallback acceleration function is used. This only applies
		to the custom profile.
		'';
		};

		accelStepMotion = mkOption {
		type = types.nullOr types.number;
		default = null;
		example = 0.1;
		description = ''
		Sets the step between the points of the (pointer) motion acceleration function. When a
		step of 0.0 is provided, libinput's Fallback acceleration function is used. This only
		applies to the custom profile.
		'';
		};

		accelStepScroll = mkOption {
		type = types.nullOr types.number;
		default = null;
		example = 0.1;
		description = ''
		Sets the step between the points of the scroll acceleration function. When a step of
		0.0 is provided, libinput's Fallback acceleration function is used. This only applies
		to the custom profile.
		'';
		};

		buttonMapping = mkOption {
		@@ -203,6 +272,12 @@ let cfg = config.services.libinput;
		${optionalString (cfg.${deviceType}.dev != null) ''MatchDevicePath "${cfg.${deviceType}.dev}"''}
		Option "AccelProfile" "${cfg.${deviceType}.accelProfile}"
		${optionalString (cfg.${deviceType}.accelSpeed != null) ''Option "AccelSpeed" "${cfg.${deviceType}.accelSpeed}"''}
		${optionalString (cfg.${deviceType}.accelPointsFallback != null) ''Option "AccelPointsFallback" "${toString cfg.${deviceType}.accelPointsFallback}"''}
		${optionalString (cfg.${deviceType}.accelPointsMotion != null) ''Option "AccelPointsMotion" "${toString cfg.${deviceType}.accelPointsMotion}"''}
		${optionalString (cfg.${deviceType}.accelPointsScroll != null) ''Option "AccelPointsScroll" "${toString cfg.${deviceType}.accelPointsScroll}"''}
		${optionalString (cfg.${deviceType}.accelStepFallback != null) ''Option "AccelStepFallback" "${toString cfg.${deviceType}.accelStepFallback}"''}
		${optionalString (cfg.${deviceType}.accelStepMotion != null) ''Option "AccelStepMotion" "${toString cfg.${deviceType}.accelStepMotion}"''}
		${optionalString (cfg.${deviceType}.accelStepScroll != null) ''Option "AccelStepScroll" "${toString cfg.${deviceType}.accelStepScroll}"''}
		${optionalString (cfg.${deviceType}.buttonMapping != null) ''Option "ButtonMapping" "${cfg.${deviceType}.buttonMapping}"''}
		${optionalString (cfg.${deviceType}.calibrationMatrix != null) ''Option "CalibrationMatrix" "${cfg.${deviceType}.calibrationMatrix}"''}
		${optionalString (cfg.${deviceType}.transformationMatrix != null) ''Option "TransformationMatrix" "${cfg.${deviceType}.transformationMatrix}"''}

nixos/modules/system/boot/systemd/sysusers.nix

+1 −1

Original line number	Diff line number	Diff line
		@@ -82,7 +82,7 @@ in
		(username: opts: {
		assertion = (opts.password == opts.initialPassword \|\| opts.password == null) &&
		(opts.hashedPassword == opts.initialHashedPassword \|\| opts.hashedPassword == null);
		message = "${username} uses password or hashedPassword. systemd-sysupdate only supports initial passwords. It'll never update your passwords.";
		message = "user '${username}' uses password or hashedPassword. systemd-sysupdate only supports initial passwords. It'll never update your passwords.";
		})
		systemUsers;

pkgs/applications/editors/vim/plugins/generated.nix

+36 −0

Original line number	Diff line number	Diff line
		@@ -1410,6 +1410,18 @@ final: prev:
		meta.homepage = "https://github.com/uga-rosa/ccc.nvim/";
		};

		cellular-automaton-nvim = buildVimPlugin {
		pname = "cellular-automaton.nvim";
		version = "2024-06-30";
		src = fetchFromGitHub {
		owner = "Eandrju";
		repo = "cellular-automaton.nvim";
		rev = "11aea08aa084f9d523b0142c2cd9441b8ede09ed";
		sha256 = "0jvz2vnyhm6a2zyz93sh87n59vga2l016ijrfybfrlv44hhzp2ww";
		};
		meta.homepage = "https://github.com/Eandrju/cellular-automaton.nvim/";
		};

		chadtree = buildVimPlugin {
		pname = "chadtree";
		version = "2024-07-25";
		@@ -2874,6 +2886,18 @@ final: prev:
		meta.homepage = "https://github.com/scottmckendry/cyberdream.nvim/";
		};

		darkearth-nvim = buildVimPlugin {
		pname = "darkearth-nvim";
		version = "2024-07-19";
		src = fetchFromGitHub {
		owner = "ptdewey";
		repo = "darkearth-nvim";
		rev = "d53cc2384d0a84889bd44361cee33019bac02c58";
		sha256 = "0m04m4mi8f7pzsx9d92xy20b4yw10gyqk4gmxdlr46y6byfwwlyj";
		};
		meta.homepage = "https://github.com/ptdewey/darkearth-nvim/";
		};

		dart-vim-plugin = buildVimPlugin {
		pname = "dart-vim-plugin";
		version = "2024-07-02";
		@@ -10135,6 +10159,18 @@ final: prev:
		meta.homepage = "https://github.com/kovisoft/slimv/";
		};

		smart-open-nvim = buildVimPlugin {
		pname = "smart-open.nvim";
		version = "2024-08-17";
		src = fetchFromGitHub {
		owner = "danielfalk";
		repo = "smart-open.nvim";
		rev = "87626ee8748b9bba22093adec7bb58c63e7214f0";
		sha256 = "sha256-ro4qFdEAnE5u8wt7NyIc7OHobvjRotVX+LZ0P5as8EU=";
		};
		meta.homepage = "https://github.com/danielfalk/smart-open.nvim/";
		};

		smart-splits-nvim = buildVimPlugin {
		pname = "smart-splits.nvim";
		version = "2024-08-02";

pkgs/applications/editors/vim/plugins/overrides.nix

+4 −0

Original line number	Diff line number	Diff line
		@@ -1477,6 +1477,10 @@
		dependencies = [ self.skim ];
		};

		smart-open-nvim = super.smart-open-nvim.overrideAttrs {
		dependencies = with self; [ telescope-nvim sqlite-lua ];
		};

		sniprun =
		let
		version = "1.3.15";

pkgs/applications/editors/vim/plugins/vim-plugin-names

+3 −0

Original line number	Diff line number	Diff line
		@@ -117,6 +117,7 @@ https://github.com/itchyny/calendar.vim/,,
		https://github.com/bkad/camelcasemotion/,,
		https://github.com/tyru/caw.vim/,,
		https://github.com/uga-rosa/ccc.nvim/,HEAD,
		https://github.com/Eandrju/cellular-automaton.nvim/,HEAD,
		https://github.com/ms-jpq/chadtree/,HEAD,
		https://github.com/vim-scripts/changeColorScheme.vim/,,
		https://github.com/sudormrfbin/cheatsheet.nvim/,,
		@@ -239,6 +240,7 @@ https://github.com/FelikZ/ctrlp-py-matcher/,,
		https://github.com/amiorin/ctrlp-z/,,
		https://github.com/ctrlpvim/ctrlp.vim/,,
		https://github.com/scottmckendry/cyberdream.nvim/,,
		https://github.com/ptdewey/darkearth-nvim/,HEAD,
		https://github.com/dart-lang/dart-vim-plugin/,,
		https://github.com/rizzatti/dash.vim/,HEAD,
		https://github.com/glepnir/dashboard-nvim/,,
		@@ -853,6 +855,7 @@ https://github.com/AndrewRadev/sideways.vim/,,
		https://github.com/lotabout/skim.vim/,,
		https://github.com/mopp/sky-color-clock.vim/,,
		https://github.com/kovisoft/slimv/,,
		https://github.com/danielfalk/smart-open.nvim,0.2.x,
		https://github.com/mrjones2014/smart-splits.nvim/,,
		https://github.com/m4xshen/smartcolumn.nvim/,,
		https://github.com/gorkunov/smartpairs.vim/,,

Admin message