Format and do fixes

4 files changed, 34 insertions, 20 deletions

diff --git a/hosts/omega-relay/default.nix b/hosts/omega-relay/default.nix
index dcb7466..90277a2 100644
--- a/hosts/omega-relay/default.nix
+++ b/hosts/omega-relay/default.nix
@@ -68,7 +68,7 @@
         doACME = !isVM;
       };
       wakapi = {
-        enable = true;
+        enable = false;
         domain = if isVM then "wakapi.omega-relay.local" else "wakapi.wilkuu.xyz";
         doACME = !isVM;
       };
diff --git a/hosts/omega-relay/disko.nix b/hosts/omega-relay/disko.nix
index adfaf71..2de6943 100644
--- a/hosts/omega-relay/disko.nix
+++ b/hosts/omega-relay/disko.nix
@@ -1,22 +1,22 @@
 { config, lib, ... }:
 let
   cfg = config.hosts.omega-relay;
-in 
+in
 {
   options.hosts.omega-relay = with lib; {
     root_device = mkOption {
-      type = types.path; 
-      default = "/dev/sda"; 
-      example = "/dev/sda"; 
+      type = types.path;
+      default = "/dev/sda";
+      example = "/dev/sda";
       description = "Root device for disko and grub";
-    }; 
+    };
 
     do_disko = mkOption {
-      type = types.bool; 
-      default = !config.addons.virtualisation.isTestVM; 
-      description = "Whenever to do disko or not."; 
-    }; 
-  };  
+      type = types.bool;
+      default = !config.addons.virtualisation.isTestVM;
+      description = "Whenever to do disko or not.";
+    };
+  };
   config = lib.mkIf (cfg.do_disko) ({
     services.btrfs.autoScrub = {
       enable = true;
diff --git a/hosts/omega-relay/firewall.nix b/hosts/omega-relay/firewall.nix
index 553730e..626307e 100644
--- a/hosts/omega-relay/firewall.nix
+++ b/hosts/omega-relay/firewall.nix
@@ -1,4 +1,4 @@
-{ config,... }:
+{ ... }:
 let
   baseTCP = [
     20
@@ -33,6 +33,14 @@ let
   ];
 in
 {
+  systemd.network.enable = true;
+  systemd.network.networks."10-uplink" = {
+    matchConfig.Name = "ens1";
+    networkConfig.DHCP = "ipv4";
+  };
+
+  networking.useDHCP = false;
+  networking.useNetworkd = true;
   networking.nftables.enable = true;
   networking.firewall = {
     enable = true;
diff --git a/hosts/omega-relay/hardware-configuration.nix b/hosts/omega-relay/hardware-configuration.nix
index 247b382..328d228 100644
--- a/hosts/omega-relay/hardware-configuration.nix
+++ b/hosts/omega-relay/hardware-configuration.nix
@@ -1,20 +1,26 @@
 # 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.
-{ config, lib, pkgs, modulesPath, ... }:
+{ lib, 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 = [
+    "ahci"
+    "xhci_pci"
+    "virtio_pci"
+    "sr_mod"
+    "virtio_blk"
+  ];
   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; 
+  hosts.omega-relay.root_device = "/dev/vda";
+  hosts.omega-relay.do_disko = true;
+  addons.virtualisation.isTestVM = true;
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
 }