diff --git a/flake.lock b/flake.lock index a6d5df2..30468e9 100644 --- a/flake.lock +++ b/flake.lock @@ -85,12 +85,29 @@ "type": "github" } }, + "nixpkgs_3": { + "locked": { + "lastModified": 1716044191, + "narHash": "sha256-V/JRCf9iOKGMmmMCs/K1n+vOP01Y7ZPJntHXxDEvzWM=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "fdfdc52e33e11634eb7b37f65e96e63d1beb7e45", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "master", + "repo": "nixpkgs", + "type": "github" + } + }, "root": { "inputs": { "home-manager": "home-manager", "impermanence": "impermanence", "nixpkgs": "nixpkgs", - "yandex-music": "yandex-music" + "yandex-music": "yandex-music", + "zapret": "zapret" } }, "systems": { @@ -139,6 +156,41 @@ "type": "file", "url": "https://music-desktop-application.s3.yandex.net/stable/Yandex_Music_x64_5.53.1.exe" } + }, + "zapret": { + "inputs": { + "nixpkgs": "nixpkgs_3", + "zapret-src": "zapret-src" + }, + "locked": { + "lastModified": 1749370165, + "narHash": "sha256-skgsajlryANTvfQqvOj/NMmQLFBI4a9VNspJxmAvwa8=", + "owner": "n0vvvonder", + "repo": "zapret-flake.nix", + "rev": "a5351f94da0f022ee0f18fc05819591014d59079", + "type": "github" + }, + "original": { + "owner": "n0vvvonder", + "repo": "zapret-flake.nix", + "type": "github" + } + }, + "zapret-src": { + "flake": false, + "locked": { + "lastModified": 1724486371, + "narHash": "sha256-wnjRnUhdPBHrrk+LwhEbmKm1OyfwcLCbf2H4morw5vY=", + "owner": "bol-van", + "repo": "zapret", + "rev": "faea968cd4ab24887236051ad4bcbbd0a824c734", + "type": "github" + }, + "original": { + "owner": "bol-van", + "repo": "zapret", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index c938c16..d8e686a 100644 --- a/flake.nix +++ b/flake.nix @@ -13,9 +13,10 @@ url = "github:nix-community/home-manager/master"; inputs.nixpkgs.follows = "nixpkgs"; }; + zapret.url = "github:n0vvvonder/zapret-flake.nix"; }; - outputs = { self, nixpkgs, impermanence, home-manager, ...}@inputs: { + outputs = { self, nixpkgs, impermanence, home-manager, zapret, ...}@inputs: { nixosConfigurations = { Ratchet = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; @@ -49,6 +50,7 @@ ./desktop/gnome.nix ./misc/disable_suspend.nix home-manager.nixosModules.home-manager + zapret.nixosModules.zapret { home-manager.useUserPackages = true; home-manager.users.yaroslav = import ./home/yaroslav/Aphelion/Aphelion.nix; diff --git a/hosts/generic/zapret.nix b/hosts/generic/zapret.nix index e68c0db..6d28174 100644 --- a/hosts/generic/zapret.nix +++ b/hosts/generic/zapret.nix @@ -1,11 +1,7 @@ { ... }: { - services.zapret = { - enable = true; - params = [ - "--dpi-desync=fake,disorder2" - "--dpi-desync-ttl=1" - "--dpi-desync-autottl=2" - ]; - }; + services.zapret2 = { + enable = true; +# configureFirewall = false; + }; }