diff --git a/.config/doom/config.el b/.config/doom/config.el
index 03b1d7a..634af1c 100644
--- a/.config/doom/config.el
+++ b/.config/doom/config.el
@@ -131,31 +131,45 @@
       (ct/org-foldup)))
 (define-key org-mode-map (kbd "S-<tab>") 'ct/org-shifttab)
 
-;; PLANTUML
-
-(setq   plantuml-executable-path "nostderr"
-        plantuml-executable-args '("plantuml" "-headless")
-        plantuml-default-exec-mode 'executable
-        plantuml-jar-path "/usr/share/java/plantuml/plantuml.jar"
-        org-plantuml-jar-path plantuml-jar-path
-        plantuml-java-args '("-Djava.awt.headless=true" "-jar")
-        )
-(add-to-list 'org-src-lang-modes '("plantuml" . plantuml))
-(with-eval-after-load 'org
-(org-babel-do-load-languages
- 'org-babel-load-languages
- '(other Babel languages
-   (plantuml . t)
-   )))
-
-;; OTHERS
-(add-to-list 'auto-mode-alist (cons "\\.adoc\\'" 'adoc-mode))
-
 ;; https://emacs.stackexchange.com/questions/16744/magit-help-popup-enabled-by-default
 (defadvice magit-status (after my-magit-status-dispatch-popup)
-  (magit-dispatch-popup))
+  (call-interactively 'magit-dispatch))
 (ad-activate 'magit-status)
 
+(use-package! direnv ; nix-shell stuffs
+  :config
+    (setq direnv-always-show-summary nil)
+    (direnv-mode)
+  )
+(use-package! evil-replace-with-register ; gr
+  :init
+    (setq evil-replace-with-register-key (kbd "gr"))
+    (evil-replace-with-register-install)
+  :config
+    (map! :nv "gR" #'+eval/line-or-region)
+  )
+
+(use-package! plantuml-mode ; Diagrams
+  :config
+    (setq   plantuml-executable-path "nostderr"
+            plantuml-executable-args '("plantuml" "-headless")
+            plantuml-default-exec-mode 'executable
+            plantuml-jar-path "/usr/share/java/plantuml/plantuml.jar"
+            org-plantuml-jar-path plantuml-jar-path
+            plantuml-java-args '("-Djava.awt.headless=true" "-jar")
+            )
+    (add-to-list 'org-src-lang-modes '("plantuml" . plantuml))
+    (with-eval-after-load 'org
+    (org-babel-do-load-languages
+     'org-babel-load-languages
+     '(other Babel languages
+       (plantuml . t)
+       )))
+  )
+(use-package! adoc-mode ; Asciidoc, a md alternative
+  :config
+    (add-to-list 'auto-mode-alist (cons "\\.adoc\\'" 'adoc-mode))
+  )
 ;; Here are some additional functions/macros that could help you configure Doom:
 ;;
 ;; - `load!' for loading external *.el files relative to this one
diff --git a/.config/doom/packages.el b/.config/doom/packages.el
index 042f517..163dc35 100644
--- a/.config/doom/packages.el
+++ b/.config/doom/packages.el
@@ -52,8 +52,10 @@
 (package! annotate) ; Annotations
 (package! visual-fill-column) ; Soft line wrapping at character count
 (package! togetherly) ; Collaborative editing
-(package! plantuml-mode) ; Diagrams
 (package! ox-reveal) ; Presentations
+
 (package! direnv) ; nix-shell stuffs
+(package! evil-replace-with-register) ; grrrrr
+
+(package! plantuml-mode) ; Diagrams
 (package! adoc-mode) ; Asciidoc, a md alternative
-;(package! plantuml-mode :recipe (:local-repo "plantuml-mode"))
diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc
index 01e2b7c..fb7a2c3 100644
--- a/.config/zsh/.zshrc
+++ b/.config/zsh/.zshrc
@@ -13,7 +13,7 @@ fi 2>/dev/null || return 0
 #	source "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh"
 #fi
 
-export PATH=$HOME/.local/bin/scripts:$HOME/.local/bin:$PATH:/opt/android/sdk/platform-tools
+export PATH=$HOME/.local/bin/scripts:$HOME/.local/bin:$PATH:/opt/android/sdk/platform-tools:$XDG_CONFIG_HOME/emacs/bin
 
 export CONFIG_ZSH="$XDG_CONFIG_HOME/zsh"
 export CONFIG_SHELLS="$XDG_CONFIG_HOME/shell"