From db705e6c84de12784e5f865e19bd30defcedd2a3 Mon Sep 17 00:00:00 2001 From: Jake Ginesin Date: Sat, 28 Jun 2025 04:59:14 -0400 Subject: [PATCH] 456 current 2025-06-28 04:58:50 25.05.20250424.f771eb4 6.12.24 * --- home/programs/zsh/zshrc | 1 + system/networking/blockers.sh | 32 +++++++++++++++++++++++++++++--- system/networking/default.nix | 12 ++++++------ 3 files changed, 36 insertions(+), 9 deletions(-) diff --git a/home/programs/zsh/zshrc b/home/programs/zsh/zshrc index 749e9e7..cf42b2a 100644 --- a/home/programs/zsh/zshrc +++ b/home/programs/zsh/zshrc @@ -207,6 +207,7 @@ alias wt="systemctl restart NetworkManager" alias syncthing="firefox localhost:8384" alias htop="btop" # of course alias top="btop" # of course +alias activecon="nmcli -t -f name connection show --active" stack() { find . -type f -exec echo -e "\n--- {} ---\n" \; -exec cat {} \; diff --git a/system/networking/blockers.sh b/system/networking/blockers.sh index efdeb99..65d5275 100644 --- a/system/networking/blockers.sh +++ b/system/networking/blockers.sh @@ -1,8 +1,34 @@ #!/usr/bin/env bash -websites=("www.reddit.com" "reddit.com" "www.youtube.com" "youtube.com" "www.instagram.com" "instagram.com" "www.facebook.com" "facebook.com" "www.craigslist.org" "craigslist.org" "www.ebay.com" "ebay.com" "www.monkeytype.com" "monkeytype.com" "www.typeracer.com" "typeracer.com" "www.twitter.com" "twitter.com" "www.linkedin.com" "linkedin.com" "tinder.com") +blacklist=( +"NUWave" +) + +should_block=false +for ssid in "${blacklist[@]}"; do + if [[ "$CONNECTION_ID" == "$ssid" ]]; then + should_block=true + break + fi +done + +$should_block || exit 0 + +websites=("www.reddit.com" "www.youtube.com" "www.instagram.com" "www.facebook.com" "facebook.com" "www.craigslist.org" "www.ebay.com" "www.monkeytype.com" "www.typeracer.com" "www.twitter.com" "www.linkedin.com") + +op="" +if [ "$2" == "up" ]; then + op="on" +elif ["$2" == "pre-down" ]; then + op="off" +else + exit 1; +fi for website in ${websites[@]}; do - grep -v "$website" /etc/hosts > "$tempHosts" - mv "$tempHosts" /etc/hosts + sh /etc/profiles/per-user/synchronous/bin/dnsblock-norestart "$op" "$website" + # grep -v "$website" /etc/hosts > "$tempHosts" + # mv "$tempHosts" /etc/hosts done + +sudo systemctl restart dnsmasq diff --git a/system/networking/default.nix b/system/networking/default.nix index 4d4cc93..21bc77e 100644 --- a/system/networking/default.nix +++ b/system/networking/default.nix @@ -14,12 +14,12 @@ networkmanager = { enable = true; - # dispatcherScripts = [ - # { - # source = ./blockers.sh; - # type = "basic"; - # } - # ]; + dispatcherScripts = [ + { + source = ./blockers.sh; + type = "basic"; + } + ]; }; # interfaces = {