diff --git a/config/hosts/spark.nix b/config/hosts/spark.nix index 38fc00c..3b0b0c4 100644 --- a/config/hosts/spark.nix +++ b/config/hosts/spark.nix @@ -11,4 +11,7 @@ enable-gui = true; ssh-pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO67/CNhiG9UynaflmZUUK7f3O/GwFpnXri/PxpgHcPa"; + profile = "desktop"; + domain = "sea.fudo.org"; + site = "seattle"; } diff --git a/config/hosts/zbox.nix b/config/hosts/zbox.nix index 9a66a72..c257835 100644 --- a/config/hosts/zbox.nix +++ b/config/hosts/zbox.nix @@ -11,4 +11,7 @@ enable-gui = true; ssh-pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKVhHfRf2086SAqOmu2dNbsJI9UUAQWop+1lrcJlNgl8"; + profile = "desktop"; + domain = "sea.fudo.org"; + site = "seattle"; } diff --git a/nixops/lib/hosts.nix b/nixops/lib/hosts.nix index 6e50ab5..a279063 100644 --- a/nixops/lib/hosts.nix +++ b/nixops/lib/hosts.nix @@ -14,7 +14,7 @@ let initialize = import ../../initialize.nix; # This is a problem...it creates a second source of truth. - host-config = ip: config: + host-config = ip: port: config: { ... }: { imports = [ (initialize { diff --git a/nixops/seattle.nix b/nixops/seattle.nix index c39e128..ff6577a 100644 --- a/nixops/seattle.nix +++ b/nixops/seattle.nix @@ -1,18 +1,25 @@ let + deploy-port = 2112; + nixos-version = "20.09"; - hosts = import ./lib/hosts.nix { inherit nix-version; }; + hosts = import ./lib/hosts.nix { inherit nixos-version; }; seattle-host = ip: hostname: profile: let site = "seattle"; domain = "sea.fudo.org"; - in hosts.host-config ip { inherit hostname profile domain site; }; + in hosts.host-config ip deploy-port { + inherit hostname profile domain site; + }; in { network.description = "Seattle home network."; - nostromo = seattle-host "10.0.0.1" "nostromo" "server"; - lambda = seattle-host "10.0.0.3" "lambda" "server"; + liminia = seattle-host "10.0.0.1" "limina" "server"; + plato = seattle-host "10.0.0.21" "plato" "server"; spark = seattle-host "10.0.0.108" "spark" "desktop"; zbox = seattle-host "10.0.0.110" "zbox" "desktop"; + + #nostromo = seattle-host "10.0.0.1" "nostromo" "server"; + #lambda = seattle-host "10.0.0.3" "lambda" "server"; }