1 files changed, 13 insertions, 13 deletions
diff --git a/.emacs.d/lisp/init-org.el b/.emacs.d/lisp/init-org.el
index e27a9fe..14ac3d8 100644
--- a/.emacs.d/lisp/init-org.el
+++ b/.emacs.d/lisp/init-org.el
@@ -1,4 +1,4 @@
-(use-package org-ql :ensure t :defer t)
+(gx/maybe-require-package 'org-ql)
 
 (defvar gx/org-agenda-block--today-schedule
   '(agenda "" ((org-agenda-span 1)
@@ -154,11 +154,11 @@
 	("pc" "C items" tags-todo "+PRIORITIES=\"C\"")))
 
 ;; evil
-(use-package evil-org :ensure t :defer t)
-(add-hook 'org-mode-hook 'evil-org-mode)
-(add-hook 'evil-org-mode-hook
-	  (lambda ()
-	    (setq evil-want-C-i-jump nil)))
+(when (gx/maybe-require-package 'evil-org)
+  (add-hook 'org-mode-hook 'evil-org-mode)
+  (add-hook 'evil-org-mode-hook
+	    (lambda ()
+	      (setq evil-want-C-i-jump nil))))
 (with-eval-after-load 'evil
   (evil-define-key 'motion org-agenda-mode-map
     (kbd "q") (lambda ()
@@ -171,8 +171,8 @@
   (evil-org-agenda-set-keys))
 
 ;; roam
-(use-package org-roam :ensure t :defer t)
-(add-hook 'org-mode-hook 'org-roam-db-autosync-mode)
+(when (gx/maybe-require-package 'org-roam)
+  (add-hook 'org-mode-hook 'org-roam-db-autosync-mode))
 (setq org-roam-directory (file-truename "~/words"))
 (setq org-roam-db-gc-threshold most-positive-fixnum)
 (setq org-roam-dailies-directory "journals/")
@@ -195,21 +195,21 @@
 			    "#+title: %<%Y>\n"))))
 
 ;; roam ui
-(use-package org-roam-ui :ensure t :defer t)
+(gx/maybe-require-package 'org-roam-ui)
 (setq org-roam-ui-follow t
       org-roam-ui-sync-theme t
       org-roam-ui-update-on-save t
       org-roam-ui-open-at-start t)
 
 ;; alert
-(use-package org-alert :ensure t :defer t)
-(autoload 'org-alert-enable "org-alert")
+(when (gx/maybe-require-package 'org-alert)
+  (autoload 'org-alert-enable "org-alert")
+  (when (daemonp)
+    (org-alert-enable)))
 (when *is-a-linux*
   (setq alert-default-style 'libnotify))
 (when *is-a-mac*
   (setq alert-default-style 'osx-notifier))
 (setq org-alert-interval 60)
-(when (daemonp)
-  (org-alert-enable))
 
 (provide 'init-org)