profiles/common: Make common-networking the default

2025-04-07 21:27:03 +02:00 · 2025-04-07 21:27:03 +02:00 · 8af0eb2386
commit 8af0eb2386
parent 323018daaa
26 changed files with 4 additions and 62 deletions
--- a/hosts/_iso/configuration.nix
+++ b/hosts/_iso/configuration.nix
@ -13,9 +13,6 @@
  # https://github.com/NixOS/nixpkgs/issues/327187
  boot.initrd.systemd.enable = false;

-  networking.useDHCP = false;
-  systemd.network.enable = true;
-
  networking.hostName = "isowo";
  isoImage.isoBaseName = lib.mkForce "nixos-isowo";

--- a/hosts/aluminium/configuration.nix
+++ b/hosts/aluminium/configuration.nix
@ -18,9 +18,6 @@
    terminal_output serial
  ";

-  networking.useDHCP = false;
-  systemd.network.enable = true;
-
  profiles.clerie.wg-clerie = {
    enable = true;
    ipv6s = [ "2a01:4f8:c0c:15f1::8106/128" ];
--- a/hosts/astatine/configuration.nix
+++ b/hosts/astatine/configuration.nix
@ -18,9 +18,6 @@
    terminal_output serial
  ";

-  networking.useDHCP = false;
-  systemd.network.enable = true;
-
  profiles.clerie.wg-clerie = {
    enable = true;
    ipv6s = [ "2a01:4f8:c0c:15f1::8108/128" ];
--- a/hosts/beryllium/configuration.nix
+++ b/hosts/beryllium/configuration.nix
@ -20,9 +20,6 @@

  networking.hostName = "beryllium";

-  networking.useDHCP = false;
-  systemd.network.enable = true;
-
  networking.firewall.enable = false;

  profiles.clerie.wg-clerie = {
--- a/hosts/carbon/configuration.nix
+++ b/hosts/carbon/configuration.nix
@ -22,6 +22,8 @@
      ./wg-clerie.nix
    ];

+  profiles.clerie.common-networking.enable = false;
+
  boot.kernelParams = [ "console=ttyS0,115200n8" ];

  boot.loader.grub.enable = true;
--- a/hosts/clerie-backup/configuration.nix
+++ b/hosts/clerie-backup/configuration.nix
@ -13,9 +13,6 @@
  boot.loader.grub.enable = true;
  boot.loader.grub.device = "/dev/vda";

-  networking.useDHCP = false;
-  systemd.network.enable = true;
-
  systemd.network.networks."10-wan" = {
    matchConfig.Name = "ens18";
    address = [
--- a/hosts/dn42-il-gw1/configuration.nix
+++ b/hosts/dn42-il-gw1/configuration.nix
@ -7,7 +7,6 @@
    ];

  profiles.clerie.mercury-vm.enable = true;
-  profiles.clerie.common-networking.enable = true;

  boot.loader.grub.enable = true;
  boot.loader.grub.device = "/dev/vda";
--- a/hosts/dn42-il-gw5/configuration.nix
+++ b/hosts/dn42-il-gw5/configuration.nix
@ -7,7 +7,6 @@
    ];

  profiles.clerie.mercury-vm.enable = true;
-  profiles.clerie.common-networking.enable = true;

  boot.loader.grub.enable = true;
  boot.loader.grub.device = "/dev/vda";
--- a/hosts/dn42-il-gw6/configuration.nix
+++ b/hosts/dn42-il-gw6/configuration.nix
@ -7,7 +7,6 @@
    ];

  profiles.clerie.cybercluster-vm.enable = true;
-  profiles.clerie.common-networking.enable = true;

  boot.loader.grub.enable = true;
  boot.loader.grub.device = "/dev/vda";
--- a/hosts/dn42-ildix-clerie/configuration.nix
+++ b/hosts/dn42-ildix-clerie/configuration.nix
@ -7,7 +7,6 @@
    ];

  profiles.clerie.mercury-vm.enable = true;
-  profiles.clerie.common-networking.enable = true;

  boot.loader.grub.enable = true;
  boot.loader.grub.device = "/dev/vda";
--- a/hosts/dn42-ildix-service/configuration.nix
+++ b/hosts/dn42-ildix-service/configuration.nix
@ -10,7 +10,6 @@
    ];

  profiles.clerie.mercury-vm.enable = true;
-  profiles.clerie.common-networking.enable = true;

  # Use the GRUB 2 boot loader.
  boot.loader.grub.enable = true;
--- a/hosts/gatekeeper/configuration.nix
+++ b/hosts/gatekeeper/configuration.nix
@ -12,9 +12,6 @@
  boot.loader.grub.enable = true;
  boot.loader.grub.device = "/dev/sda";

