diff --git a/config/hosts/daiyousei/nixos.nix b/config/hosts/daiyousei/nixos.nix index dfa700cb..d67dc79b 100644 --- a/config/hosts/daiyousei/nixos.nix +++ b/config/hosts/daiyousei/nixos.nix @@ -6,7 +6,6 @@ ]; kw.oci = { - base = "Canonical Ubuntu"; specs = { shape = "VM.Standard.A1.Flex"; cores = 4; diff --git a/config/hosts/rinnosuke/nixos.nix b/config/hosts/rinnosuke/nixos.nix index 79dc8a04..5edd66cc 100644 --- a/config/hosts/rinnosuke/nixos.nix +++ b/config/hosts/rinnosuke/nixos.nix @@ -6,7 +6,6 @@ ]; kw.oci = { - base = "Canonical Ubuntu"; specs = { shape = "VM.Standard.E2.1.Micro"; cores = 1; diff --git a/config/profiles/hardware/oracle/common.nix b/config/profiles/hardware/oracle/common.nix index 0709f480..b33b072c 100644 --- a/config/profiles/hardware/oracle/common.nix +++ b/config/profiles/hardware/oracle/common.nix @@ -91,7 +91,7 @@ in tf.ipv6.address = tf.resources.rinnosuke_ipv6.refAttr "ip_address"; }; }; - firewall.public.interfaces singleton interface; + firewall.public.interfaces = singleton interface; tf = { enable = true; ipv4_attr = "public_ip"; diff --git a/config/profiles/hardware/oracle/default.nix b/config/profiles/hardware/oracle/default.nix index 432c1a0e..fad35b9e 100644 --- a/config/profiles/hardware/oracle/default.nix +++ b/config/profiles/hardware/oracle/default.nix @@ -6,6 +6,7 @@ ubuntu = true; common = true; }; + kw.oci.base = "Canonical Ubuntu"; imports = with import (sources.tf-nix + "/modules"); [ nixos.ubuntu-linux common @@ -16,6 +17,7 @@ oracle = true; common = true; }; + kw.oci.base = "Oracle Linux"; imports = with import (sources.tf-nix + "/modules"); [ nixos.oracle-linux common