From 05bf499beaab80fcfa69c2af0eaf16c952e8b8cc Mon Sep 17 00:00:00 2001
From: Fuwn <contact@fuwn.me>
Date: Mon, 23 Sep 2024 04:18:52 -0700
Subject: modules: move shared modules to core

---
 modules/core/default.nix                    |  2 +-
 modules/core/networking/default.nix         | 22 ++++++++++++++++++
 modules/core/networking/tailscale.nix       | 35 +++++++++++++++++++++++++++++
 modules/core/tailscale.nix                  | 35 -----------------------------
 modules/desktop/networking/default.nix      | 20 +----------------
 modules/desktop/software/access/default.nix |  1 -
 modules/desktop/software/access/mosh.nix    |  6 -----
 modules/server/networking/default.nix       |  1 -
 8 files changed, 59 insertions(+), 63 deletions(-)
 create mode 100644 modules/core/networking/default.nix
 create mode 100644 modules/core/networking/tailscale.nix
 delete mode 100644 modules/core/tailscale.nix
 delete mode 100644 modules/desktop/software/access/mosh.nix

(limited to 'modules')

diff --git a/modules/core/default.nix b/modules/core/default.nix
index b086a28..a798030 100644
--- a/modules/core/default.nix
+++ b/modules/core/default.nix
@@ -1,8 +1,8 @@
 {
   imports = [
+    ./networking
     ./nix
     ./sops.nix
-    ./tailscale.nix
   ];
 
   programs.mosh = {
diff --git a/modules/core/networking/default.nix b/modules/core/networking/default.nix
new file mode 100644
index 0000000..5e53759
--- /dev/null
+++ b/modules/core/networking/default.nix
@@ -0,0 +1,22 @@
+{ secrets, ... }:
+{
+  imports = [ ./tailscale.nix ];
+
+  networking = {
+    nftables.enable = true;
+
+    nameservers = [
+      "45.90.28.0#${secrets.nextdns_id}.dns.nextdns.io"
+      "2a07:a8c0::#${secrets.nextdns_id}.dns.nextdns.io"
+      "45.90.30.0#${secrets.nextdns_id}.dns.nextdns.io"
+      "2a07:a8c1::#${secrets.nextdns_id}.dns.nextdns.io"
+    ];
+
+    timeServers = [
+      "0.nixos.pool.ntp.org"
+      "1.nixos.pool.ntp.org"
+      "2.nixos.pool.ntp.org"
+      "3.nixos.pool.ntp.org"
+    ];
+  };
+}
diff --git a/modules/core/networking/tailscale.nix b/modules/core/networking/tailscale.nix
new file mode 100644
index 0000000..0228915
--- /dev/null
+++ b/modules/core/networking/tailscale.nix
@@ -0,0 +1,35 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+{
+  networking.firewall.trustedInterfaces = [ "${config.services.tailscale.interfaceName}" ];
+
+  # <https://tailscale.com/kb/1019/subnets/?tab=linux#step-1-install-the-tailscale-client>
+  boot.kernel.sysctl = {
+    "net.ipv4.ip_forward" = true;
+    "net.ipv6.conf.all.forwarding" = true;
+  };
+
+  services = {
+    tailscale = {
+      enable = true;
+      useRoutingFeatures = "both";
+      authKeyFile = config.sops.secrets.tailscale_authentication_key.path;
+    };
+
+    networkd-dispatcher = {
+      enable = true;
+
+      rules."50-tailscale" = {
+        onState = [ "routable" ];
+
+        script = ''
+          ${lib.getExe pkgs.ethtool} -K enp42s0 rx-udp-gro-forwarding on rx-gro-list off
+        '';
+      };
+    };
+  };
+}
diff --git a/modules/core/tailscale.nix b/modules/core/tailscale.nix
deleted file mode 100644
index 0228915..0000000
--- a/modules/core/tailscale.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-{
-  networking.firewall.trustedInterfaces = [ "${config.services.tailscale.interfaceName}" ];
-
-  # <https://tailscale.com/kb/1019/subnets/?tab=linux#step-1-install-the-tailscale-client>
-  boot.kernel.sysctl = {
-    "net.ipv4.ip_forward" = true;
-    "net.ipv6.conf.all.forwarding" = true;
-  };
-
-  services = {
-    tailscale = {
-      enable = true;
-      useRoutingFeatures = "both";
-      authKeyFile = config.sops.secrets.tailscale_authentication_key.path;
-    };
-
-    networkd-dispatcher = {
-      enable = true;
-
-      rules."50-tailscale" = {
-        onState = [ "routable" ];
-
-        script = ''
-          ${lib.getExe pkgs.ethtool} -K enp42s0 rx-udp-gro-forwarding on rx-gro-list off
-        '';
-      };
-    };
-  };
-}
diff --git a/modules/desktop/networking/default.nix b/modules/desktop/networking/default.nix
index 060669a..37267c2 100644
--- a/modules/desktop/networking/default.nix
+++ b/modules/desktop/networking/default.nix
@@ -1,4 +1,3 @@
-{ secrets, ... }:
 {
   imports = [
     ./firewall
@@ -22,22 +21,5 @@
   # 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;
 
-  networking = {
-    hostName = "kansai";
-    nftables.enable = true;
-
-    nameservers = [
-      "45.90.28.0#${secrets.nextdns_id}.dns.nextdns.io"
-      "2a07:a8c0::#${secrets.nextdns_id}.dns.nextdns.io"
-      "45.90.30.0#${secrets.nextdns_id}.dns.nextdns.io"
-      "2a07:a8c1::#${secrets.nextdns_id}.dns.nextdns.io"
-    ];
-
-    timeServers = [
-      "0.nixos.pool.ntp.org"
-      "1.nixos.pool.ntp.org"
-      "2.nixos.pool.ntp.org"
-      "3.nixos.pool.ntp.org"
-    ];
-  };
+  networking.hostName = "kansai";
 }
diff --git a/modules/desktop/software/access/default.nix b/modules/desktop/software/access/default.nix
index 7db7629..32d5500 100644
--- a/modules/desktop/software/access/default.nix
+++ b/modules/desktop/software/access/default.nix
@@ -1,7 +1,6 @@
 {
   imports = [
     ./gnupg.nix
-    ./mosh.nix
     ./ssh.nix
   ];
 }
diff --git a/modules/desktop/software/access/mosh.nix b/modules/desktop/software/access/mosh.nix
deleted file mode 100644
index c9af5bf..0000000
--- a/modules/desktop/software/access/mosh.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  programs.mosh = {
-    enable = true;
-    openFirewall = false;
-  };
-}
diff --git a/modules/server/networking/default.nix b/modules/server/networking/default.nix
index 8f6c1d9..0446118 100644
--- a/modules/server/networking/default.nix
+++ b/modules/server/networking/default.nix
@@ -9,7 +9,6 @@
   networking = {
     hostName = "himeji";
     domain = "";
-    nftables.enable = true;
 
     firewall = {
       allowedUDPPorts = [ 53 ];
-- 
cgit v1.2.3