diff --git a/flake.lock b/flake.lock
index 063597d..6e68646 100644
--- a/flake.lock
+++ b/flake.lock
@@ -978,21 +978,6 @@
         "type": "github"
       }
     },
-    "nixos-hardware": {
-      "locked": {
-        "lastModified": 1774465523,
-        "narHash": "sha256-4v7HPm63Q90nNn4fgkgKsjW1AH2Klw7XzPtHJr562nM=",
-        "owner": "NixOS",
-        "repo": "nixos-hardware",
-        "rev": "de895be946ad1d8aafa0bb6dfc7e7e0e9e466a29",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "repo": "nixos-hardware",
-        "type": "github"
-      }
-    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1767313136,
@@ -1159,7 +1144,6 @@
         "nix-flatpak": "nix-flatpak",
         "nixcats": "nixcats",
         "nixcord": "nixcord",
-        "nixos-hardware": "nixos-hardware",
         "nixpkgs": "nixpkgs_2",
         "nixpkgs-master": "nixpkgs-master",
         "nixpkgs-unstable": "nixpkgs-unstable",
diff --git a/flake.nix b/flake.nix
index 84b2a0c..7043d8c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -8,8 +8,6 @@
     nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
     nixpkgs-master.url = "github:NixOS/nixpkgs/master";
 
-    nixos-hardware.url = "github:NixOS/nixos-hardware";
-
     home-manager = {
       url = "github:nix-community/home-manager/release-25.11";
       inputs.nixpkgs.follows = "nixpkgs";
diff --git a/groups/all/default.nix b/groups/all/default.nix
index f9036be..1214fc8 100644
--- a/groups/all/default.nix
+++ b/groups/all/default.nix
@@ -3,6 +3,10 @@
   lib,
   ...
 }: {
+  imports = [
+    ../../hosts/modules/core/garbage-collector.nix
+  ];
+
   networking = {
     networkmanager.enable = true;
 
diff --git a/homes/lorkan/modules/cli/ssh.nix b/homes/lorkan/modules/cli/ssh.nix
index e6c2482..841bedc 100644
--- a/homes/lorkan/modules/cli/ssh.nix
+++ b/homes/lorkan/modules/cli/ssh.nix
@@ -4,13 +4,7 @@
   # WARNING: for that you need to use `services.ssh-agent.enable`
   programs.ssh = {
     enable = true;
-
-    matchBlocks = {
-      # * block indicates defaults
-      "*" = {
-        forwardAgent = false;
-        addKeysToAgent = "yes";
-      };
-    };
+    forwardAgent = false;
+    addKeysToAgent = "yes";
   };
 }
diff --git a/hosts/MACBOOKI9/default.nix b/hosts/MACBOOKI9/default.nix
index 4779b22..cd9829b 100755
--- a/hosts/MACBOOKI9/default.nix
+++ b/hosts/MACBOOKI9/default.nix
@@ -6,7 +6,6 @@
 }: {
   imports = [
     ./hardware.nix
-    ../modules/core/t2-firmware.nix
   ];
 
   networking.hostName = "MACBOOKI9";
diff --git a/hosts/modules/core/t2-firmware.nix b/hosts/modules/core/t2-firmware.nix
deleted file mode 100644
index 086ff80..0000000
--- a/hosts/modules/core/t2-firmware.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  inputs,
-  pkgs,
-  ...
-}: {
-  imports = [
-    inputs.nixos-hardware.nixosModules.apple-t2
-  ];
-
-  environment.systemPackages = with pkgs; [
-    # t2-firmware dependencies
-    # REF: https://github.com/t2linux/nixos-t2-iso
-    python3
-    dmg2img
-    # get-apple-firmware
-  ];
-
-  hardware = {
-    apple.touchBar.enable = true;
-
-    # REF: https://github.com/NixOS/nixos-hardware/blob/master/apple/t2/default.nix
-    apple-t2 = {
-      # the macbook does not have an AMD dGPU (iGPU)
-      enableIGPU = false;
-
-      kernelChannel = "stable";
-
-      firmware = {
-        enable = true;
-        version = "sonoma";
-      };
-    };
-  };
-}
diff --git a/overlays/default.nix b/overlays/default.nix
index f3f7967..db1ecef 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -24,8 +24,6 @@
       ];
     };
 
-    get-apple-firmware = pkgs.callPackage ../packages/get-apple-firmware.nix {};
-
     sddm-theme-corners = import ../packages/sddm-theme/corners.nix {
       inherit pkgs;
     };
diff --git a/packages/get-apple-firmware.nix b/packages/get-apple-firmware.nix
deleted file mode 100644
index 7b25cce..0000000
--- a/packages/get-apple-firmware.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  stdenvNoCC,
-  fetchurl,
-  lib,
-}:
-stdenvNoCC.mkDerivation (final: {
-  pname = "get-apple-firmware";
-  version = "360156db52c013dbdac0ef9d6e2cebbca46b955b";
-  src = fetchurl {
-    url = "https://raw.github.com/t2linux/wiki/${final.version}/docs/tools/firmware.sh";
-    hash = "sha256-IL7omNdXROG402N2K9JfweretTnQujY67wKKC8JgxBo=";
-  };
-
-  dontUnpack = true;
-
-  buildPhase = ''
-    mkdir -p $out/bin
-    cp ${final.src} $out/bin/get-apple-firmware
-    chmod +x $out/bin/get-apple-firmware
-  '';
-
-  meta = {
-    description = "A script to get needed firmware for T2linux devices";
-    homepage = "https://t2linux.org";
-    license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [soopyc];
-    mainProgram = "get-apple-firmware";
-  };
-})