hosts/krypton/network.nix

@@ -1,9 +1,7 @@
 { ... }:
 
 {
-  profiles.clerie.common-networking.enable = true;
-
-  profiles.clerie.wg-clerie = {
+  services.wg-clerie = {
     enable = true;
     ipv6s = [ "2a01:4f8:c0c:15f1::8011/128" ];
     ipv4s = [ "10.20.30.11/32" ];

hosts/zinc/configuration.nix

@@ -11,8 +11,6 @@
       ./programs.nix
     ];
 
-  profiles.clerie.common-networking.enable = true;
-
   # Use the systemd-boot EFI boot loader.
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
@@ -27,7 +25,7 @@
 
   boot.initrd.systemd.enable = false;
 
-  profiles.clerie.wg-clerie = {
+  services.wg-clerie = {
     enable = true;
     ipv6s = [ "2a01:4f8:c0c:15f1::8109/128" ];
     ipv4s = [ "10.20.30.109/32" ];

profiles/common-networking/default.nix

@@ -1,24 +0,0 @@
-{ config, lib, ... }:
-
-with lib;
-
-{
-
-  options.profiles.clerie.common-networking = {
-    enable = mkEnableOption "Common networking config";
-  };
-
-  config = mkIf config.profiles.clerie.common-networking.enable {
-
-    # Disable scripted network
-    networking.useDHCP = false;
-    # Enable systemd-networkd
-    systemd.network.enable = true;
-
-    # Don't wait for online, if NetworkManger is running too
-    systemd.network.wait-online = mkIf (config.networking.networkmanager.enable == true) {
-      enable = false;
-    };
-
-  };
-}

profiles/default.nix

@@ -3,7 +3,6 @@
 {
 
   imports = [
-    ./common-networking
     ./cybercluster-vm
     ./fem-net
     ./hetzner-cloud

profiles/wg-clerie/default.nix

@@ -47,10 +47,6 @@ in
       };
     });
 
-    networking.networkmanager.unmanaged = [
-      "interface-name:wg-clerie"
-    ];
-
     systemd.network.netdevs."10-wg-clerie" = {
       netdevConfig = {
         Kind = "wireguard";