diff --git a/configs/common.nix b/configs/common.nix
index 2475a9e..f7ad2d4 100644
--- a/configs/common.nix
+++ b/configs/common.nix
@@ -3,11 +3,12 @@
   pkgs,
   config,
   _utils,
-  agenix,
   camasca,
-  home-manager,
   nixpkgs,
+  agenix,
+  home-manager,
   vencord,
+  hydro,
   ...
 }:
 let
@@ -34,6 +35,7 @@ in
 
     ../programs/fish.nix
     ../programs/git.nix
+    # ../programs/starship
   ];
 
   age = {
@@ -65,6 +67,7 @@ in
     git
     htop
     ncdu
+    neovim
     ripgrep
     wget
   ];
@@ -133,10 +136,12 @@ in
 
       substituters = [
         "https://uku3lig.cachix.org"
+        "https://ghostty.cachix.org"
       ];
 
       trusted-public-keys = [
         "uku3lig.cachix.org-1:C1/9DNUadh2pueAo+LUkVNUKyIVjF/CREd9RS9E+F2A="
+        "ghostty.cachix.org-1:QB389yTa6gTyneehvqG58y0WnHjQOqgnA+wBnpWWxns="
       ];
     };
   };
@@ -144,7 +149,7 @@ in
   nixpkgs = {
     config.allowUnfree = true;
     flake.setNixPath = false;
-    overlays = [ (import ../exprs/overlay.nix { inherit vencord; }) ];
+    overlays = [ (import ../exprs/overlay.nix { inherit vencord hydro; }) ];
   };
 
   programs = {
@@ -155,11 +160,6 @@ in
       enable = true;
       enableFishIntegration = true;
     };
-
-    neovim = {
-      enable = true;
-      defaultEditor = true;
-    };
   };
 
   security = {
@@ -197,6 +197,11 @@ in
     };
   };
 
+  system.switch = {
+    enable = false;
+    enableNg = true;
+  };
+
   systemd = {
     services.NetworkManager-wait-online.enable = lib.mkForce false;
 
diff --git a/configs/server.nix b/configs/server.nix
index fcac1d7..3ed62c1 100644
--- a/configs/server.nix
+++ b/configs/server.nix
@@ -15,6 +15,14 @@ in
     secrets.generate
   ];
 
+  _module.args.nixinate = {
+    host = config.networking.hostName;
+    sshUser = "leo";
+    buildOn = "remote";
+    substituteOnTarget = true;
+    hermetic = false; # hermetic fucks up for cross-system deployments
+  };
+
   environment.systemPackages = with pkgs; [
     ghostty.terminfo
   ];
diff --git a/systems/vesuvio/mail/maddy.nix b/systems/vesuvio/mail/maddy.nix
index bff8006..60b387f 100644
--- a/systems/vesuvio/mail/maddy.nix
+++ b/systems/vesuvio/mail/maddy.nix
@@ -71,11 +71,7 @@ in
         }
 
         # catch-all setup inspired by https://github.com/foxcpp/maddy/issues/243#issuecomment-1406567636
-        # if the email is one of the already existing imap mailboxes, redirect to that directly
-        destination_in &local_mailboxes {
-          deliver_to &local_mailboxes
-        }
-
+        # we don't have a destination_in clause because there is only one imap account
         destination $(local_domains) {
           modify {
             replace_rcpt regexp ".*" "hi@uku.moe"