Update secrets and keys for omega-relay

3 files changed, 23 insertions, 19 deletions

diff --git a/hosts/omega-relay/default.nix b/hosts/omega-relay/default.nix
index 90277a2..2235a04 100644
--- a/hosts/omega-relay/default.nix
+++ b/hosts/omega-relay/default.nix
@@ -41,13 +41,13 @@
     in
     {
       stalwart = {
-        enable = true;
+        enable = false;
         domain = if isVM then "mail.omega-relay.local" else "mail.wilkuu.xyz";
         doACME = !isVM;
       };
 
       vaultwarden = {
-        enable = true;
+        enable = false;
         signupWhitelist = [
           "wilkuu.xyz"
           "omega-relay.local"
@@ -57,13 +57,13 @@
         doACME = !isVM;
       };
       uptimekuma = {
-        enable = true;
+        enable = false;
         domain = if isVM then "uptime.omega-relay.local" else "uptime.wilkuu.xyz";
         dataDir = "/srv/data/uptimekuma";
         doACME = !isVM;
       };
       freshrss = {
-        enable = true;
+        enable = false;
         domain = if isVM then "rss.omega-relay.local" else "rss.wilkuu.xyz";
         doACME = !isVM;
       };
diff --git a/hosts/omega-relay/firewall.nix b/hosts/omega-relay/firewall.nix
index 626307e..15a96b6 100644
--- a/hosts/omega-relay/firewall.nix
+++ b/hosts/omega-relay/firewall.nix
@@ -35,9 +35,15 @@ in
 {
   systemd.network.enable = true;
   systemd.network.networks."10-uplink" = {
-    matchConfig.Name = "ens1";
+    matchConfig.Name = "eth*";
     networkConfig.DHCP = "ipv4";
+    linkConfig.RequiredForOnline="routable";
   };
+  systemd.network.networks."99-fallback" = {
+    matchConfig.Type = "ether";
+    networkConfig.DHCP = "ipv4";
+    linkConfig.RequiredForOnline="routable";
+  }
 
   networking.useDHCP = false;
   networking.useNetworkd = true;
diff --git a/hosts/omega-relay/hardware-configuration.nix b/hosts/omega-relay/hardware-configuration.nix
index 328d228..aaf9d00 100644
--- a/hosts/omega-relay/hardware-configuration.nix
+++ b/hosts/omega-relay/hardware-configuration.nix
@@ -1,26 +1,24 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{ lib, modulesPath, ... }:
+{ config, lib, pkgs, modulesPath, ... }:
 
 {
-  imports = [
-    (modulesPath + "/profiles/qemu-guest.nix")
-  ];
+  imports =
+    [ (modulesPath + "/profiles/qemu-guest.nix")
+    ];
 
-  boot.initrd.availableKernelModules = [
-    "ahci"
-    "xhci_pci"
-    "virtio_pci"
-    "sr_mod"
-    "virtio_blk"
-  ];
+  boot.initrd.availableKernelModules = [ "uhci_hcd" "ehci_pci" "ahci" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod" ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
-  hosts.omega-relay.root_device = "/dev/vda";
-  hosts.omega-relay.do_disko = true;
-  addons.virtualisation.isTestVM = true;
+
+  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
+  # (the default) this is the recommended approach. When using systemd-networkd it's
+  # still possible to use this option, but it's recommended to use it in conjunction
+  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
+  networking.useDHCP = lib.mkDefault true;
+  # networking.interfaces.ens18.useDHCP = lib.mkDefault true;
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
 }