modules: move shared pc modules from desktop to pc

8 files changed, 1 insertions, 150 deletions

diff --git a/modules/desktop/networking/default.nix b/modules/desktop/networking/default.nix
index e6f5b03..d91b90d 100644
--- a/modules/desktop/networking/default.nix
+++ b/modules/desktop/networking/default.nix
@@ -1,21 +1,8 @@
 {
   imports = [
     ./caddy.nix
-    ./dhcpcd.nix
     ./i2p.nix
     ./ipv6.nix
-    ./loopback.nix
-    ./networkmanager.nix
-    ./optimise.nix
-    ./pia.nix
     ./tor.nix
-    ./upnp.nix
   ];
-
-  # https://discourse.nixos.org/t/rebuild-error-failed-to-start-network-manager-wait-online/41977/2
-  systemd.network.wait-online.enable = false;
-  boot.initrd.systemd.network.wait-online.enable = false;
-
-  # https://discourse.nixos.org/t/how-to-disable-networkmanager-wait-online-service-in-the-configuration-file/19963/2
-  systemd.services.NetworkManager-wait-online.enable = false;
 }
diff --git a/modules/desktop/networking/dhcpcd.nix b/modules/desktop/networking/dhcpcd.nix
deleted file mode 100644
index f46b657..0000000
--- a/modules/desktop/networking/dhcpcd.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  networking.dhcpcd = {
-    wait = "background";
-
-    extraConfig = ''
-      noarp
-      nooption domain_name_servers, domain_name, domain_search, host_name
-      nooption ntp_servers
-      nohook resolv.conf, wpa_supplicant
-    '';
-  };
-}
diff --git a/modules/desktop/networking/i2p.nix b/modules/desktop/networking/i2p.nix
index 8bca73e..92fb657 100644
--- a/modules/desktop/networking/i2p.nix
+++ b/modules/desktop/networking/i2p.nix
@@ -1,5 +1,5 @@
 {
-  # https://voidcruiser.nl/rambles/i2p-on-nixos/
+  # <https://voidcruiser.nl/rambles/i2p-on-nixos/>
   containers.i2pd = {
     autoStart = true;
 
diff --git a/modules/desktop/networking/loopback.nix b/modules/desktop/networking/loopback.nix
deleted file mode 100644
index 62e745e..0000000
--- a/modules/desktop/networking/loopback.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ config, ... }:
-{
-  boot = {
-    kernelModules = [ "v4l2loopback" ];
-    extraModulePackages = with config.boot.kernelPackages; [ v4l2loopback ];
-  };
-}
diff --git a/modules/desktop/networking/networkmanager.nix b/modules/desktop/networking/networkmanager.nix
deleted file mode 100644
index 7ef0e04..0000000
--- a/modules/desktop/networking/networkmanager.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ pkgs, ... }:
-{
-  environment.systemPackages = [ pkgs.networkmanagerapplet ];
-
-  networking.networkmanager = {
-    enable = true;
-    plugins = [ pkgs.networkmanager-openvpn ];
-    dns = "none"; # "systemd-resolved"
-    wifi.backend = "iwd";
-
-    unmanaged = [
-      "interface-name:tailscale*"
-      "interface-name:br-*"
-      "interface-name:rndis*"
-      "interface-name:docker*"
-      "interface-name:virbr*"
-      "interface-name:vboxnet*"
-      "interface-name:waydroid*"
-      "type:bridge"
-    ];
-  };
-}
diff --git a/modules/desktop/networking/optimise.nix b/modules/desktop/networking/optimise.nix
deleted file mode 100644
index c6f2bec..0000000
--- a/modules/desktop/networking/optimise.nix
+++ /dev/null
@@ -1,73 +0,0 @@
-{
-  boot = {
-    kernelModules = [
-      "tls"
-      "tcp_bbr"
-    ];
-
-    kernel.sysctl = {
-      # TCP hardening
-      # Prevent bogus ICMP errors from filling up logs.
-      "net.ipv4.icmp_ignore_bogus_error_responses" = 1;
-      # Reverse path filtering causes the kernel to do source validation of
-      # packets received from all interfaces. This can mitigate IP spoofing.
-      "net.ipv4.conf.default.rp_filter" = 1;
-      "net.ipv4.conf.all.rp_filter" = 1;
-      # Do not accept IP source route packets (we're not a router)
-      "net.ipv4.conf.all.accept_source_route" = 0;
-      "net.ipv6.conf.all.accept_source_route" = 0;
-      # Don't send ICMP redirects (again, we're on a router)
-      "net.ipv4.conf.all.send_redirects" = 0;
-      "net.ipv4.conf.default.send_redirects" = 0;
-      # Refuse ICMP redirects (MITM mitigations)
-      "net.ipv4.conf.all.accept_redirects" = 0;
-      "net.ipv4.conf.default.accept_redirects" = 0;
-      "net.ipv4.conf.all.secure_redirects" = 0;
-      "net.ipv4.conf.default.secure_redirects" = 0;
-      "net.ipv6.conf.all.accept_redirects" = 0;
-      "net.ipv6.conf.default.accept_redirects" = 0;
-      # Protects against SYN flood attacks
-      "net.ipv4.tcp_syncookies" = 1;
-      # Incomplete protection again TIME-WAIT assassination
-      "net.ipv4.tcp_rfc1337" = 1;
-      # And other stuff
-      "net.ipv4.conf.all.log_martians" = true;
-      "net.ipv4.conf.default.log_martians" = true;
-      "net.ipv4.icmp_echo_ignore_broadcasts" = true;
-      "net.ipv6.conf.default.accept_ra" = 0;
-      "net.ipv6.conf.all.accept_ra" = 0;
-      "net.ipv4.tcp_timestamps" = 0;
-
-      # TCP optimization
-      # TCP Fast Open is a TCP extension that reduces network latency by packing
-      # data in the sender’s initial TCP SYN. Setting 3 = enable TCP Fast Open for
-      # both incoming and outgoing connections:
-      "net.ipv4.tcp_fastopen" = 3;
-      # Bufferbloat mitigations + slight improvement in throughput & latency
-      "net.ipv4.tcp_congestion_control" = "bbr";
-      "net.core.default_qdisc" = "cake";
-
-      # Other stuff that I am too lazy to document
-      "net.core.optmem_max" = 65536;
-      "net.core.rmem_default" = 1048576;
-      "net.core.rmem_max" = 16777216;
-      "net.core.somaxconn" = 8192;
-      "net.core.wmem_default" = 1048576;
-      "net.core.wmem_max" = 16777216;
-      "net.ipv4.ip_local_port_range" = "16384 65535";
-      "net.ipv4.tcp_max_syn_backlog" = 8192;
-      "net.ipv4.tcp_max_tw_buckets" = 2000000;
-      "net.ipv4.tcp_mtu_probing" = 1;
-      "net.ipv4.tcp_rmem" = "4096 1048576 2097152";
-      "net.ipv4.tcp_slow_start_after_idle" = 0;
-      "net.ipv4.tcp_tw_reuse" = 1;
-      "net.ipv4.tcp_wmem" = "4096 65536 16777216";
-      "net.ipv4.udp_rmem_min" = 8192;
-      "net.ipv4.udp_wmem_min" = 8192;
-      "net.netfilter.nf_conntrack_generic_timeout" = 60;
-      "net.netfilter.nf_conntrack_max" = 1048576;
-      "net.netfilter.nf_conntrack_tcp_timeout_established" = 600;
-      "net.netfilter.nf_conntrack_tcp_timeout_time_wait" = 1;
-    };
-  };
-}
diff --git a/modules/desktop/networking/pia.nix b/modules/desktop/networking/pia.nix
deleted file mode 100644
index d52dbf8..0000000
--- a/modules/desktop/networking/pia.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ secrets, ... }:
-{
-  services.pia = {
-    enable = true;
-
-    authUserPass = {
-      inherit (secrets.pia) username password;
-    };
-  };
-}
diff --git a/modules/desktop/networking/upnp.nix b/modules/desktop/networking/upnp.nix
deleted file mode 100644
index 998592a..0000000
--- a/modules/desktop/networking/upnp.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  services.miniupnpd = {
-    enable = true;
-    natpmp = true;
-    externalInterface = "enp42s0";
-
-    internalIPs = [
-      "enp42s0"
-      "wlan0"
-    ];
-  };
-}