diff options
| -rw-r--r-- | modules/scripts/default.nix | 2 | ||||
| -rw-r--r-- | modules/scripts/warp-start.sh | 71 | ||||
| -rw-r--r-- | modules/scripts/warp-stop.sh | 57 | ||||
| -rw-r--r-- | modules/tools/cloudflare-warp/default.nix | 18 | ||||
| -rw-r--r-- | modules/tools/default.nix | 1 | ||||
| -rw-r--r-- | users/arpit.nix | 1 |
6 files changed, 0 insertions, 150 deletions
diff --git a/modules/scripts/default.nix b/modules/scripts/default.nix index f034032..927b36c 100644 --- a/modules/scripts/default.nix +++ b/modules/scripts/default.nix @@ -30,8 +30,6 @@ && config.tools.tmux.enable && config.tools.kitty.enable ) (shellScript ./system-monitor.sh); - "scripts/warp-start" = lib.mkIf config.tools.cloudflare-warp.enable (shellScript ./warp-start.sh); - "scripts/warp-stop" = lib.mkIf config.tools.cloudflare-warp.enable (shellScript ./warp-stop.sh); }; }; } diff --git a/modules/scripts/warp-start.sh b/modules/scripts/warp-start.sh deleted file mode 100644 index bafbe84..0000000 --- a/modules/scripts/warp-start.sh +++ /dev/null @@ -1,71 +0,0 @@ -set -euo pipefail - -LOGFILE="/var/log/warp-svc.log" -DAEMON_TIMEOUT=30 # seconds - -start_daemon() { - if ! pgrep -x warp-svc >/dev/null 2>&1; then - echo "Starting warp-svc daemon..." - sudo nohup warp-svc >>"$LOGFILE" 2>&1 & - else - echo "warp-svc already running." - fi -} - -wait_for_daemon() { - echo "Waiting for warp-svc to become ready..." - for ((i=1; i<=DAEMON_TIMEOUT; i++)); do - if warp-cli status >/dev/null 2>&1; then - echo "warp-svc is ready." - return 0 - fi - sleep 1 - done - - echo "ERROR: warp-svc did not become ready within ${DAEMON_TIMEOUT}s" >&2 - exit 1 -} - -is_registered() { - if warp-cli status 2>&1 | grep -qi "Registration missing"; then - return 1 - fi - return 0 -} - -register_client() { - echo "Registering client..." - sudo warp-cli registration new -} - -connect_client() { - echo "Connecting to WARP..." - sudo warp-cli connect -} - -main() { - [[ "${EUID:-$(id -u)}" -eq 0 ]] || { - if [[ -t 2 ]]; then - echo -e "\e[31mERROR:\e[0m Must be run as root" >&2 - else - echo "ERROR: Must be run as root" >&2 - fi - exit 1 - } - - start_daemon - wait_for_daemon - - if ! is_registered; then - register_client - else - echo "Client already registered." - fi - - connect_client - - echo "Current status:" - warp-cli status -} - -main diff --git a/modules/scripts/warp-stop.sh b/modules/scripts/warp-stop.sh deleted file mode 100644 index 95fdc7e..0000000 --- a/modules/scripts/warp-stop.sh +++ /dev/null @@ -1,57 +0,0 @@ -set -euo pipefail - -stop_daemon() { - echo "Stopping warp-svc process..." - - if pgrep -x warp-svc >/dev/null 2>&1; then - sudo pkill -x warp-svc - else - echo "warp-svc is not running." - return 0 - fi - - echo "Waiting for warp-svc to stop..." - for _ in {1..30}; do - if ! pgrep -x warp-svc >/dev/null 2>&1; then - echo "warp-svc stopped." - return 0 - fi - sleep 1 - done - - echo "ERROR: warp-svc did not stop in time" >&2 - exit 1 -} - -disconnect_client() { - echo "Disconnecting from WARP..." - if warp-cli status 2>&1 | grep -qi "Connected"; then - sudo warp-cli disconnect - echo "Disconnected." - else - echo "WARP is already disconnected." - fi -} - -main() { - [[ "${EUID:-$(id -u)}" -eq 0 ]] || { - if [[ -t 2 ]]; then - echo -e "\e[31mERROR:\e[0m Must be run as root" >&2 - else - echo "ERROR: Must be run as root" >&2 - fi - exit 1 - } - - disconnect_client - stop_daemon - - echo "Final status:" - warp-cli status || true - - echo "Flushing DNS and restarting systemd-resolved..." - sudo systemd-resolve --flush-caches - sudo systemctl restart systemd-resolved -} - -main "$@" diff --git a/modules/tools/cloudflare-warp/default.nix b/modules/tools/cloudflare-warp/default.nix deleted file mode 100644 index b2546a4..0000000 --- a/modules/tools/cloudflare-warp/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ - config, - pkgs, - lib, - ... -}: - -{ - options.tools.cloudflare-warp = { - enable = lib.mkEnableOption "Enables CloudFlare Warp VPN."; - }; - - config = lib.mkIf config.tools.cloudflare-warp.enable { - home.packages = with pkgs; [ - cloudflare-warp - ]; - }; -} diff --git a/modules/tools/default.nix b/modules/tools/default.nix index 5055d9e..f6a4795 100644 --- a/modules/tools/default.nix +++ b/modules/tools/default.nix @@ -7,7 +7,6 @@ ./bottles ./bottom ./brightnessctl - ./cloudflare-warp ./devenv ./fastfetch ./feh diff --git a/users/arpit.nix b/users/arpit.nix index c781e57..71e809e 100644 --- a/users/arpit.nix +++ b/users/arpit.nix @@ -16,7 +16,6 @@ tools.bottles.enable = true; tools.bottom.enable = true; tools.brightnessctl.enable = true; - tools.cloudflare-warp.enable = true; tools.devenv.enable = true; tools.fastfetch.enable = true; tools.feh.enable = true; |
