diff --git a/flake.lock b/flake.lock
index 7590793..c309aae 100644
--- a/flake.lock
+++ b/flake.lock
@@ -233,11 +233,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1772845525,
-        "narHash": "sha256-Dp5Ir2u4jJDGCgeMRviHvEQDe+U37hMxp6RSNOoMMPc=",
+        "lastModified": 1772516620,
+        "narHash": "sha256-2r4cKdqCVlQkvcTcLUMxmsmAYZZxCMd//w/PnDnukTE=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "27b93804fbef1544cb07718d3f0a451f4c4cd6c0",
+        "rev": "2b9504d5a0169d4940a312abe2df2c5658db8de9",
         "type": "github"
       },
       "original": {
@@ -471,11 +471,11 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1772793846,
-        "narHash": "sha256-Nobd52UJijiRrKNX3FkgwUGRMjQ6J5kWq/xSUnHbWR8=",
-        "owner": "NixOS",
+        "lastModified": 1772433332,
+        "narHash": "sha256-izhTDFKsg6KeVBxJS9EblGeQ8y+O8eCa6RcW874vxEc=",
+        "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "1a0fccf8299acc1a36f7154efd13f6d005533d09",
+        "rev": "cf59864ef8aa2e178cccedbe2c178185b0365705",
         "type": "github"
       },
       "original": {
@@ -538,11 +538,11 @@
         "systems": "systems_2"
       },
       "locked": {
-        "lastModified": 1772875143,
-        "narHash": "sha256-ENBRe7vCCp/SIG2WRKI2pyAxwnrc9CPuwZ4CtMu4KU4=",
+        "lastModified": 1772483693,
+        "narHash": "sha256-sOq/GUSR0uw1eQla0Wc5BKztPqBJBj3khd/GhaVg4xU=",
         "owner": "NotAShelf",
         "repo": "nvf",
-        "rev": "6681e33727409d4ccfa687de981b594110a735d6",
+        "rev": "750dbfaf6eb62db8e67afc03a3ae3078bfd8f098",
         "type": "github"
       },
       "original": {
@@ -794,11 +794,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1772858378,
-        "narHash": "sha256-VPRlTud1REOz0GPjq3XQNjk5GpH/xNbeadiul4gkPGA=",
+        "lastModified": 1772517053,
+        "narHash": "sha256-aBuL2TFnyBLR+t6iBlKnTWWzprXYKQQIaV0IuCSPPeE=",
         "owner": "0xc000022070",
         "repo": "zen-browser-flake",
-        "rev": "42e1e9a1cb5b507789a51193113d56f8f1bb08d9",
+        "rev": "32e9673aee2ae994ced561247918952398a3e933",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 3a02e3e..4838c59 100644
--- a/flake.nix
+++ b/flake.nix
@@ -78,17 +78,6 @@
 
     homeManagerModules.default = ./modules/home;
 
-    # Expose each host's HM activation package so `home-manager switch --flake .#muon@<host>`
-    # works without a full NixOS rebuild.  Extracted from the already-evaluated
-    # nixosConfiguration, so osConfig remains fully populated.
-    homeConfigurations = nixpkgs.lib.mapAttrs' (host: nixos:
-      nixpkgs.lib.nameValuePair "muon@${host}" {
-        activationPackage = nixos.config.home-manager.users.muon.home.activationPackage;
-      }
-    ) (nixpkgs.lib.filterAttrs
-        (_: nixos: nixos.config.home-manager.users ? muon)
-        inputs.self.outputs.nixosConfigurations);
-
     colmena = {
       meta = {
         nixpkgs = import inputs.nixpkgs {inherit system;};
diff --git a/hosts/muon/home.nix b/hosts/muon/home.nix
index 101a66b..697dc7e 100644
--- a/hosts/muon/home.nix
+++ b/hosts/muon/home.nix
@@ -10,8 +10,6 @@ in {
   mods.xdg.enable = true;
   mods.social.enable = true;
   mods.i3.enable = true;
-  mods.terminal.wezterm.enable = true;
-  mods.terminal.nushell.enable = true;
   mods.terminal.zsh.enable = true;
   mods.terminal.emulator.enable = true;
   mods.terminal.development.enable = true;
@@ -70,16 +68,6 @@ in {
     input.sensitivity = -0.4;
   };
 
-  # SSH: auto-add work key to gpg-agent on first use
-  programs.ssh = {
-    enable = true;
-    matchBlocks."*" = {
-      identityFile = "~/.ssh/work_ed25519";
-      addKeysToAgent = "yes";
-    };
-    matchBlocks."muho".identityFile = "~/.ssh/id_ed25519";
-  };
-
   # Version of first install
   home.stateVersion = "23.05";
 }
diff --git a/modules/home/terminal/helix/default.nix b/modules/home/terminal/helix/default.nix
index 9781b41..36f2b17 100644
--- a/modules/home/terminal/helix/default.nix
+++ b/modules/home/terminal/helix/default.nix
@@ -62,7 +62,7 @@
         {
           name = "nix";
           auto-format = true;
-          formatter.command = "${pkgs.nixfmt}/bin/nixfmt";
+          formatter.command = "${pkgs.nixfmt-classic}/bin/nixfmt";
         }
         {
           name = "rust";
diff --git a/modules/home/terminal/hr/default.nix b/modules/home/terminal/hr/default.nix
index 53a6ea6..887f9b7 100644
--- a/modules/home/terminal/hr/default.nix
+++ b/modules/home/terminal/hr/default.nix
@@ -18,7 +18,7 @@ in {
       format = "on $output ";
     };
 
-    programs.zsh.initContent =
+    programs.zsh.initExtra =
       ''
         export MK2_TEST_SQL_INSTANCE_USER=gijs
         export MK2_TEST_SQL_INSTANCE_PASSWORD="$(cat ${config.sops.secrets.google-db-test.path})"
diff --git a/modules/home/terminal/shell.nix b/modules/home/terminal/shell.nix
index bbb298d..b8ad4a0 100644
--- a/modules/home/terminal/shell.nix
+++ b/modules/home/terminal/shell.nix
@@ -23,7 +23,6 @@ in {
 
     programs.zsh = lib.mkIf cfg.zsh.enable {
       enable = true;
-      dotDir = "${config.xdg.configHome}/zsh";
       enableCompletion = true;
       autosuggestion.enable = true;
       syntaxHighlighting.enable = true;
diff --git a/modules/home/terminal/yazi.nix b/modules/home/terminal/yazi.nix
index e366d5d..160b944 100644
--- a/modules/home/terminal/yazi.nix
+++ b/modules/home/terminal/yazi.nix
@@ -5,7 +5,6 @@ in with lib; {
   config = mkIf cfg.tools.enable {
     programs.yazi = {
       enable = true;
-      shellWrapperName = "y";
       settings = {
         manager = {
           ratio = [ 1 4 3 ];
diff --git a/modules/nixos/core/nix.nix b/modules/nixos/core/nix.nix
index 5d88a0c..697fed8 100644
--- a/modules/nixos/core/nix.nix
+++ b/modules/nixos/core/nix.nix
@@ -51,7 +51,6 @@
 
     environment.systemPackages = with pkgs; [
       inputs.nix-alien.packages.${system}.nix-alien
-      inputs.home-manager.packages.${system}.home-manager
       colmena
     ];
     programs.nix-ld.enable = true;
diff --git a/modules/nixos/flatpak/default.nix b/modules/nixos/flatpak/default.nix
index 27c2ed7..2cabac2 100644
--- a/modules/nixos/flatpak/default.nix
+++ b/modules/nixos/flatpak/default.nix
@@ -22,6 +22,5 @@ in
       xdg.portal.extraPortals = [
         pkgs.xdg-desktop-portal
       ];
-      xdg.portal.config.common.default = "*";
     };
   }