diff --git a/flake.lock b/flake.lock
index a6866e3..4a2a988 100644
--- a/flake.lock
+++ b/flake.lock
@@ -8,11 +8,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1782941856,
-        "narHash": "sha256-dFuLC6GQSR1g9Uy7lc9Qk/etujkCjrDE85B/np7khvg=",
+        "lastModified": 1783380155,
+        "narHash": "sha256-SwUwKaLrZ+c5y4GoZHKBf1nUsDHVsIUtn2CFloZrV2A=",
         "owner": "sadjow",
         "repo": "claude-code-nix",
-        "rev": "90a137caf9a6d82389c0b26a719e26c4e6707367",
+        "rev": "25d979d1a39d0acdbcb1b8d0b9d83ffdd10b5f43",
         "type": "github"
       },
       "original": {
@@ -46,11 +46,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1782964450,
-        "narHash": "sha256-2rwNd77TzZ4sDDvMam0IXFXN5IfC35mifoeKS0uAc/4=",
+        "lastModified": 1783436070,
+        "narHash": "sha256-F80z1JoiJgZyTT5D+3siLOVzqmCEphLR7t0Ym/I2CLI=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "ebc87daabc8d3f595e9a8b67107eaaa8115ad582",
+        "rev": "f09af49406ffad37acb6538d3207189a1a1e0b7e",
         "type": "github"
       },
       "original": {
@@ -67,11 +67,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1782636943,
-        "narHash": "sha256-ripjZa7BBLwL1uS5VJF3s/VpZpWt5ZIQEvkJ/FJNpQw=",
+        "lastModified": 1783414108,
+        "narHash": "sha256-RY8e+gR2/DhXsYDxGDL6Hhe9+POD9u4+llwxMBqMQDs=",
         "owner": "nix-community",
         "repo": "nix-index-database",
-        "rev": "058b1f9381fa79fcda49982370a750ff92dbba43",
+        "rev": "96d6de10eb281b98f5cfcd1841394c03da5df77c",
         "type": "github"
       },
       "original": {
@@ -82,11 +82,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1782847225,
-        "narHash": "sha256-JC9PjqKYG9ve5U8aDOLQipp3+KLANBHUvGdLZlxzdKI=",
+        "lastModified": 1783148766,
+        "narHash": "sha256-uslt2pqShTIXDdAHRHv2QkYLsVdY8Oqwz0EA48/RSM8=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "95ca1e203c0750115fd4a6f17d5a245dfe6b1edd",
+        "rev": "a50de1b7d8a586adc18d2395c19de7d6058e6030",
         "type": "github"
       },
       "original": {
diff --git a/home.org b/home.org
index a5b9815..d5c0fb0 100644
--- a/home.org
+++ b/home.org
@@ -794,6 +794,7 @@ These are just some general settings that apply everywhere. First, a few package
         ligature
         mixed-pitch
         ace-window
+        popper
       ];
       extraConfig = builtins.readFile ./emacs-global.el;
     };
@@ -1015,6 +1016,40 @@ content to be.
                      when height do (progn (window-resize child (- height (window-height child)))
                                            (window-preserve-size child nil t))))))))
 
+  (setopt popper-reference-buffers
+          '("\\*Flymake diagnostics .*"
+            "\\*Embark Export: .*"
+            "\\*Embark Collect .*"
+            "\\*xref\\*"
+            ("\\*compilation\\*" . hide)
+            "\\*sly-mrepl *"
+            "\\*Messages\\*"
+            "\\*lispy-message\\*"
+            "\\*EGLOT connections\\*"
+            "\\*trace-output\\*"
+            "\\*occur\\*"
+            ".*eshell\\*"
+            "\\*SQL: .*"
+            "magit: *"
+            "magit-revision: .*"
+            "magit-log*"
+            "\\*Help\\*"
+            "\\*rustfmt\\*"
+            "\\*slack: .*"
+            "\\*forge: .*"
+            "new-pullreq"
+            "\\*claude:.*"
+            "\\*Man .*"
+            "\\*List .*"
+            "\\*eldoc\\*"))
+  (setopt popper-display-control nil)
+
+  (popper-mode)
+  (popper-echo-mode)
+
+  (bind-keys ("C-z" . popper-toggle)
+             ("C-;" . popper-cycle))
+
   (setq display-buffer-alist
         '(((or "\\*Flymake diagnostics .*"
                "\\*Embark Export: .*"
@@ -1029,41 +1064,41 @@ content to be.
                "\\*occur\\*"
                ".*eshell\\*"
                "\\*SQL: .*")
