Merge branch 'new' of ssh://git.0x76.dev:42/v/infrastructure into new

hosts/olympus/bastion/containers/default.nix

@@ -3,7 +3,6 @@ let
   hostAddress = "10.42.99.1";
   hostAddress6 = "fc00::1";
 in {
-  # TODO: Loop over subdirs, create nixos container for each
   networking.nat = {
     enable = true;
     internalInterfaces = [ "ve-+" ];
@@ -24,7 +23,7 @@ in {
     dns = {
       autoStart = true;
       inherit hostAddress hostAddress6;
-      localAddress = "10.42.99.1";
+      localAddress = "10.42.99.2";
       localAddress6 = "fc00::2";
 
       specialArgs = { inherit inputs; };
@@ -32,11 +31,11 @@ in {
       config = {pkgs, ...}: {
         imports = [
           ./common.nix
+          # ./dns.nix
           inputs.home-manager.nixosModules.home-manager
           inputs.gnome-autounlock-keyring.nixosModules.default
           inputs.catppuccin.nixosModules.catppuccin
         ];
-
       };
     };
   };

hosts/olympus/bastion/containers/dns.nix

@@ -0,0 +1,7 @@
+{ ... }: {
+   services.v.dns = {
+    enable = true;
+    openFirewall = true;
+    mode = "server";
+  };
+}

hosts/olympus/eevee/home/default.nix

@@ -4,6 +4,5 @@
   };
 
   home.packages = with pkgs; [
-    zoom-us
   ];
 }

hosts/thalassa/aoife/hardware.nix

@@ -40,7 +40,6 @@
     # Video Driver
     xserver = {
       dpi = 280;
-      xkb.options = "caps:swapescape";
     };
 
     # SSD Trim

hosts/thalassa/aoife/home/default.nix

@@ -7,7 +7,7 @@
 
   # Custom dconf settings
   dconf.settings."org/gnome/desktop/input-sources" = {
-    xkb-options = [ "caps:swapescape" ];
+    # xkb-options = [ "caps:swapescape" ];
   };
 
   programs.zsh.envExtra = ''