From 0bbb0aa204bae158ae61b428673e2b5de14b27f2 Mon Sep 17 00:00:00 2001 From: Schrottkatze Date: Thu, 27 Mar 2025 20:18:54 +0100 Subject: [PATCH] rewrite networking modules --- modules/default.nix | 2 +- modules/desktop/default.nix | 1 - modules/desktop/networking.nix | 69 ------------------- modules/net/default.nix | 17 +++++ modules/net/dispatchers/default.nix | 27 ++++++++ .../net/dispatchers}/dispatcher.nu | 0 .../net/dispatchers/hooks}/WIFI@DB.nu | 0 .../net/dispatchers/hooks}/WIFIonICE.nu | 0 .../net/dispatchers/hooks}/ccchh.nu | 0 modules/{ => net}/firewall.nix | 0 modules/net/hosts.nix | 24 +++++++ 11 files changed, 69 insertions(+), 71 deletions(-) delete mode 100644 modules/desktop/networking.nix create mode 100644 modules/net/default.nix create mode 100644 modules/net/dispatchers/default.nix rename {other/scripts => modules/net/dispatchers}/dispatcher.nu (100%) rename {other/scripts/networkhooks => modules/net/dispatchers/hooks}/WIFI@DB.nu (100%) rename {other/scripts/networkhooks => modules/net/dispatchers/hooks}/WIFIonICE.nu (100%) rename {other/scripts/networkhooks => modules/net/dispatchers/hooks}/ccchh.nu (100%) rename modules/{ => net}/firewall.nix (100%) create mode 100644 modules/net/hosts.nix diff --git a/modules/default.nix b/modules/default.nix index 2abba8e..44c9a43 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -3,8 +3,8 @@ ./shell ./desktop ./hardware - ./firewall.nix ./de + ./net ./input ./media ./graphics.nix diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix index 7213f3b..ad4114d 100644 --- a/modules/desktop/default.nix +++ b/modules/desktop/default.nix @@ -9,7 +9,6 @@ with lib; { ./gaming.nix ./syncthing.nix ./kdeconnect.nix - ./networking.nix ./social.nix ]; diff --git a/modules/desktop/networking.nix b/modules/desktop/networking.nix deleted file mode 100644 index d32d49b..0000000 --- a/modules/desktop/networking.nix +++ /dev/null @@ -1,69 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: let - addNuShebang = path: - builtins.concatStringsSep "\n\n" [ - "#!${pkgs.nushell}/bin/nu" - (builtins.readFile path) - ]; -in { - config = { - networking = { - networkmanager = { - wifi.backend = "wpa_supplicant"; - dispatcherScripts = [ - { - type = "basic"; - source = pkgs.writeText "dispatcher" (addNuShebang ../../other/scripts/dispatcher.nu); - } - ]; - }; - hosts = { - "127.0.0.1" = [ - "www.tiktok.com" - "www.twitter.com" - "www.instagram.com" - "www.facebook.com" - "www.snapchat.com" - - "tiktok.com" - "twitter.com" - "instagram.com" - "facebook.com" - "snapchat.com" - - "google-analytics.com" - "stats.g.doubleclick.net" - "googleadservices.com" - "googletagmanager.com" - "googletagservices.com" - "googlesyndication.com" - ]; - }; - }; - environment.etc = with builtins; ( - listToAttrs ( - map (v: { - name = "networkhooks/${v}"; - value = { - text = addNuShebang ../../other/scripts/networkhooks/${v}; - mode = "0755"; - }; - }) - (attrNames (readDir ../../other/scripts/networkhooks)) - ) - ); - systemd.services."NetworkManager-wait-online".enable = false; - services.mullvad-vpn.enable = true; - home-manager.users.jade = {pkgs, ...}: { - home.packages = with pkgs; [ - networkmanagerapplet - mullvad-vpn - macchanger - ]; - }; - }; -} diff --git a/modules/net/default.nix b/modules/net/default.nix new file mode 100644 index 0000000..3bbc4af --- /dev/null +++ b/modules/net/default.nix @@ -0,0 +1,17 @@ +{...}: { + imports = [ + ./firewall.nix + ./hosts.nix + ./dispatchers + ]; + networking.networkmanager.wifi.backend = "wpa_supplicant"; + systemd.services."NetworkManager-wait-online".enable = false; + services.mullvad-vpn.enable = true; + home-manager.users.jade = {pkgs, ...}: { + home.packages = with pkgs; [ + networkmanagerapplet + mullvad-vpn + macchanger + ]; + }; +} diff --git a/modules/net/dispatchers/default.nix b/modules/net/dispatchers/default.nix new file mode 100644 index 0000000..656d9cd --- /dev/null +++ b/modules/net/dispatchers/default.nix @@ -0,0 +1,27 @@ +{pkgs, ...}: let + addNuShebang = path: + builtins.concatStringsSep "\n\n" [ + "#!${pkgs.nushell}/bin/nu" + (builtins.readFile path) + ]; +in { + networking.networkmanager.dispatcherScripts = [ + { + type = "basic"; + source = pkgs.writeText "dispatcher" (addNuShebang ./dispatcher.nu); + } + ]; + + environment.etc = with builtins; ( + listToAttrs ( + map (v: { + name = "networkhooks/${v}"; + value = { + text = addNuShebang ./hooks/${v}; + mode = "0755"; + }; + }) + (attrNames (readDir ./hooks)) + ) + ); +} diff --git a/other/scripts/dispatcher.nu b/modules/net/dispatchers/dispatcher.nu similarity index 100% rename from other/scripts/dispatcher.nu rename to modules/net/dispatchers/dispatcher.nu diff --git a/other/scripts/networkhooks/WIFI@DB.nu b/modules/net/dispatchers/hooks/WIFI@DB.nu similarity index 100% rename from other/scripts/networkhooks/WIFI@DB.nu rename to modules/net/dispatchers/hooks/WIFI@DB.nu diff --git a/other/scripts/networkhooks/WIFIonICE.nu b/modules/net/dispatchers/hooks/WIFIonICE.nu similarity index 100% rename from other/scripts/networkhooks/WIFIonICE.nu rename to modules/net/dispatchers/hooks/WIFIonICE.nu diff --git a/other/scripts/networkhooks/ccchh.nu b/modules/net/dispatchers/hooks/ccchh.nu similarity index 100% rename from other/scripts/networkhooks/ccchh.nu rename to modules/net/dispatchers/hooks/ccchh.nu diff --git a/modules/firewall.nix b/modules/net/firewall.nix similarity index 100% rename from modules/firewall.nix rename to modules/net/firewall.nix diff --git a/modules/net/hosts.nix b/modules/net/hosts.nix new file mode 100644 index 0000000..1bfb877 --- /dev/null +++ b/modules/net/hosts.nix @@ -0,0 +1,24 @@ +{...}: { + networking.hosts = { + "127.0.0.1" = [ + "www.tiktok.com" + "www.twitter.com" + "www.instagram.com" + "www.facebook.com" + "www.snapchat.com" + + "tiktok.com" + "twitter.com" + "instagram.com" + "facebook.com" + "snapchat.com" + + "google-analytics.com" + "stats.g.doubleclick.net" + "googleadservices.com" + "googletagmanager.com" + "googletagservices.com" + "googlesyndication.com" + ]; + }; +}