various updates

hosts/olympus/bastion/containers/common.nix

@@ -1,6 +1,12 @@
 # common container config
-{ lib, ... }: {
+{ lib, home-manager, ... }: {
+  imports = [
+    # ../../../../common/modules
+    home-manager.nixosModules.home-manager # TODO: I don't like this
+  ];
   # Workaround for bug https://github.com/NixOS/nixpkgs/issues/162686
   networking.useHostResolvConf = lib.mkForce false;
   services.resolved.enable = true;
+
+  system.stateVersion = lib.mkDefault "24.05";
 }

hosts/olympus/bastion/containers/default.nix

@@ -21,5 +21,13 @@ in {
   # * fc00:x
 
   containers = {
+    dns = {
+      autoStart = true;
+      inherit hostAddress hostAddress6;
+      localAddress = "10.42.99.1";
+      localAddress6 = "fc00::2";
+
+      config = ./dns.nix;
+    };
   };
 }

hosts/olympus/bastion/containers/dns.nix

@@ -0,0 +1,8 @@
+{ ... }: {
+  imports = [ ./common.nix ];
+  services.v.dns = {
+    enable = true;
+    openFirewall = true;
+    mode = "server";
+  };
+}

hosts/olympus/bastion/default.nix

@@ -36,9 +36,4 @@
   environment.systemPackages = with pkgs; [ vault ];
 
   networking.useNetworkd = true;
-
-  programs.gnupg.agent = {
-    enable = true;
-    pinentryFlavor = "curses";
-  };
 }

hosts/services.nix

@@ -1,8 +0,0 @@
-{
-  olympus.bastion.nginx = {
-    dns = {
-      a = "0x76.dev";
-    };
-    ports = [80 443];
-  };
-}

hosts/thalassa/aoife/hardware.nix

@@ -1,7 +1,12 @@
 { pkgs, ... }: {
+  environment.systemPackages = with pkgs; [
+    pciutils
+    usbutils
+    lshw
+  ];
+
   hardware = {
     enableAllFirmware = true;
-
     bluetooth.enable = true;
 
     # OpenGL + Vulkan
@@ -18,13 +23,13 @@
     };
   };
   services = {
+    fwupd.enable = true;
 
     hardware.bolt.enable = true;
 
     fprintd.enable = true;
 
     # Video Driver
-    xserver.videoDrivers = [ "amdgpu" ];
     xserver = {
       dpi = 280;
       xkb.options = "caps:swapescape";

hosts/thalassa/null/configuration.nix

@@ -30,8 +30,7 @@ let
 
     exec Hyprland
   '';
-in
-{
+in {
   imports = [
     # Include the results of the hardware scan.
     ./hardware-configuration.nix
@@ -46,6 +45,7 @@ in
     users.vivian = import ./home;
     extraSpecialArgs = { inherit inputs; };
   };
+
   security = {
 
     pam.services.swaylock = { };