modules: hardware: move 'networking'

machines/aramis/networking.nix

@@ -15,9 +15,11 @@
     };
   };
 
+  my.hardware.networking = {
     # Which interface is used to connect to the internet
-  my.networking.externalInterface = "enp0s3";
+    externalInterface = "enp0s3";
 
     # Enable WiFi integration
-  my.networking.wireless.enable = true;
+    wireless.enable = true;
+  };
 }

machines/porthos/networking.nix

@@ -31,5 +31,5 @@
   };
 
   # Which interface is used to connect to the internet
-  my.networking.externalInterface = "eth0";
+  my.hardware.networking.externalInterface = "eth0";
 }

modules/default.nix

@@ -8,7 +8,6 @@
     ./home.nix
     ./language.nix
     ./media.nix
-    ./networking.nix
     ./nix.nix
     ./packages.nix
     ./sound.nix

modules/hardware/default.nix

@@ -5,5 +5,6 @@
   imports = [
     ./bluetooth.nix
     ./ergodox.nix
+    ./networking.nix
   ];
 }

modules/hardware/networking.nix

@@ -1,9 +1,9 @@
 { config, lib, ... }:
 let
-  cfg = config.my.networking;
+  cfg = config.my.hardware.networking;
 in
 {
-  options.my.networking = with lib; {
+  options.my.hardware.networking = with lib; {
     externalInterface = mkOption {
       type = types.nullOr types.str;
       default = null;

services/wireguard.nix

@@ -18,7 +18,7 @@ let
     in
     lib.filterAttrs shouldConnectToPeer allOthers;
 
-  extIface = config.my.networking.externalInterface;
+  extIface = config.my.hardware.networking.externalInterface;
 
   mkInterface = clientAllowedIPs: {
     listenPort = cfg.port;