diff --git a/users/simon/modules/default.nix b/users/simon/modules/default.nix
index 8c27fd4..2436573 100644
--- a/users/simon/modules/default.nix
+++ b/users/simon/modules/default.nix
@@ -15,6 +15,7 @@
     ./programs.nix
     ./scripts.nix
     ./sway.nix
+    ./tmate.nix
     ./tmux.nix
     ./vdirsyncer.nix
     ./xcompose.nix
diff --git a/users/simon/modules/tmate.nix b/users/simon/modules/tmate.nix
new file mode 100644
index 0000000..615daec
--- /dev/null
+++ b/users/simon/modules/tmate.nix
@@ -0,0 +1,12 @@
+{ lib, pkgs, ... }:
+
+{
+  home.packages = with pkgs; [
+    tmate
+  ];
+
+  home.file.".tmate.conf".text = ''
+    set tmate-authorized-keys "~/.ssh/authorized_keys_tmate"
+    source-file ~/.tmux.conf
+  '';
+}