2 files changed, 20 insertions, 23 deletions
diff --git a/users/grfn/emacs.d/config.el b/users/grfn/emacs.d/config.el
index 230211ea2f72..293afa939f24 100644
--- a/users/grfn/emacs.d/config.el
+++ b/users/grfn/emacs.d/config.el
@@ -353,24 +353,7 @@
   (setq evil-shift-width 2))
 
 (after! org
-  (load! "org-config")
-
-  (set-face-foreground 'org-block +solarized-s-base00)
-  (add-hook! org-mode
-    (add-hook! evil-normal-state-entry-hook
-      #'org-align-all-tags))
-  (add-hook 'org-mode-hook (lambda () (display-line-numbers-mode -1)))
-  (setq whitespace-global-modes '(not org-mode magit-mode vterm-mode))
-  (setf (alist-get 'file org-link-frame-setup) 'find-file-other-window)
-  (set-face-foreground 'org-block +solarized-s-base00)
-
-  ;; (add-hook! org-mode
-  ;;   (set-company-backend! 'org-mode
-  ;;     '(:separate company-ob-postgresql
-  ;;                 company-dabbrev
-  ;;                 company-yasnippet
-  ;;                 company-ispell)))
-  )
+  (load! "org-config"))
 
 (after! magit
   (setq git-commit-summary-max-length 50))
diff --git a/users/grfn/emacs.d/org-config.el b/users/grfn/emacs.d/org-config.el
index f2a60d0dc3a2..cee3204760e8 100644
--- a/users/grfn/emacs.d/org-config.el
+++ b/users/grfn/emacs.d/org-config.el
@@ -122,11 +122,6 @@
 
  org-babel-clojure-backend 'cider)
 
-(defun +grfn/org-setup ()
-  (setq-local truncate-lines -1)
-  (line-number-mode -1))
-
-(add-hook 'org-mode-hook #'+grfn/org-setup)
 
 (defun +grfn/insert-work-template ()
   (interactive)
@@ -177,3 +172,22 @@
 (advice-add
  #'forge--post-submit-callback
  :around #'forge--post-submit-around---link-pr-to-org-item)
+
+(defun +grfn/org-setup ()
+  (setq-local truncate-lines -1)
+  (display-line-numbers-mode -1)
+  (line-number-mode -1))
+
+(add-hook 'org-mode-hook #'+grfn/org-setup)
+
+(set-face-foreground 'org-block +solarized-s-base00)
+(setq whitespace-global-modes '(not org-mode magit-mode vterm-mode))
+(setf (alist-get 'file org-link-frame-setup) 'find-file-other-window)
+(set-face-foreground 'org-block +solarized-s-base00)
+
+;; (add-hook! org-mode
+;;   (set-company-backend! 'org-mode
+;;     '(:separate company-ob-postgresql
+;;                 company-dabbrev
+;;                 company-yasnippet
+;;                 company-ispell)))