factor out common configuration options

1 files changed, 20 insertions, 52 deletions

diff --git a/nixos/networking.nix b/nixos/networking.nix
index 27b92ea..be4f223 100644
--- a/nixos/networking.nix
+++ b/nixos/networking.nix
@@ -1,30 +1,32 @@
 { config, pkgs, ... }:
 
 {
-  networking.hostName = "latitude-7490";
-
-  # NetworkManager
-  environment.systemPackages = with pkgs; [ networkmanager ];
-  networking.networkmanager = {
+  personal.networking = {
     enable = true;
-    unmanaged = [ "interface-name:ve-*" ];
+    bluetooth.enable = true;
+    networkmanager.enable = true;
+    firewall = {
+      syncthing = true;
+      kdeconnect = true;
+    };
   };
 
-  # Hosts
-  networking.hosts = {
-    "10.3.141.1" = [ "raspberrypi.local" ];
-    "192.168.1.10" = [ "dionysos.local" ];
-    # "10.233.1.2" = [ "searx.aristote.fr" "quentin.aristote.fr" "aristote.fr" ];
-  };
+  networking = {
+    hostName = "latitude-7490";
+    hosts = {
+      "10.3.141.1" = [ "raspberrypi.local" ];
+      "192.168.1.10" = [ "dionysos.local" ];
+      # "10.233.1.2" = [ "searx.aristote.fr" "quentin.aristote.fr" "aristote.fr" ];
+    };
 
-  # DHCP
-  networking.interfaces.enp0s31f6.useDHCP = true;
-  networking.interfaces.wlp2s0.useDHCP = true;
+    interfaces = {
+      enp0s31f6.useDHCP = true;
+      wlp2s0.useDHCP = true;
+    };
+  };
 
   # NAT
-  boot.kernel.sysctl = {
-    "net.ipv4.ip_forward" = 1;
-  };
+  boot.kernel.sysctl = { "net.ipv4.ip_forward" = 1; };
   networking = {
     nat = {
       enable = true;
@@ -32,38 +34,4 @@
       externalInterface = "tun0";
     };
   };
-
-  # Firewall
-  networking.firewall = {
-    enable = true;
-    allowedTCPPorts = [
-      # Syncthing
-      22000
-    ];
-    allowedTCPPortRanges = [
-      # KDEConnect
-      {
-        from = 1714;
-        to = 1764;
-      }
-    ];
-    allowedUDPPorts = [
-      # Syncthing
-      22000
-      21027
-      # Wireguard
-      # 51820
-    ];
-    allowedUDPPortRanges = [
-      # KDE Connect
-      {
-        from = 1714;
-        to = 1764;
-      }
-    ];
-  };
-
-  # Bluetooth
-  hardware.bluetooth.enable = true;
-  services.blueman.enable = true;
 }