From 44520b3cd2a6165e8a5c5e87a697bb21f6185760 Mon Sep 17 00:00:00 2001 From: SebastianStork Date: Fri, 4 Jul 2025 13:01:03 +0200 Subject: [PATCH] Only check domain and port uniqueness on servers --- hosts/alto/default.nix | 5 +++++ hosts/cirrus/default.nix | 5 +++++ hosts/cumulus/default.nix | 5 +++++ modules/system/meta/domains.nix | 4 +--- modules/system/meta/ports.nix | 4 +--- 5 files changed, 17 insertions(+), 6 deletions(-) diff --git a/hosts/alto/default.nix b/hosts/alto/default.nix index d9906b1..f907d41 100644 --- a/hosts/alto/default.nix +++ b/hosts/alto/default.nix @@ -2,6 +2,11 @@ { system.stateVersion = "24.11"; + meta = { + domains.assertUnique = true; + ports.assertUnique = true; + }; + custom = { sops.enable = true; boot.loader.systemdBoot.enable = true; diff --git a/hosts/cirrus/default.nix b/hosts/cirrus/default.nix index 83b5fd6..1400119 100644 --- a/hosts/cirrus/default.nix +++ b/hosts/cirrus/default.nix @@ -2,6 +2,11 @@ { system.stateVersion = "24.11"; + meta = { + domains.assertUnique = true; + ports.assertUnique = true; + }; + custom = { sops.enable = true; boot.loader.grub.enable = true; diff --git a/hosts/cumulus/default.nix b/hosts/cumulus/default.nix index b735e64..9f9a473 100644 --- a/hosts/cumulus/default.nix +++ b/hosts/cumulus/default.nix @@ -2,6 +2,11 @@ { system.stateVersion = "24.11"; + meta = { + domains.assertUnique = true; + ports.assertUnique = true; + }; + custom = { sops.enable = true; boot.loader.grub.enable = true; diff --git a/modules/system/meta/domains.nix b/modules/system/meta/domains.nix index 1b6e928..516ed77 100644 --- a/modules/system/meta/domains.nix +++ b/modules/system/meta/domains.nix @@ -21,9 +21,7 @@ in |> lib.concatLists; readOnly = true; }; - assertUnique = lib.mkEnableOption "" // { - default = true; - }; + assertUnique = lib.mkEnableOption ""; }; config = lib.mkIf cfg.assertUnique { diff --git a/modules/system/meta/ports.nix b/modules/system/meta/ports.nix index 33ab60c..37a99e6 100644 --- a/modules/system/meta/ports.nix +++ b/modules/system/meta/ports.nix @@ -13,9 +13,7 @@ in type = lib.types.listOf lib.types.port; default = [ ]; }; - assertUnique = lib.mkEnableOption "" // { - default = true; - }; + assertUnique = lib.mkEnableOption ""; }; config = lib.mkIf cfg.assertUnique {