From f3657271d6ea2408d812d32eea9862b61e49f5d8 Mon Sep 17 00:00:00 2001
From: Franck Cuny <franck@fcuny.net>
Date: Tue, 5 Apr 2022 20:12:56 -0700
Subject: refactor network configuration

---
 hosts/aptos/networking.nix              | 22 +++++++++++++++++++---
 hosts/carmel/networking.nix             | 20 +++++++++++++++++++-
 hosts/common/system/default.nix         |  2 +-
 hosts/common/system/network.nix         | 19 -------------------
 hosts/sound.nix                         |  1 -
 hosts/tahoe/networking.nix              | 22 +++++++++++++++++++---
 modules/hardware/default.nix            |  2 +-
 modules/hardware/networking/default.nix | 11 +++++++++++
 8 files changed, 70 insertions(+), 29 deletions(-)
 delete mode 100644 hosts/common/system/network.nix
 delete mode 100644 hosts/sound.nix
 create mode 100644 modules/hardware/networking/default.nix

diff --git a/hosts/aptos/networking.nix b/hosts/aptos/networking.nix
index ed5e175..111fbe7 100644
--- a/hosts/aptos/networking.nix
+++ b/hosts/aptos/networking.nix
@@ -1,4 +1,6 @@
-{ ... }: {
+{ lib, ... }:
+
+{
   # Use systemd-networkd for networking
   systemd.network = {
     enable = true;
@@ -15,8 +17,22 @@
     };
   };
 
-  networking.wireless.iwd.enable = true;
-  networking.private-wireguard.enable = true;
+  networking = {
+    hostName = "aptos";
+    useNetworkd = true;
+    useDHCP = false;
+    private-wireguard.enable = true;
+  };
+
+  services.nscd.enable = false;
+  system.nssModules = lib.mkForce [ ];
+
+  # Use systemd-resolved
+  services.resolved = {
+    enable = true;
+    dnssec = "false";
+  };
 
+  my.hardware.networking.wireless.enable = true;
   my.services.tailscale.enable = true;
 }
diff --git a/hosts/carmel/networking.nix b/hosts/carmel/networking.nix
index f4a1c6f..8ad9d3e 100644
--- a/hosts/carmel/networking.nix
+++ b/hosts/carmel/networking.nix
@@ -1,4 +1,6 @@
-{ ... }: {
+{ lib, ... }:
+
+{
   # Use systemd-networkd for networking
   systemd.network = {
     enable = true;
@@ -14,4 +16,20 @@
       };
     };
   };
+
+  services.nscd.enable = false;
+  system.nssModules = lib.mkForce [ ];
+
+  # Use systemd-resolved
+  services.resolved = {
+    enable = true;
+    dnssec = "false";
+  };
+
+  networking = {
+    hostName = "carmel";
+    useNetworkd = true;
+    useDHCP = false;
+    private-wireguard.enable = true;
+  };
 }
diff --git a/hosts/common/system/default.nix b/hosts/common/system/default.nix
index 9b2a7e4..8ccb80f 100644
--- a/hosts/common/system/default.nix
+++ b/hosts/common/system/default.nix
@@ -1,5 +1,5 @@
 { pkgs, ... }:
 
 {
-  imports = [ ./boot.nix ./hardware.nix ./network.nix ];
+  imports = [ ./boot.nix ./hardware.nix ];
 }
diff --git a/hosts/common/system/network.nix b/hosts/common/system/network.nix
deleted file mode 100644
index df5aa27..0000000
--- a/hosts/common/system/network.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ config, pkgs, lib, hostname, ... }:
-
-{
-  networking = {
-    hostName = hostname;
-    useNetworkd = true;
-    wireless.enable = false;
-    useDHCP = false;
-  };
-
-  services.nscd.enable = false;
-  system.nssModules = lib.mkForce [ ];
-
-  # Use systemd-resolved
-  services.resolved = {
-    enable = true;
-    dnssec = "false";
-  };
-}
diff --git a/hosts/sound.nix b/hosts/sound.nix
deleted file mode 100644
index 947f9cd..0000000
--- a/hosts/sound.nix
+++ /dev/null
@@ -1 +0,0 @@
-{ ... }: { my.hardware.sound = { pipewire = { enable = true; }; }; }
diff --git a/hosts/tahoe/networking.nix b/hosts/tahoe/networking.nix
index 1b0568e..22a7251 100644
--- a/hosts/tahoe/networking.nix
+++ b/hosts/tahoe/networking.nix
@@ -1,4 +1,6 @@
-{ ... }: {
+{ lib, ... }:
+
+{
   # Use systemd-networkd for networking
   systemd.network = {
     enable = true;
@@ -15,8 +17,22 @@
     };
   };
 
-  networking.private-wireguard.enable = true;
-  networking.firewall.enable = false;
+  networking = {
+    hostName = "tahoe";
+    useNetworkd = true;
+    useDHCP = false;
+    private-wireguard.enable = true;
+    firewall.enable = false;
+  };
+
+  services.nscd.enable = false;
+  system.nssModules = lib.mkForce [ ];
+
+  # Use systemd-resolved
+  services.resolved = {
+    enable = true;
+    dnssec = "false";
+  };
 
   my.services.tailscale.enable = true;
 }
diff --git a/modules/hardware/default.nix b/modules/hardware/default.nix
index 79b062e..73b6fbd 100644
--- a/modules/hardware/default.nix
+++ b/modules/hardware/default.nix
@@ -1,5 +1,5 @@
 { ... }:
 
 {
-  imports = [ ./sound ];
+  imports = [ ./sound ./networking ];
 }
diff --git a/modules/hardware/networking/default.nix b/modules/hardware/networking/default.nix
new file mode 100644
index 0000000..d19388b
--- /dev/null
+++ b/modules/hardware/networking/default.nix
@@ -0,0 +1,11 @@
+{ config, lib, ... }:
+let cfg = config.my.hardware.networking;
+in {
+  options.my.hardware.networking = with lib; {
+    wireless = { enable = mkEnableOption "wireless configuration"; };
+  };
+
+  config = lib.mkMerge [
+    (lib.mkIf cfg.wireless.enable { networking.wireless.iwd.enable = true; })
+  ];
+}
-- 
cgit 1.4.1