Merge branch 'containers' into new

hosts/olympus/bastion/containers/common.nix

@@ -1,8 +1,7 @@
 # common container config
 { lib, ... }: {
   imports = [
-    # ../../../../common/modules
-    # home-manager.nixosModules.home-manager # TODO: I don't like this
+    ../../../../common
   ];
   # Workaround for bug https://github.com/NixOS/nixpkgs/issues/162686
   networking.useHostResolvConf = lib.mkForce false;

hosts/olympus/bastion/containers/default.nix

@@ -1,4 +1,4 @@
-{ config, lib, ... }:
+{ config, lib, inputs, ... }:
 let
   hostAddress = "10.42.99.1";
   hostAddress6 = "fc00::1";
@@ -21,13 +21,28 @@ in {
   # * fc00:x
 
   containers = {
-    # dns = {
-    #   autoStart = true;
-    #   inherit hostAddress hostAddress6;
-    #   localAddress = "10.42.99.1";
-    #   localAddress6 = "fc00::2";
-    #
-    #   config = ./dns.nix;
-    # };
+    dns = {
+      autoStart = true;
+      inherit hostAddress hostAddress6;
+      localAddress = "10.42.99.1";
+      localAddress6 = "fc00::2";
+
+      specialArgs = { inherit inputs; };
+
+      config = {pkgs, ...}: {
+        imports = [
+          ./common.nix
+          inputs.home-manager.nixosModules.home-manager
+          inputs.gnome-autounlock-keyring.nixosModules.default
+          inputs.catppuccin.nixosModules.catppuccin
+        ];
+
+        services.v.dns = {
+          enable = true;
+          openFirewall = true;
+          mode = "server";
+        };
+      };
+    };
   };
 }

hosts/olympus/bastion/containers/dns.nix

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

hosts/thalassa/aoife/home/hyprland.nix

@@ -12,7 +12,10 @@ in
   home.packages = with pkgs; [
     v.hyprland-workspaces
   ];
-  services.mako.enable = true;
+
+  services = {
+    mako.enable = true;
+  };
 
   programs = {
     wofi = {