diff --git a/config/hosts/koishi.nix b/config/hosts/koishi.nix
index 37fd02e2..6acf4ab9 100644
--- a/config/hosts/koishi.nix
+++ b/config/hosts/koishi.nix
@@ -117,6 +117,8 @@ Host daiyousei-build
       }; */
     };
 
+    services.fstrim.enable = true;
+
     network = {
       addresses = {
         private = {
diff --git a/config/tf b/config/tf
index 1a223367..046c6861 160000
--- a/config/tf
+++ b/config/tf
@@ -1 +1 @@
-Subproject commit 1a2233676398de7e7b3da2b6c431898dd8cddb3b
+Subproject commit 046c6861f58f5113764ca2470748b7c87f29505e
diff --git a/config/trusted b/config/trusted
index 1b831ed7..2af2d4cc 160000
--- a/config/trusted
+++ b/config/trusted
@@ -1 +1 @@
-Subproject commit 1b831ed778fad5919d09cb8b70fc3ede0851729d
+Subproject commit 2af2d4cc2e4675a7eebbdfccd5542d306104c237
diff --git a/config/users/kat/base/git.nix b/config/users/kat/base/git.nix
index bcbb19f5..e1e59bac 100644
--- a/config/users/kat/base/git.nix
+++ b/config/users/kat/base/git.nix
@@ -3,8 +3,8 @@
 {
   programs.git = {
     enable = true;
-    userName = "kat witch";
-    userEmail = "kat@kittywit.ch";
+    userName = "Kat Inskip";
+    userEmail = "kat@inskip.me";
     extraConfig = {
       init = { defaultBranch = "main"; };
       protocol.gcrypt.allow = "always";
@@ -15,7 +15,7 @@
       };
     };
     signing = {
-      key = "01F50A29D4AA91175A11BDB17248991EFA8EFBEE";
+      key = "0xE8DDE3ED1C90F3A0";
       signByDefault = true;
     };
   };
diff --git a/flake.lock b/flake.lock
index 2106d61c..06a57409 100644
--- a/flake.lock
+++ b/flake.lock
@@ -113,11 +113,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1652934326,
-        "narHash": "sha256-YgSgR0V/rsqJX6DWyXlPOwsaXXiOkN+9z5rfE9kn2IU=",
+        "lastModified": 1652959192,
+        "narHash": "sha256-bFEK+kNH7tMWVsdgUosIk9/xZFvapcaQDvF1ZroyLcw=",
         "owner": "nix-community",
         "repo": "emacs-overlay",
-        "rev": "de5c826149bcfbaa5f0ce985bb184c9bc7f11e46",
+        "rev": "4681a0c9dcbcc70fb2befe2d3d56a5277fbac7f7",
         "type": "github"
       },
       "original": {
@@ -396,8 +396,8 @@
     "nixpkgs": {
       "locked": {
         "lastModified": 0,
-        "narHash": "sha256-FqNrXC1EE6U2RACwXBlsAvg1lqQGLYpuYb6+W3DL9vA=",
-        "path": "/nix/store/57zwl7b883kkya60akvg6wssl1qkxwl5-source",
+        "narHash": "sha256-erVj41IcCPDWdt8CwT60ygD+SY/uhqip3RXwiESOCVk=",
+        "path": "/nix/store/3q18gxqzw5qzyd9n64nyi1kgb66qi8ac-source",
         "type": "path"
       },
       "original": {
@@ -423,11 +423,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1652659998,
-        "narHash": "sha256-FqNrXC1EE6U2RACwXBlsAvg1lqQGLYpuYb6+W3DL9vA=",
+        "lastModified": 1652794215,
+        "narHash": "sha256-erVj41IcCPDWdt8CwT60ygD+SY/uhqip3RXwiESOCVk=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "1d7db1b9e4cf1ee075a9f52e5c36f7b9f4207502",
+        "rev": "242efdc5a5aff8222c1152c0e4b9262bd02915b6",
         "type": "github"
       },
       "original": {
@@ -455,11 +455,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1652938196,
-        "narHash": "sha256-kv6EEwTPtvtqVlaSH/sRhWx9ecONrr5bccMdxu1nhwc=",
+        "lastModified": 1652969435,
+        "narHash": "sha256-cbNoHYnKpAkhpx5wMnvXsZ9fvAsvVIPyk940nmOGog0=",
         "owner": "nix-community",
         "repo": "nur",
-        "rev": "2d8f65d73133859961b8714918ac8f60d98a76e5",
+        "rev": "c5a7e11a501bed777dcbd0c6c7ab2093199f50e3",
         "type": "github"
       },
       "original": {
diff --git a/trusted/flake.lock b/trusted/flake.lock
index db0173e7..9729dda1 100644
--- a/trusted/flake.lock
+++ b/trusted/flake.lock
@@ -425,12 +425,12 @@
       },
       "locked": {
         "lastModified": 0,
-        "narHash": "sha256-Gi7tG1c/ePjp4GRO+lqyVyBw4D/Q6ArhqQoQAviGBZ8=",
-        "path": "/nix/store/0d1rpf5pi4lnykkg4lq409d11lh6gga6-source",
+        "narHash": "sha256-6xe8414ZG567zfDVV7ITkmw0TtIlQeD2tP5UuV9BkSU=",
+        "path": "/nix/store/gkmhcdc2vwj7x3rh70g3zax0lcyppxn7-source",
         "type": "path"
       },
       "original": {
-        "path": "/nix/store/0d1rpf5pi4lnykkg4lq409d11lh6gga6-source",
+        "path": "/nix/store/gkmhcdc2vwj7x3rh70g3zax0lcyppxn7-source",
         "type": "path"
       }
     },
@@ -664,11 +664,11 @@
     "trusted": {
       "flake": false,
       "locked": {
-        "lastModified": 1639598693,
-        "narHash": "sha256-stR1xQiJCt1PM0JocMpdSC14/2QcDFKjIX4wRJJzQRE=",
+        "lastModified": 1652985072,
+        "narHash": "sha256-SHqXjkk10wMdE47jUSAuLfWIJ40L3cDP6UOiBhZKtVY=",
         "ref": "main",
-        "rev": "1b831ed778fad5919d09cb8b70fc3ede0851729d",
-        "revCount": 89,
+        "rev": "2af2d4cc2e4675a7eebbdfccd5542d306104c237",
+        "revCount": 90,
         "type": "git",
         "url": "ssh://git@github.com/kittywitch/nixfiles-trusted"
       },