-             (display-buffer-in-side-window)
-             (side . bottom)
-             (slot . 0)
-             (window-height . 0.33)
-             (window-parameters (no-delete-other-windows . t)
-                                (no-other-window . t)))
-            ((or "magit: *"
-                 "magit-revision: .*"
-                 "magit-log*"
-                 "\\*Help\\*"
-                 "\\*rustfmt\\*"
-                 "\\*slack: .*"
-                 "\\*forge: .*"
-                 "new-pullreq"
-                 "\\*claude:.*"
-                 "\\*Man .*"
-                 "\\*List .*")
-             (display-buffer-in-side-window)
-             (side . right)
-             (slot . 0)
-             (window-width . 101)
-             (window-height . jf/enforce-right-side-heights)
-             (preserve-size . (t . nil))
-             (window-parameters (no-delete-other-windows . t)
-                                (no-other-window . t)))
-            ((or "\\*Embark Actions\\*"
-                 "\\*eldoc\\*")
-             (display-buffer-in-side-window)
-             (side . right)
-             (slot . -1)
-             (window-width . 101)
-             (window-height . jf/enforce-right-side-heights)
-             (preserve-size . (t . t))
-             (window-parameters (no-delete-other-windows . t)
-                                (no-other-window . t)))))
+           (display-buffer-in-side-window)
+           (side . bottom)
+           (slot . 0)
+           (window-height . 0.33)
+           (window-parameters (no-delete-other-windows . t)
+                              (no-other-window . t)))
+          ((or "magit: *"
+               "magit-revision: .*"
+               "magit-log*"
+               "\\*Help\\*"
+               "\\*rustfmt\\*"
+               "\\*slack: .*"
+               "\\*forge: .*"
+               "new-pullreq"
+               "\\*claude:.*"
+               "\\*Man .*"
+               "\\*List .*")
+           (display-buffer-in-side-window)
+           (side . right)
+           (slot . 0)
+           (window-width . 101)
+           (window-height . jf/enforce-right-side-heights)
+           (preserve-size . (t . nil))
+           (window-parameters (no-delete-other-windows . t)
+                              (no-other-window . t)))
+          ((or "\\*Embark Actions\\*"
+               "\\*eldoc\\*")
+           (display-buffer-in-side-window)
+           (side . right)
+           (slot . -1)
+           (window-width . 101)
+           (window-height . jf/enforce-right-side-heights)
+           (preserve-size . (t . t))
+           (window-parameters (no-delete-other-windows . t)
+                              (no-other-window . t)))))
 
   (setopt window-persistent-parameters
           (cl-list* '(no-delete-other-windows . writable)
@@ -1438,15 +1473,15 @@ for completion. That makes it really annoying to use; don't use yasnippet with e
   (add-hook 'emacs-lisp-mode-hook (lambda () (lispy-mode 1)))
   (add-hook 'lisp-mode-hook (lambda () (lispy-mode 1)))
   (add-hook 'lisp-data-mode-hook (lambda () (lispy-mode 1)))
-  ;; (with-eval-after-load 'lispy
-  ;;   (require 'lispyville)
-  ;;   (add-hook 'lispy-mode-hook #'lispyville-mode)
-  ;;   (bind-keys :map lispy-mode-map
-  ;;              ("i" . (lambda ()
-  ;;                       (interactive)
-  ;;                       (if (and (featurep 'god-mode) god-global-mode)
-  ;;                           (god-mode-all -1)
-  ;;                         (special-lispy-tab))))))
+  (with-eval-after-load 'lispy
+    ;; (require 'lispyville)
+    ;; (add-hook 'lispy-mode-hook #'lispyville-mode)
+    (bind-keys :map lispy-mode-map
+               ("i" . (lambda ()
+                        (interactive)
+                        (if (and (featurep 'god-mode) god-global-mode)
+                            (god-mode-all -1)
+                          (special-lispy-tab))))))
 #+END_SRC
 
 *** Typescript