diff --git a/configs/common.nix b/configs/common.nix
index f7ad2d4..2475a9e 100644
--- a/configs/common.nix
+++ b/configs/common.nix
@@ -3,12 +3,11 @@
   pkgs,
   config,
   _utils,
-  camasca,
-  nixpkgs,
   agenix,
+  camasca,
   home-manager,
+  nixpkgs,
   vencord,
-  hydro,
   ...
 }:
 let
@@ -35,7 +34,6 @@ in
 
     ../programs/fish.nix
     ../programs/git.nix
-    # ../programs/starship
   ];
 
   age = {
@@ -67,7 +65,6 @@ in
     git
     htop
     ncdu
-    neovim
     ripgrep
     wget
   ];
@@ -136,12 +133,10 @@ 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="
       ];
     };
   };
@@ -149,7 +144,7 @@ in
   nixpkgs = {
     config.allowUnfree = true;
     flake.setNixPath = false;
-    overlays = [ (import ../exprs/overlay.nix { inherit vencord hydro; }) ];
+    overlays = [ (import ../exprs/overlay.nix { inherit vencord; }) ];
   };
 
   programs = {
@@ -160,6 +155,11 @@ in
       enable = true;
       enableFishIntegration = true;
     };
+
+    neovim = {
+      enable = true;
+      defaultEditor = true;
+    };
   };
 
   security = {
@@ -197,11 +197,6 @@ 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 3ed62c1..fcac1d7 100644
--- a/configs/server.nix
+++ b/configs/server.nix
@@ -15,14 +15,6 @@ 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 60b387f..bff8006 100644
--- a/systems/vesuvio/mail/maddy.nix
+++ b/systems/vesuvio/mail/maddy.nix
@@ -71,7 +71,11 @@ in
         }
 
         # catch-all setup inspired by https://github.com/foxcpp/maddy/issues/243#issuecomment-1406567636
-        # we don't have a destination_in clause because there is only one imap account
+        # if the email is one of the already existing imap mailboxes, redirect to that directly
+        destination_in &local_mailboxes {
+          deliver_to &local_mailboxes
+        }
+
         destination $(local_domains) {
           modify {
             replace_rcpt regexp ".*" "hi@uku.moe"