From 54a588425955e34175b84c561b988308bb16acb7 Mon Sep 17 00:00:00 2001 From: L-Nafaryus Date: Tue, 14 Jan 2025 00:00:23 +0500 Subject: [PATCH] fix: nixosModules.zapret: collision with nixpkgs module --- nixosModules/default.nix | 2 +- nixosModules/services/zapret.nix | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/nixosModules/default.nix b/nixosModules/default.nix index fa3efac..c1f7491 100644 --- a/nixosModules/default.nix +++ b/nixosModules/default.nix @@ -11,7 +11,7 @@ ./services/qbittorrent-nox.nix ./services/spoofdpi.nix # ISSUE: collision with nixos module zapret - #./services/zapret.nix + ./services/zapret.nix ./services/conduit.nix ]; diff --git a/nixosModules/services/zapret.nix b/nixosModules/services/zapret.nix index 623695f..338df51 100644 --- a/nixosModules/services/zapret.nix +++ b/nixosModules/services/zapret.nix @@ -17,6 +17,8 @@ with lib; let (lib.splitString "\n" (lib.removeSuffix "\n" str)))) ); in { + disabledModules = ["services/networking/zapret.nix"]; + options.services.zapret = { enable = mkEnableOption "DPI bypass multi platform service";