Home: Disable zapret for ipv6.

config/Dpi.nix

@@ -1,49 +1,77 @@
 {
 	config,
-	inputs,
 	lib,
-	pkgsMaster,
+	pkgs,
 	...
 }: let
-	cfg = config.module.dpi;
+	cfg = config.module.dpi.bypass;
+
+	whitelist = lib.optionalString (
+		(builtins.length cfg.whitelist) != 0
+	) "--hostlist ${pkgs.writeText "zapret-whitelist" (lib.concatStringsSep "\n" cfg.whitelist)}";
+
+	blacklist = lib.optionalString (
+		(builtins.length cfg.blacklist) != 0
+	) "--hostlist-exclude ${pkgs.writeText "zapret-blacklist" (lib.concatStringsSep "\n" cfg.blacklist)}";
+
+	params = lib.concatStringsSep " " cfg.params;
+
+	qnum = toString cfg.qnum;
 in {
 	disabledModules = [ "services/networking/zapret.nix" ];
-	imports = [ "${inputs.nixpkgsMaster}/nixos/modules/services/networking/zapret.nix" ];
+	# imports = [ "${inputs.nixpkgsMaster}/nixos/modules/services/networking/zapret.nix" ];
 
-	config = lib.mkIf cfg.bypass.enable {
+	config = lib.mkIf cfg.enable (lib.mkMerge [
-		services.zapret = {
+		{
-			inherit (cfg.bypass) params;
+			systemd.services.zapret = {
-			enable  = true;
+				description = "DPI bypass service";
-			package = pkgsMaster.zapret;
+				wantedBy = [ "multi-user.target" ];
-			httpMode    = "full";
+				after = [ "network.target" ];
-			httpSupport = true;
+				serviceConfig = {
-			udpSupport  = true;
+					ExecStart = "${cfg.package}/bin/nfqws --pidfile=/run/nfqws.pid ${params} ${whitelist} ${blacklist} --qnum=${qnum}";
-			udpPorts = [
+					Type = "simple";
-				"50000:50099"
+					PIDFile = "/run/nfqws.pid";
-			];
+					Restart = "always";
-			whitelist = [
+					RuntimeMaxSec = "1h"; # This service loves to crash silently or cause network slowdowns. It also restarts instantly. Restarting it at least hourly provided the best experience.
-				"youtube.com"
+
-				"googlevideo.com"
+					# Hardening.
-				"ytimg.com"
+					DevicePolicy = "closed";
-				"youtu.be"
+					KeyringMode = "private";
-				"rutracker.org"
+					PrivateTmp = true;
-				"rutracker.cc"
+					PrivateMounts = true;
-				"rutrk.org"
+					ProtectHome = true;
-				"t-ru.org"
+					ProtectHostname = true;
-				"medium.com"
+					ProtectKernelModules = true;
-				"dis.gd"
+					ProtectKernelTunables = true;
-				"discord.co"
+					ProtectSystem = "strict";
-				"discord.com"
+					ProtectProc = "invisible";
-				"discord.dev"
+					RemoveIPC = true;
-				"discord.gg"
+					RestrictNamespaces = true;
-				"discord.gift"
+					RestrictRealtime = true;
-				"discord.media"
+					RestrictSUIDSGID = true;
-				"discord.new"
+					SystemCallArchitectures = "native";
-				"discordapp.com"
-				"discordapp.net"
-				"discordcdn.com"
-				"discordstatus.com"
-			];
 				};
 			};
+		}
+		# Route system traffic via service for specified ports.
+		(lib.mkIf cfg.configureFirewall {
+			networking.firewall.extraCommands =
+				let
+					httpParams = lib.optionalString (
+						cfg.httpMode == "first"
+					) "-m connbytes --connbytes-dir=original --connbytes-mode=packets --connbytes 1:6";
+
+					udpPorts = lib.concatStringsSep "," cfg.udpPorts;
+				in
+					''
+					iptables -t mangle -I POSTROUTING -p tcp --dport 443 -m connbytes --connbytes-dir=original --connbytes-mode=packets --connbytes 1:6 -m mark ! --mark 0x40000000/0x40000000 -j NFQUEUE --queue-num ${qnum} --queue-bypass
+					''
+				+ lib.optionalString (cfg.httpSupport) ''
+					iptables -t mangle -I POSTROUTING -p tcp --dport 80 ${httpParams} -m mark ! --mark 0x40000000/0x40000000 -j NFQUEUE --queue-num ${qnum} --queue-bypass
+				''
+				+ lib.optionalString (cfg.udpSupport) ''
+					iptables -t mangle -A POSTROUTING -p udp -m multiport --dports ${udpPorts} -m mark ! --mark 0x40000000/0x40000000 -j NFQUEUE --queue-num ${qnum} --queue-bypass
+				'';
+		})
+	]);
 }

host/x86_64-linux/home/default.nix

@@ -27,10 +27,21 @@
 				"--dpi-desync-ttl=1"
 				"--dpi-desync-autottl=2"
 
-				"--dpi-desync-ttl6=1"
+				# "--dpi-desync-ttl6=1"
-				"--dpi-desync-autottl6=2"
+				# "--dpi-desync-autottl6=2"
 
-				"--dpi-desync-any-protocol"
+				# "--dpi-desync-any-protocol"
+			];
+			whitelist = [
+				"youtube.com"
+				"googlevideo.com"
+				"ytimg.com"
+				"youtu.be"
+				"rutracker.org"
+				"rutracker.cc"
+				"rutrk.org"
+				"t-ru.org"
+				"medium.com"
 			];
 		};
 		amd = {

option/Dpi.nix

@@ -1,12 +1,49 @@
 {
 	lib,
+	pkgsMaster,
 	...
 }: {
 	options.module.dpi.bypass = {
-		enable = lib.mkEnableOption "the DPI bypass.";
+		enable = lib.mkEnableOption "the Zapret DPI bypass service.";
+		package = lib.mkPackageOption pkgsMaster "zapret" { };
 		params = lib.mkOption {
 			default = [ ];
 			type = with lib.types; listOf str;
 		};
+		whitelist = lib.mkOption {
+			default = [ ];
+			type = with lib.types; listOf str;
+		};
+		blacklist = lib.mkOption {
+			default = [ ];
+			type = with lib.types; listOf str;
+		};
+		qnum = lib.mkOption {
+			default = 200;
+			type = lib.types.int;
+		};
+		configureFirewall = lib.mkOption {
+			default = true;
+			type = lib.types.bool;
+		};
+		httpSupport = lib.mkOption {
+			default = true;
+			type = lib.types.bool;
+		};
+		httpMode = lib.mkOption {
+			default = "first";
+			type = lib.types.enum [
+				"first"
+				"full"
+			];
+		};
+		udpSupport = lib.mkOption {
+			default = false;
+			type = lib.types.bool;
+		};
+		udpPorts = lib.mkOption {
+			default = [ ];
+			type = with lib.types; listOf str;
+		};
 	};
 }