diff --git a/users/grfn/emacs.d/rust.el b/users/grfn/emacs.d/rust.el
index 1c1c75aab..176aad080 100644
--- a/users/grfn/emacs.d/rust.el
+++ b/users/grfn/emacs.d/rust.el
@@ -5,8 +5,9 @@
 (defun grfn/rust-setup ()
   (interactive)
 
-  (push '(?> . ("<" . ">")) evil-surround-pairs-alist)
-  (push '(?< . ("< " . " >")) evil-surround-pairs-alist)
+  (direnv--maybe-update-environment)
+
+  (+evil-embrace-angle-bracket-modes-hook-h)
 
   (setq lsp-rust-server 'rust-analyzer)
   (setq-local whitespace-line-column 100