diff --git a/flake.lock b/flake.lock index 5c856bf..0c7a443 100644 --- a/flake.lock +++ b/flake.lock @@ -876,30 +876,12 @@ "nixpkgs": "nixpkgs_4", "nixpkgs-pinned": "nixpkgs-pinned", "nixpkgs-stable": "nixpkgs-stable", - "russia-blocked-geoip": "russia-blocked-geoip", "sops-nix": "sops-nix", "stylix": "stylix", "yazi": "yazi", "yazi-plugins": "yazi-plugins" } }, - "russia-blocked-geoip": { - "flake": false, - "locked": { - "lastModified": 1777481212, - "narHash": "sha256-NCkYOw4OM3xBv/TCmhGCm7lH+QkpetbUOYbQnOs9nRg=", - "owner": "runetfreedom", - "repo": "russia-blocked-geoip", - "rev": "bbe32b96712342ae479ac598fb1a939b59d586c2", - "type": "github" - }, - "original": { - "owner": "runetfreedom", - "repo": "russia-blocked-geoip", - "rev": "bbe32b96712342ae479ac598fb1a939b59d586c2", - "type": "github" - } - }, "rust-overlay": { "inputs": { "nixpkgs": [ diff --git a/flake.nix b/flake.nix index 6b936a1..9103c08 100644 --- a/flake.nix +++ b/flake.nix @@ -43,11 +43,6 @@ url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; }; - - russia-blocked-geoip = { - url = "github:runetfreedom/russia-blocked-geoip/bbe32b96712342ae479ac598fb1a939b59d586c2"; - flake = false; - }; }; outputs = { self, nixpkgs, nixpkgs-stable, nixpkgs-pinned, home-manager, ... }@inputs: let diff --git a/modules/host/vpn.nix b/modules/host/vpn.nix index a86caf3..6058899 100644 --- a/modules/host/vpn.nix +++ b/modules/host/vpn.nix @@ -1,24 +1,8 @@ -{ inputs, pkgs, config, ... }: { - systemd.services.v2raya = { +{ + programs.clash-verge = { enable = true; - description = "v2rayA gui client"; - after = [ "network.target" ]; - serviceConfig = { - Restart = "always"; - ExecStart = "${pkgs.v2raya}/bin/v2rayA"; - }; - path = with pkgs; [ iptables bash iproute2 ]; - wantedBy = [ "multi-user.target" ]; - environment = { - V2RAYA_LOG_FILE = "/var/log/v2raya/v2raya.log"; - V2RAYA_V2RAY_BIN = pkgs.lib.getExe pkgs.xray; - V2RAY_LOCATION_ASSET = "/etc/v2raya"; - XRAY_LOCATION_ASSET = "/etc/v2raya"; - }; - }; - - environment.etc = { - "v2raya/ru_geoip.dat".source = "${inputs.russia-blocked-geoip}/geoip.dat"; - "v2raya/bolt.db".source = config.sops.secrets.vpn_bolt.path; + serviceMode = true; + tunMode = true; + autoStart = true; }; }