diff --git a/user/app/doom-emacs/config.el b/user/app/doom-emacs/config.el
index 5289a1d..667e717 100644
--- a/user/app/doom-emacs/config.el
+++ b/user/app/doom-emacs/config.el
@@ -130,6 +130,10 @@
 (setq org-startup-with-inline-images t
       org-image-actual-width nil)
 
+(require 'evil-org)
+(require 'evil-org-agenda)
+(add-hook 'org-mode-hook 'evil-org-mode -100)
+
 ;; Top-level headings should be bigger!
 (custom-set-faces!
   '(org-level-1 :inherit outline-1 :height 1.3)
@@ -141,16 +145,6 @@
   '(org-level-7 :inherit outline-7 :height 1.05)
   )
 
-;(custom-set-faces!
-;  '(org-link :foreground nil))
-
-;; Pretty org bullets
-;;(use-package org-bullets
-;;    :ensure t
-;;        :init
-;;        (add-hook 'org-mode-hook (lambda ()
-;;                                   (org-bullets-mode 1))))
-
 (after! org (org-eldoc-load))
 
 (with-eval-after-load 'org (global-org-modern-mode))
@@ -675,9 +669,6 @@ same directory as the org-buffer and insert a link to this file."
 
 (add-hook 'org-mode-hook 'org-roam-olivetti-mode)
 
-(use-package org-roam-dblocks
-  :hook (org-mode . org-roam-dblocks-autoupdate-mode))
-
 (setq org-id-extra-files 'org-agenda-text-search-extra-files)
 
 ;(add-to-list 'display-buffer-alist '("^\\ORUI" display-buffer-in-side-window
diff --git a/user/app/doom-emacs/doom.org b/user/app/doom-emacs/doom.org
index 00e87a3..538fea4 100644
--- a/user/app/doom-emacs/doom.org
+++ b/user/app/doom-emacs/doom.org
@@ -189,6 +189,10 @@ I use this functionality to load my private config file with non-public informat
 (setq org-startup-with-inline-images t
       org-image-actual-width nil)
 
+(require 'evil-org)
+(require 'evil-org-agenda)
+(add-hook 'org-mode-hook 'evil-org-mode -100)
+
 ;; Top-level headings should be bigger!
 (custom-set-faces!
   '(org-level-1 :inherit outline-1 :height 1.3)
@@ -200,16 +204,6 @@ I use this functionality to load my private config file with non-public informat
   '(org-level-7 :inherit outline-7 :height 1.05)
   )
 
-;(custom-set-faces!
-;  '(org-link :foreground nil))
-
-;; Pretty org bullets
-;;(use-package org-bullets
-;;    :ensure t
-;;        :init
-;;        (add-hook 'org-mode-hook (lambda ()
-;;                                   (org-bullets-mode 1))))
-
 (after! org (org-eldoc-load))
 
 (with-eval-after-load 'org (global-org-modern-mode))
@@ -1002,8 +996,9 @@ styletree.write('styles.xml')
 (add-hook 'org-mode-hook 'org-roam-olivetti-mode)
 
 #+END_SRC
-*** Org Roam Dynamic Blocks
-#+BEGIN_SRC emacs-lisp :tangle config.el
+*** TODO Org Roam Dynamic Blocks
+This needs fixing on NixOS:
+#+BEGIN_SRC emacs-lisp
 (use-package org-roam-dblocks
   :hook (org-mode . org-roam-dblocks-autoupdate-mode))