flake.nix

@@ -70,7 +70,7 @@
 
   outputs = inputs@{ self, nixpkgs, nixpkgs-small, nixpkgs-unstable, flake-parts, colmena, ... }:
     flake-parts.lib.mkFlake { inherit inputs; } {
-      imports = [ ./flake ];
+      imports = [ ];
 
       systems = [ "x86_64-linux" "aarch64-linux" ];
 
@@ -125,7 +125,9 @@
         };
 
         defaults = { config, lib, pkgs, ... }: {
-          deployment.targetHost = lib.mkDefault config.networking.fqdn;
+          # disable remote deployment by default
+          # (can stil build locally with nixos-rebuild)
+          deployment.targetHost = lib.mkDefault null;
           deployment.buildOnTarget = lib.mkDefault true;
 
           imports = [
@@ -140,9 +142,10 @@
           ];
         };
 
-        kilgharrah.deployment.targetHost = null; # disable remote deployment
+        elucredassa.deployment.targetHost = "10.127.3.2";
-        tohru.deployment.targetHost = null; # disable remote deployment
+        yevaud.deployment.targetHost = "yevaud.birdsong.network";
-        elucredassa.deployment.targetHost = "10.127.3.2"; # no fqdn yet
+        orm.deployment.targetHost = "orm.birdsong.network";
+        kalessin.deployment.targetHost = "kalessin.birdsong.network";
 
         kilgharrah.imports = [ ./hosts/kilgharrah ];
         tohru.imports = [ ./hosts/tohru ];

flake/colmena.nix

@@ -1,19 +0,0 @@
-# https://git.lix.systems/the-distro/infra/src/commit/fbb23bf517206175764f154ddfd304b9ec501f87/colmena.nix
-{ lib, ... }: {
-  options.flake.colmena = lib.mkOption {
-    type = lib.types.submodule {
-      freeformType = lib.types.attrsOf (lib.mkOptionType {
-        name = "NixOS module";
-        description = "module containing NixOS options and/or config";
-        descriptionClass = "noun";
-        check = value: builtins.isAttrs value || builtins.isFunction value || builtins.isPath value;
-        merge = loc: defs: {
-          imports = map (def: def.value) defs;
-        };
-      });
-      options.meta = lib.mkOption {
-        type = lib.types.attrs;
-      };
-    };
-  };
-}

flake/default.nix

@@ -1,5 +0,0 @@
-{
-  imports = [
-    ./colmena.nix
-  ];
-}

hosts/kalessin/default.nix

@@ -12,7 +12,6 @@ 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" ];

hosts/orm/default.nix

@@ -9,7 +9,6 @@
   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" ];

hosts/yevaud/default.nix

@@ -13,7 +13,6 @@
   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" ];