rewrite networking modules

modules/default.nix

@@ -3,8 +3,8 @@
     ./shell
     ./desktop
     ./hardware
-    ./firewall.nix
     ./de
+    ./net
     ./input
     ./media
     ./graphics.nix

modules/desktop/default.nix

@@ -9,7 +9,6 @@ with lib; {
     ./gaming.nix
     ./syncthing.nix
     ./kdeconnect.nix
-    ./networking.nix
     ./social.nix
   ];
 

modules/desktop/networking.nix

@@ -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
-      ];
-    };
-  };
-}

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
+    ];
+  };
+}

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))
+    )
+  );
+}

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"
+    ];
+  };
+}