diff --git a/common/hm-modules/nvim/default.nix b/common/hm-modules/nvim/default.nix
index 8463cac3..dbb56629 100644
--- a/common/hm-modules/nvim/default.nix
+++ b/common/hm-modules/nvim/default.nix
@@ -24,7 +24,7 @@ with lib;
   config = mkIf cfg.enable {
     home.packages = with pkgs; [ fd ];
     home.file.".config/nvim/lua".source = ./lua;
-    programs.nixvim = {
+    programs.nixvim = {helpers, ...}: {
       enable = true;
       package = pkgs.neovim-unwrapped;
       vimAlias = true;
@@ -32,7 +32,7 @@ with lib;
 
       globals.mapleader = " ";
 
-      options = {
+      opts = {
         number = true;
         conceallevel = 2;
         expandtab = true;
@@ -44,7 +44,7 @@ with lib;
 
       clipboard.providers.wl-copy.enable = true;
 
-      keymaps = [
+      keymaps = with helpers; [
         # General
         {
           mode = "n";
@@ -65,8 +65,7 @@ with lib;
         {
           mode = "n";
           key = "<leader>fg";
-          action = "require('telescope.builtin').live_grep";
-          lua = true;
+          action = mkRaw "require('telescope.builtin').live_grep";
         }
         {
           mode = "n";
@@ -86,20 +85,18 @@ with lib;
         {
           mode = "n";
           key = "<leader>ob";
-          action = "require('obsidian_picker').obsidian_picker";
-          lua = true;
+          action = mkRaw "require('obsidian_picker').obsidian_picker";
         }
         # Commenting
         {
           mode = "n";
           key = "<C-/>";
-          action = "require('Comment.api').toggle.linewise.current";
-          lua = true;
+          action = mkRaw "require('Comment.api').toggle.linewise.current";
         }
         {
           mode = "x";
           key = "<C-/>";
-          action = ''
+          action = mkRaw ''
             function()
               local esc = vim.api.nvim_replace_termcodes(
                 '<ESC>', true, false, true
@@ -108,7 +105,6 @@ with lib;
               require('Comment.api').toggle.linewise(vim.fn.visualmode())
             end
           '';
-          lua = true;
         }
         # Float Term
         {
@@ -119,8 +115,7 @@ with lib;
         {
           mode = "t";
           key = "<ESC>";
-          action = "function() vim.cmd(':FloatermToggle myfloat') end";
-          lua = true;
+          action = mkRaw "function() vim.cmd(':FloatermToggle myfloat') end";
         }
         # Switch buffers
         {
@@ -163,26 +158,22 @@ with lib;
         {
           mode = "n";
           key = "<leader>nr";
-          lua = true;
-          action = "require('neotest').run.run";
+          action = mkRaw "require('neotest').run.run";
         }
         {
           mode = "n";
           key = "<leader>no";
-          lua = true;
-          action = "require('neotest').output.open";
+          action = mkRaw "require('neotest').output.open";
         }
         {
           mode = "n";
           key = "<leader>ns";
-          lua = true;
-          action = "require('neotest').run.stop";
+          action = mkRaw "require('neotest').run.stop";
         }
         {
           mode = "n";
           key = "<leader>nf";
-          lua = true;
-          action = "function() require('neotest').run.run(vim.fn.expand('%')) end";
+          action = mkRaw "function() require('neotest').run.run(vim.fn.expand('%')) end";
         }
         # LSP
         {
@@ -205,7 +196,7 @@ with lib;
 
       colorschemes.catppuccin = {
         enable = true;
-        flavour = "frappe";
+        settings.flavour = "frappe";
       };
 
       plugins = {
@@ -300,18 +291,19 @@ with lib;
 
         telescope = {
           enable = true;
-          defaults.preview.ls_short = true;
+          settings.defaults.preview.ls_short = true;
           extensions.file-browser = {
             enable = true;
-            hijackNetrw = true;
-            dirIcon = "";
+            settings = {
+              hijack_netrw = true;
+              dir_icon = "";
+            };
           };
           extensions.fzf-native.enable = true;
-          extensions.fzf-native.fuzzy = true;
+          extensions.fzf-native.settings.fuzzy = true;
           extensions.frecency.enable = true;
-          extraOptions = { };
         };
-        comment-nvim.enable = true;
+        comment.enable = true;
         none-ls = {
           enable = true;
           sources = {
@@ -341,7 +333,7 @@ with lib;
           };
           servers = {
             cssls.enable = true;
-            nil_ls.enable = true; #NixOS
+            nil-ls.enable = true; #NixOS
             dockerls.enable = true;
             rust-analyzer = {
               enable = true;
diff --git a/common/modules/gnome/default.nix b/common/modules/gnome/default.nix
index 707a5fb5..27902f6e 100644
--- a/common/modules/gnome/default.nix
+++ b/common/modules/gnome/default.nix
@@ -60,12 +60,12 @@ in
         gnome-photos
         gnome-tour
         gnome-connections
+        gnome-calendar
         epiphany # web browser
-        gnome-terminal
         geary # email reader
         simple-scan # document scanner
         totem # video player
-        gnome-calendar
+        gnome-terminal
       ])
       ++ (with pkgs.gnome; [
         atomix # puzzle game
diff --git a/flake.nix b/flake.nix
index f2e0c7ca..38a44e08 100644
--- a/flake.nix
+++ b/flake.nix
@@ -160,6 +160,7 @@
             jq
             fup-repl
             nh
+            nixfmt-rfc-style
           ];
         };
       };
diff --git a/hosts/olympus/bastion/containers/common.nix b/hosts/olympus/bastion/containers/common.nix
index e8cae95a..6807b60d 100644
--- a/hosts/olympus/bastion/containers/common.nix
+++ b/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;
diff --git a/hosts/olympus/bastion/containers/default.nix b/hosts/olympus/bastion/containers/default.nix
index 11757ebb..1d1cf4ae 100644
--- a/hosts/olympus/bastion/containers/default.nix
+++ b/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";
+        };
+      };
+    };
   };
 }
diff --git a/hosts/olympus/bastion/containers/dns.nix b/hosts/olympus/bastion/containers/dns.nix
deleted file mode 100644
index b165cd06..00000000
--- a/hosts/olympus/bastion/containers/dns.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ ... }: {
-  imports = [ ./common.nix ];
-  services.v.dns = {
-    enable = true;
-    openFirewall = true;
-    mode = "server";
-  };
-}
diff --git a/hosts/thalassa/aoife/home/hyprland.nix b/hosts/thalassa/aoife/home/hyprland.nix
index 43883dbc..b9a77d7c 100644
--- a/hosts/thalassa/aoife/home/hyprland.nix
+++ b/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 = {