-  networking.useDHCP = false;
-  systemd.network.enable = true;
-
  systemd.network.networks."10-wan" = {
    address = [
      "2a01:4f8:c0c:15f1::1/64"
--- a/hosts/hydra-1/configuration.nix
+++ b/hosts/hydra-1/configuration.nix
@ -22,9 +22,6 @@
    "aarch64-linux"
  ];

-  networking.useDHCP = false;
-  systemd.network.enable = true;
-
  systemd.network.networks."10-wan" = {
    matchConfig.Name = "ens18";
    address = [
--- a/hosts/hydra-2/configuration.nix
+++ b/hosts/hydra-2/configuration.nix
@ -18,9 +18,6 @@
    "aarch64-linux"
  ];

-  networking.useDHCP = false;
-  systemd.network.enable = true;
-
  systemd.network.networks."10-wan" = {
    matchConfig.Name = "ens18";
    address = [
--- a/hosts/krypton/network.nix
+++ b/hosts/krypton/network.nix
@ -1,8 +1,6 @@
 { ... }:

 {
-  profiles.clerie.common-networking.enable = true;
-
  profiles.clerie.wg-clerie = {
    enable = true;
    ipv6s = [ "2a01:4f8:c0c:15f1::8011/128" ];
--- a/hosts/mail-2/configuration.nix
+++ b/hosts/mail-2/configuration.nix
@ -13,9 +13,6 @@
  boot.loader.grub.enable = true;
  boot.loader.grub.device = "/dev/sda";

-  networking.useDHCP = false;
-  systemd.network.enable = true;
-
  systemd.network.networks."10-wan" = {
    address = [
      "2a01:4f8:1c1c:9577::1/64"
--- a/hosts/monitoring-3/configuration.nix
+++ b/hosts/monitoring-3/configuration.nix
@ -18,9 +18,6 @@
  boot.loader.grub.enable = true;
  boot.loader.grub.device = "/dev/sda";

-  networking.useDHCP = false;
-  systemd.network.enable = true;
-
  systemd.network.networks."10-wan" = {
    matchConfig.Name = "ens19";
    address = [
--- a/hosts/nonat/configuration.nix
+++ b/hosts/nonat/configuration.nix
@ -12,9 +12,6 @@
  boot.loader.grub.enable = true;
  boot.loader.grub.device = "/dev/vda";

-  networking.useDHCP = false;
-  systemd.network.enable = true;
-
  systemd.network.networks."10-wan" = {
    matchConfig.Name = "ens18";
    address = [
--- a/hosts/osmium/configuration.nix
+++ b/hosts/osmium/configuration.nix
@ -20,9 +20,6 @@
    "aarch64-linux"
  ];

-  networking.useDHCP = false;
-  systemd.network.enable = true;
-
  systemd.network.networks."10-wan" = {
    matchConfig.Name = "ens19";
    address = [
--- a/hosts/palladium/configuration.nix
+++ b/hosts/palladium/configuration.nix
@ -30,9 +30,6 @@

  boot.swraid.enable = true;

-  networking.useDHCP = false;
-  systemd.network.enable = true;
-
  systemd.network.networks."10-wan" = {
    matchConfig.Name = "enp3s0";
    address = [
--- a/hosts/porter/configuration.nix
+++ b/hosts/porter/configuration.nix
@ -12,8 +12,6 @@
  boot.loader.grub.enable = true;
  boot.loader.grub.device = "/dev/sda";

-  networking.useDHCP = false;
-  systemd.network.enable = true;
  systemd.network.networks."10-wan" = {
    matchConfig.Name = "ens3";
    address = [
--- a/hosts/storage-2/configuration.nix
+++ b/hosts/storage-2/configuration.nix
@ -15,9 +15,6 @@
  boot.loader.grub.enable = true;
  boot.loader.grub.device = "/dev/vda";

-  networking.useDHCP = false;
-  systemd.network.enable = true;
-
  systemd.network.networks."10-wan" = {
    matchConfig.Name = "ens18";
    address = [
--- a/hosts/tungsten/configuration.nix
+++ b/hosts/tungsten/configuration.nix
@ -18,9 +18,6 @@
    terminal_output serial
  ";

-  networking.useDHCP = false;
-  systemd.network.enable = true;
-
  networking.hostName = "tungsten";

  profiles.clerie.wg-clerie = {
--- a/hosts/web-2/configuration.nix
+++ b/hosts/web-2/configuration.nix
@ -33,9 +33,6 @@
  boot.loader.grub.enable = true;
  boot.loader.grub.device = "/dev/sda";

-  networking.useDHCP = false;
-  systemd.network.enable = true;
-
  systemd.network.networks."10-wan" = {
    address = [
      "2a01:4f8:c0c:c580::1/64"
--- a/hosts/zinc/configuration.nix
+++ b/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;
--- a/profiles/common/default.nix
+++ b/profiles/common/default.nix
@ -10,10 +10,9 @@ with lib;

  config = mkIf config.profiles.clerie.common.enable {

-    profiles.clerie.common-dns.enable = true;
+    profiles.clerie.common-dns.enable = mkDefault true;

-    # Disabled while we are still in transition
-    #profiles.clerie.common-network.enable = true;
+    profiles.clerie.common-networking.enable = mkDefault true;

  };
 }