From c70b2878900a37c649cef3101ed56fafbfd65b57 Mon Sep 17 00:00:00 2001 From: Katherina Walshe-Grey Date: Mon, 3 Mar 2025 19:54:32 +0000 Subject: [PATCH] treewide: define fqdn, use as default deployment target host --- flake.nix | 11 ++++------- hosts/kalessin/default.nix | 1 + hosts/orm/default.nix | 1 + hosts/yevaud/default.nix | 1 + 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/flake.nix b/flake.nix index 9b33c44..3862525 100644 --- a/flake.nix +++ b/flake.nix @@ -125,9 +125,7 @@ }; defaults = { config, lib, pkgs, ... }: { - # disable remote deployment by default - # (can stil build locally with nixos-rebuild) - deployment.targetHost = lib.mkDefault null; + deployment.targetHost = lib.mkDefault config.networking.fqdn; deployment.buildOnTarget = lib.mkDefault true; imports = [ @@ -142,10 +140,9 @@ ]; }; - elucredassa.deployment.targetHost = "10.127.3.2"; - yevaud.deployment.targetHost = "yevaud.birdsong.network"; - orm.deployment.targetHost = "orm.birdsong.network"; - kalessin.deployment.targetHost = "kalessin.birdsong.network"; + kilgharrah.deployment.targetHost = null; # disable remote deployment + tohru.deployment.targetHost = null; # disable remote deployment + elucredassa.deployment.targetHost = "10.127.3.2"; # no fqdn yet kilgharrah.imports = [ ./hosts/kilgharrah ]; tohru.imports = [ ./hosts/tohru ]; diff --git a/hosts/kalessin/default.nix b/hosts/kalessin/default.nix index 858faff..a26ad8b 100644 --- a/hosts/kalessin/default.nix +++ b/hosts/kalessin/default.nix @@ -12,6 +12,7 @@ in nixpkgs.hostPlatform = "aarch64-linux"; networking.hostName = "kalessin"; networking.hostId = "534b538e"; + networking.domain = "birdsong.network"; fountain.users.qenya.enable = true; users.users.qenya.extraGroups = [ "wheel" ]; diff --git a/hosts/orm/default.nix b/hosts/orm/default.nix index 6f21b57..c892c20 100644 --- a/hosts/orm/default.nix +++ b/hosts/orm/default.nix @@ -9,6 +9,7 @@ nixpkgs.hostPlatform = "x86_64-linux"; networking.hostName = "orm"; networking.hostId = "00000000"; + networking.domain = "birdsong.network"; fountain.users.qenya.enable = true; users.users.qenya.extraGroups = [ "wheel" ]; diff --git a/hosts/yevaud/default.nix b/hosts/yevaud/default.nix index a54c58f..84a2e2e 100644 --- a/hosts/yevaud/default.nix +++ b/hosts/yevaud/default.nix @@ -13,6 +13,7 @@ nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; networking.hostName = "yevaud"; networking.hostId = "09673d65"; + networking.domain = "birdsong.network"; fountain.users.qenya.enable = true; users.users.qenya.extraGroups = [ "wheel" ];