Merge staging-next into staging (c2123cc2) · Commits · nix / nixpkgs

nixos/modules/services/networking/netbird.nix

+33 −8

Original line number	Diff line number	Diff line
		@@ -543,14 +543,7 @@ in
		after = [ "network.target" ];
		wantedBy = [ "multi-user.target" ];

		path =
		optionals (!config.services.resolved.enable) [ pkgs.openresolv ]
		# useful for `netbird debug` system info gathering
		++ optionals config.networking.nftables.enable [ pkgs.nftables ]
		++ optionals (!config.networking.nftables.enable) [
		pkgs.iptables
		pkgs.ipset
		];
		path = optionals (!config.services.resolved.enable) [ pkgs.openresolv ];

		serviceConfig = {
		ExecStart = "${getExe client.wrapper} service run";
		@@ -574,6 +567,38 @@ in
		}
		);
		}
		# netbird debug bundle related configurations
		{
		systemd.services = toClientAttrs (
		client:
		nameValuePair client.service.name {
		/*
		lets NetBird daemon know which systemd service to gather logs for
		see https://github.com/netbirdio/netbird/blob/2c87fa623654c5eef76bc0226062290201eef13a/client/internal/debug/debug_linux.go#L50-L51
		*/
		environment.SYSTEMD_UNIT = client.service.name;

		path =
		optionals config.networking.nftables.enable [ pkgs.nftables ]
		++ optionals (!config.networking.nftables.enable) [
		pkgs.iptables
		pkgs.ipset
		];
		}
		);
		users.users = toHardenedClientAttrs (
		client:
		nameValuePair client.user.name {
		extraGroups = [
		/*
		allows debug bundles to gather systemd logs for `netbird*.service`
		this is not ideal for hardening as it grants access to the whole journal, not just own logs
		*/
		"systemd-journal"
		];
		}
		);
		}
		# Hardening section
		(mkIf (hardenedClients != { }) {
		users.groups = toHardenedClientAttrs (client: nameValuePair client.user.group { });

+2 −2

Original line number	Diff line number	Diff line
		@@ -24,8 +24,8 @@ let
		sha256Hash = "sha256-S8KK/EGev0v03fVywIkD6Ym3LrciGKXJVorzyZ1ljdQ=";
		};
		latestVersion = {
		version = "2025.1.4.5"; # "Android Studio Narwhal 4 Feature Drop \| 2025.1.4 Canary 5"
		sha256Hash = "sha256-gfhlcvqMDZPOmKgfp4XNrq9rucN1ZnY6WuBZYHYspGg=";
		version = "2025.2.1.3"; # "Android Studio Otter \| 2025.2.1 Canary 3"
		sha256Hash = "sha256-McgPREXfErJ6vcHPKlAC4EVf61QedMV6J643LM5N7Wg=";
		};
		in
		{

+13 −0

Original line number	Diff line number	Diff line
		@@ -6975,6 +6975,19 @@ final: prev: {
		meta.hydraPlatforms = [ ];
		};

		kiwi-nvim = buildVimPlugin {
		pname = "kiwi.nvim";
		version = "2025-07-07";
		src = fetchFromGitHub {
		owner = "serenevoid";
		repo = "kiwi.nvim";
		rev = "61e86fc29365e32b44c2914a2b10c90d04a3b22e";
		sha256 = "1knma0bjpvakiki9iwkhqxqsdzyx3dgyvhds9v3h0bsjyj15nj7x";
		};
		meta.homepage = "https://github.com/serenevoid/kiwi.nvim/";
		meta.hydraPlatforms = [ ];
		};

		kmonad-vim = buildVimPlugin {
		pname = "kmonad-vim";
		version = "2022-03-20";

+1 −0

Original line number	Diff line number	Diff line
		@@ -535,6 +535,7 @@ https://github.com/webhooked/kanso.nvim/,HEAD,
		https://github.com/imsnif/kdl.vim/,HEAD,
		https://github.com/anuvyklack/keymap-layer.nvim/,HEAD,
		https://github.com/mikesmithgh/kitty-scrollback.nvim/,HEAD,
		https://github.com/serenevoid/kiwi.nvim/,HEAD,
		https://github.com/kmonad/kmonad-vim/,,
		https://github.com/frabjous/knap/,HEAD,
		https://github.com/b3nj5m1n/kommentary/,,

+2 −2

Original line number	Diff line number	Diff line
		@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
		mktplcRef = {
		name = "claude-code";
		publisher = "anthropic";
		version = "2.0.0";
		hash = "sha256-vd3ZT8iwmbUCeaHgiDGLzWehOj4j/hMinHiXQytwVz4=";
		version = "2.0.5";
		hash = "sha256-3+VrFM1aB26AfF8vkrFJXOfg07EGkwNa+nh1vvy6MFw=";
		};

		meta = {