diff --git a/modules/home/ssh/default.nix b/modules/home/ssh/default.nix
new file mode 100644
index 0000000..28eb5e6
--- /dev/null
+++ b/modules/home/ssh/default.nix
@@ -0,0 +1,20 @@
+{ pkgs
+, ...
+}: {
+  services.ssh-agent.enable = true;
+
+  systemd.user.services.ssh-agent-add = {
+    Unit = {
+      Description = "Automatically add ssh keys to the ssh-agent";
+      After = "ssh-agent.service";
+      Requires = "ssh-agent.service";
+    };
+
+    Service = {
+      Type = "oneshot";
+      ExecStart = "${pkgs.bash}/bin/sh -c 'SSH_AUTH_SOCK=%t/ssh-agent ${pkgs.openssh}/bin/ssh-add'";
+    };
+
+    Install.WantedBy = [ "default.target" ];
+  };
+}
diff --git a/modules/home/wayland/niri/default.nix b/modules/home/wayland/niri/default.nix
index cdace11..571fe93 100644
--- a/modules/home/wayland/niri/default.nix
+++ b/modules/home/wayland/niri/default.nix
@@ -104,7 +104,7 @@
     programs.zsh.profileExtra = lib.mkIf config.chimera.shell.zsh.enable (
       lib.mkBefore ''
         if [ -z $WAYLAND_DISPLAY ] && [ "$(tty)" = "/dev/tty1" ]; then
-          exec ${pkgs.systemd}/bin/systemd-cat -t niri ${pkgs.dbus}/bin/dbus-run-session ${config.programs.niri.package}/bin/niri --session
+          exec ${pkgs.systemd}/bin/systemd-run --user -u niri ${pkgs.dbus}/bin/dbus-run-session ${config.programs.niri.package}/bin/niri --session
         fi
       ''
     );