diff --git a/README.org b/README.org
index 45e49764..dc1756ae 100644
--- a/README.org
+++ b/README.org
@@ -31,6 +31,8 @@
   - [[#elfeed][Elfeed]]
   - [[#bongo][Bongo]]
   - [[#transmission][Transmission]]
+  - [[#pass][Pass]]
+  - [[#matrix][Matrix]]
   - [[#performance][Performance]]
   - [[#logging][Logging]]
 - [[#early-init][Early Init]]
@@ -332,6 +334,7 @@ This evil-collection package includes a lot of other evil based things.
     "o" '(:ignore t :which-key "open")
     "h" '(:ignore t :which-key "help")
     "n" '(:ignore t :which-key "notes")
+    "sp" '(:ignore t :which-key "passwords")
     "bs" '(consult-buffer :which-key "buffer search")
     "bd" '(kill-this-buffer :which-key "kill buffer")
     "bi" '(ibuffer :which-key "ibuffer")
@@ -1825,6 +1828,42 @@ I use transmission on a server to manage my torrents
       "ot" 'transmission))
 #+end_src
 
+** Pass
+I like to keep my passwords in password-store for a very unixy way of doing things.
+#+begin_src emacs-lisp
+(use-package auth-source-pass
+  :defer 1
+  :config (auth-source-pass-enable))
+#+end_src
+
+#+begin_src emacs-lisp
+(use-package pass
+  :defer 1)
+#+end_src
+
+#+begin_src emacs-lisp
+(use-package password-store
+  :after pass
+  :general
+  (chris/leader-keys
+    "sp" 'password-store-copy))
+#+end_src
+
+#+begin_src emacs-lisp
+(use-package password-store-otp
+  :after password-store
+  :general
+  (chris/leader-keys
+    "st" 'password-store-otp-token-copy))
+#+end_src
+
+** Matrix
+Matrix.el is a decent enough matrix client built in emacs. Like it.
+#+begin_src emacs-lisp :tangle no
+(use-package matrix-client
+  :straight (matrix-client :type git :host github :repo "alphapapa/matrix-client.el"))
+#+end_src
+
 ** Performance
 Here we have a bunch of performance tweaks
 #+begin_src emacs-lisp
diff --git a/init.el b/init.el
index 49497c03..449f33c2 100644
--- a/init.el
+++ b/init.el
@@ -208,6 +208,7 @@
     "o" '(:ignore t :which-key "open")
     "h" '(:ignore t :which-key "help")
     "n" '(:ignore t :which-key "notes")
+    "sp" '(:ignore t :which-key "passwords")
     "bs" '(consult-buffer :which-key "buffer search")
     "bd" '(kill-this-buffer :which-key "kill buffer")
     "bi" '(ibuffer :which-key "ibuffer")
@@ -1383,6 +1384,25 @@ interfere with the default `bongo-playlist-buffer'."
       :keymaps 'override
       "ot" 'transmission))
 
+(use-package auth-source-pass
+  :defer 1
+  :config (auth-source-pass-enable))
+
+(use-package pass
+  :defer 1)
+
+(use-package password-store
+  :after pass
+  :general
+  (chris/leader-keys
+    "sp" 'password-store-copy))
+
+(use-package password-store-otp
+  :after password-store
+  :general
+  (chris/leader-keys
+    "st" 'password-store-otp-token-copy))
+
 ;; Reduce rendering/line scan work for Emacs by not rendering cursors or regions
 ;; in non-focused windows.
 (setq-default cursor-in-non-selected-windows nil)