diff --git a/home/isabel/packages/system/secrets.yaml b/home/isabel/packages/system/secrets.yaml
index 5cd829999..ba8890fc4 100644
--- a/home/isabel/packages/system/secrets.yaml
+++ b/home/isabel/packages/system/secrets.yaml
@@ -1,4 +1,4 @@
-git-credentials: ENC[AES256_GCM,data:QQ7uZ2g7+vNVmHOzrW8CfZierRGl4/4zgWa7mV0rRjAlXQGBdBwJP73RS9ShwIOkF6Xee50u1Wf7mzPgVRsKfV0CDd1nksL2,iv:kOxAvYuM/6qDC+CgSf/EvBscwsUR0me2ruzWnBgydb8=,tag:PMib1XBF6PwbZckF2TEdHg==,type:str]
+git-credentials: ENC[AES256_GCM,data:LV6M8aa+lrYru9PbBs9YJPFQvhrwNnWqMrOfuW6mKfWeClXGfrq0/tphrjbkq0RldGRC6jmnA7tGHWMZX9mec+pGTlJSNBo=,iv:Rx9bHoRkPmsGSwFdrpqBGcxQPc3s06Vjiub5eO/2jrM=,tag:J1jF3i+ExJC4guBFeFZkYg==,type:str]
 gh-key: ENC[AES256_GCM,data:xhugvVKUKBtWqYa+uMl1WZuXJ1voPyb6dgy2Q1VzaGeH/YopTk1bt7VpOMSxQWMK9zrB55mBe+NLw/AKEvyljHV7u09v6QTXP41qMrIZ6R7WI5T2dO3zcbvltdADQQG2/XEjnEXBzxapocMYp1EHbgNK2BH6tAO/dZfBUCmcNU/L0Wpu5hIAekjuOp7yTMSs46tHiVxxfFFsFDSyutaZWg/TyOdVfvGaG+b/v1Wd6yPH5Y51bvQeygOe/Yja2NhvZxPVbOCL8ni+EBf00poagQzHdk5bl2dPMS8L1TonomlX31YsFDnQhM8HzIcqE2NG0MzLebj4EifwS3Aua0w2Uy1wyCamsU0cIulQdVb7bBgrkOapC5cW/irsp8sCMcM/fnJLwyTRrdfuaSvVolgi6JOZW3M1w/mNL7ksT3jY75p7N9F0qWOVJWPjUsuGC5YIBmrMJLnOJNnLiDy3bQo1gfKDCX3MNv9hD7pOySa1ECaJkJRCcKdcQVySfw8H9i+Q1CJxCv3ppKLwLL9UEstyY5InunXDROZCDDAlKiOdCKo0qUA=,iv:YYDuhorS7tNFOVUNe0mJyEvdiVbFpToKXtoY2z13wtw=,tag:0+SfUlVZpJlR422Nm274aA==,type:str]
 gh-key-pub: ENC[AES256_GCM,data:msiesy/1jcvf00xOA1YTJwQDPsQD8M3ozM1hcErB0vfkydlWnxt3MJl6P8mOn+3o/qayzAGegEggXTut49YL39wqabfV/EkMiVaokneDXwKBl4jpeoQuH05hDZwUk9Kgyjo+0bH1vQ==,iv:9HHOIHMIMCVYdQqNX253fwLtfi49kc+6PZBOlwwFv2Q=,tag:KY3vfvUqt0hMFP9BR6Jipw==,type:str]
 sops:
@@ -16,8 +16,8 @@ sops:
             ak1EaVp6UWRpSjBvNFJIbytDb2dxTk0KOQMjinLLMrdkpAlmEYxSHm7NYZwCpXlI
             EbeKoU5NZSRzHbKOlLe6sHK12x5jhBkDP5rAlbAmLxRJMLcqSY0+LQ==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2023-06-28T14:32:08Z"
-    mac: ENC[AES256_GCM,data:IRtzW5ZR8GdRuOSV91fcv6vxNqrAc9RSVb0y0oa2SyjpppsbEHWHUAhXopUCHIn6JvwyvNdBE6nGW0ln0ty3ybqiMpERsMWkYsYjT6vD9DT3pVXoQy2W4C/7F8BL7LMmiQNLL7i/NAg1MeorAnkNJjKx1QjWaQrC6KPneTowFn4=,iv:6hjlITh5MlxEneDLJNDUBiBBcMqDlbl8IvqEk8frkNc=,tag:sbiTmk8X96UcvbiFpc0liw==,type:str]
+    lastmodified: "2023-06-28T14:48:22Z"
+    mac: ENC[AES256_GCM,data:BCJ1Ou8wtxfVXCqTdy+9IzXeQbL6gnBcJHLWT6xerd5n51PZKfk9FiPE8323R8bAE+4NkLwoJGJKMr3QOg2mT+DfQvPrWVErlgUzzYy09Wxma7Plr7Uoz103dbPVJVP+KJ2poG3P8bwv5KWTuqUBTnolTfGhl9Fs1KRucJxG8x4=,iv:FiCkNMdgl3+NO1lwFPxbT3nxDnc9vJTky9jL66a8O/4=,tag:B3NiuqkX2qBeCADtRhxsEg==,type:str]
     pgp: []
     unencrypted_suffix: _unencrypted
     version: 3.7.3
diff --git a/home/isabel/packages/system/sops.nix b/home/isabel/packages/system/sops.nix
index eb9415dc3..a95d4b00d 100644
--- a/home/isabel/packages/system/sops.nix
+++ b/home/isabel/packages/system/sops.nix
@@ -1,15 +1,18 @@
-{config, ...}: {
+{
+  config,
+  pkgs,
+  ...
+}: {
+  home.packages = with pkgs; [sops age];
   sops = {
     gnupg.home = config.programs.gpg.homedir;
     defaultSopsFile = ./secrets.yaml;
     secrets = {
       git-credentials.path = "${config.home.homeDirectory}/.git-credentials";
-      gh-key = {
-        path = "${config.home.homeDirectory}/.ssh/keys/github/gh";
-      };
-      gh-key-pub = {
-        path = "${config.home.homeDirectory}/.ssh/keys/github/gh.pub";
-      };
+
+      # github ssh keys
+      gh-key.path = "${config.home.homeDirectory}/.ssh/keys/github/id.key";
+      gh-key-pub.path = "${config.home.homeDirectory}/.ssh/keys/github/id.pub";
     };
   };
 }
diff --git a/home/isabel/packages/system/ssh.nix b/home/isabel/packages/system/ssh.nix
index cf76508f1..b1399c200 100644
--- a/home/isabel/packages/system/ssh.nix
+++ b/home/isabel/packages/system/ssh.nix
@@ -4,9 +4,7 @@ _: {
       enable = true;
       hashKnownHosts = true;
       compression = true;
-      matchBlocks = let
-        commonIdFile = "~/.ssh/keys/id_ed25519";
-      in {
+      matchBlocks = {
         "aur.archlinux.org" = {
           user = "aur";
           hostname = "aur.archlinux.org";