Merge master into staging-next (6bc001ea) · Commits · nix / nixpkgs

maintainers/maintainer-list.nix

+35 −0

Original line number	Diff line number	Diff line
		@@ -978,6 +978,12 @@
		githubId = 173595;
		name = "Caleb Maclennan";
		};
		alex = {
		email = "alexander.cinnamon927@passmail.net";
		github = "alexanderjkslfj";
		githubId = 117545308;
		name = "Alex";
		};
		ALEX11BR = {
		email = "alexioanpopa11@gmail.com";
		github = "ALEX11BR";
		@@ -7205,6 +7211,11 @@
		githubId = 183879;
		name = "Florian Klink";
		};
		florensie = {
		github = "florensie";
		githubId = 13403842;
		name = "Florens Pauwels";
		};
		florentc = {
		github = "florentc";
		githubId = 1149048;
		@@ -9545,6 +9556,12 @@
		githubId = 1318743;
		name = "Ivar";
		};
		iv-nn = {
		name = "iv-nn";
		github = "iv-nn";
		githubId = 49885246;
		keys = [ { fingerprint = "6358 EF87 86E0 EF2F 1628 103F BAB5 F165 1C71 C9C3"; } ];
		};
		ivyfanchiang = {
		email = "dev@ivyfanchiang.ca";
		github = "hexadecimalDinosaur";
		@@ -18078,6 +18095,12 @@
		name = "Roland Conybeare";
		keys = [ { fingerprint = "bw5Cr/4ul1C2UvxopphbZbFI1i5PCSnOmPID7mJ/Ogo"; } ];
		};
		rc-zb = {
		name = "Xiao Haifan";
		email = "rc-zb@outlook.com";
		github = "rc-zb";
		githubId = 161540043;
		};
		rdnetto = {
		email = "rdnetto@gmail.com";
		github = "rdnetto";
		@@ -19234,6 +19257,12 @@
		githubId = 695473;
		name = "Sascha Grunert";
		};
		satoqz = {
		email = "mail@satoqz.net";
		github = "satoqz";
		githubId = 40795431;
		name = "satoqz";
		};
		saturn745 = {
		email = "git-commits.rk7uq@aleeas.com";
		github = "saturn745";
		@@ -21914,6 +21943,12 @@
		githubId = 2164118;
		name = "Tobias Bora";
		};
		tobifroe = {
		email = "hi@froelich.dev";
		github = "tobifroe";
		githubId = 40638719;
		name = "Tobias Frölich";
		};
		tobim = {
		email = "nix@tobim.fastmail.fm";
		github = "tobim";

nixos/modules/programs/zsh/oh-my-zsh.nix

+10 −0

Original line number	Diff line number	Diff line
		@@ -87,6 +87,15 @@ in
		Without this option it would default to the read-only nix store.
		'';
		};

		preLoaded = lib.mkOption {
		type = lib.types.lines;
		default = "";
		description = ''
		Shell commands executed before the `oh-my-zsh` is loaded.
		For example, to disable async git prompt write `zstyle ':omz:alpha:lib:git' async-prompt force` (more information https://github.com/ohmyzsh/ohmyzsh?tab=readme-ov-file#async-git-prompt)
		'';
		};
		};
		};

		@@ -120,6 +129,7 @@ in
		ZSH_CACHE_DIR=${cfg.cacheDir}
		''}

		${cfg.preLoaded}
		source $ZSH/oh-my-zsh.sh
		'';

nixos/modules/services/monitoring/nezha-agent.nix

+9 −0

Original line number	Diff line number	Diff line
		@@ -92,6 +92,14 @@ in
		Address to the dashboard
		'';
		};
		extraFlags = lib.mkOption {
		type = lib.types.listOf lib.types.str;
		default = [ ];
		example = [ "--gpu" ];
		description = ''
		Extra command-line flags passed to nezha-agent.
		'';
		};
		};
		};

		@@ -125,6 +133,7 @@ in
		++ lib.optional cfg.gpu "--gpu"
		++ lib.optional cfg.temperature "--temperature"
		++ lib.optional cfg.useIPv6CountryCode "--use-ipv6-countrycode"
		++ cfg.extraFlags
		);
		wantedBy = [ "multi-user.target" ];
		};

nixos/modules/services/networking/soju.nix

+1 −1

Original line number	Diff line number	Diff line
		@@ -12,7 +12,7 @@ let
		tlsCfg = optionalString (cfg.tlsCertificate != null)
		"tls ${cfg.tlsCertificate} ${cfg.tlsCertificateKey}";
		logCfg = optionalString cfg.enableMessageLogging
		"log fs ${stateDir}/logs";
		"message-store fs ${stateDir}/logs";

		configFile = pkgs.writeText "soju.conf" ''
		${listenCfg}

nixos/modules/services/networking/tailscale.nix

+8 −0

Original line number	Diff line number	Diff line
		@@ -29,6 +29,12 @@ in {
		description = "Username or user ID of the user allowed to to fetch Tailscale TLS certificates for the node.";
		};

		disableTaildrop = mkOption {
		default = false;
		type = types.bool;
		description = "Whether to disable the Taildrop feature for sending files between nodes.";
		};

		package = lib.mkPackageOption pkgs "tailscale" {};

		openFirewall = mkOption {
		@@ -129,6 +135,8 @@ in {
		''"FLAGS=--tun ${lib.escapeShellArg cfg.interfaceName} ${lib.concatStringsSep " " cfg.extraDaemonFlags}"''
		] ++ (lib.optionals (cfg.permitCertUid != null) [
		"TS_PERMIT_CERT_UID=${cfg.permitCertUid}"
		]) ++ (lib.optionals (cfg.disableTaildrop) [
		"TS_DISABLE_TAILDROP=true"
		]);
		# Restart tailscaled with a single `systemctl restart` at the
		# end of activation, rather than a `stop` followed by a later