Move some of the old crafted-config options

home/emacs/init.el

@@ -266,12 +266,18 @@
       org-tags-column 0
       org-modern-tag nil
       org-outline-path-complete-in-steps nil
+      org-return-follows-link t
+      org-mouse-1-follows-link t
+      org-link-descriptive t
       org-refile-use-outline-path t
       org-refile-allow-creating-parent-nodes t
       org-refile-use-outline-path 'file
       org-refile-targets '((nil :maxlevel . 3)
                            (org-agenda-files :maxlevel . 3)))
 
+;; Visually indent org-mode files to a given header level
+(add-hook 'org-mode-hook #'org-indent-mode)
+
 (keymap-global-set "C-c o e" #'org-edit-src-code)
 (keymap-global-set "C-c o a" #'org-agenda)
 (keymap-global-set "C-c o n" #'org-capture)
@@ -301,6 +307,14 @@
       org-journal-file-type 'monthly
       org-journal-file-format "%Y-%m.org")
 
+(setq org-hide-emphasis-markers t
+      org-hide-drawer-startup t
+      org-hide-block-startup t
+      org-hide-leading-stars t)
+(use-package org-appear
+  :ensure t
+  :hook org-mode)
+
 (setq org-capture-templates
       '(("n" "Note" entry
          (file+headline "inbox.org" "Note")
@@ -379,21 +393,6 @@
   (add-hook 'org-agenda-mode-hook #'khalel-import-events)
   (khalel-add-capture-template "e"))
 
-;; Return or left-click with mouse follows link
-(customize-set-variable 'org-return-follows-link t)
-(customize-set-variable 'org-mouse-1-follows-link t)
-
-;; Display links as the description provided
-(customize-set-variable 'org-link-descriptive t)
-
-;; Visually indent org-mode files to a given header level
-(add-hook 'org-mode-hook #'org-indent-mode)
-
-;; Hide markup markers
-(customize-set-variable 'org-hide-emphasis-markers t)
-(when (locate-library "org-appear")
-  (add-hook 'org-mode-hook 'org-appear-mode))
-
 ;; Disable auto-pairing of "<" in org-mode with electric-pair-mode
 (defun crafted-org-enhance-electric-pair-inhibit-predicate ()
   "Disable auto-pairing of \"<\" in `org-mode' when using `electric-pair-mode'."

home/emacs/init.org

@@ -307,11 +307,17 @@ For reference information, see [[https://orgmode.com][Org-mode website]]
         org-tags-column 0
         org-modern-tag nil
         org-outline-path-complete-in-steps nil
+        org-return-follows-link t
+        org-mouse-1-follows-link t
+        org-link-descriptive t
         org-refile-use-outline-path t
         org-refile-allow-creating-parent-nodes t
         org-refile-use-outline-path 'file
         org-refile-targets '((nil :maxlevel . 3)
                              (org-agenda-files :maxlevel . 3)))
+
+  ;; Visually indent org-mode files to a given header level
+  (add-hook 'org-mode-hook #'org-indent-mode)
 #+END_SRC
 
 ** Keymaps
@@ -352,6 +358,16 @@ For reference information, see [[https://orgmode.com][Org-mode website]]
         org-journal-file-format "%Y-%m.org")
 #+END_SRC
 
+** org-appear
+#+begin_src emacs-lisp
+  (setq org-hide-emphasis-markers t
+        org-hide-drawer-startup t
+        org-hide-block-startup t
+        org-hide-leading-stars t)
+  (use-package org-appear
+    :ensure t
+    :hook org-mode)
+#+end_src
 ** Capture templates
 #+BEGIN_SRC emacs-lisp :results output silent
   (setq org-capture-templates
@@ -440,20 +456,7 @@ For reference information, see [[https://orgmode.com][Org-mode website]]
 #+end_src
 ** TODO Crafted config
 #+BEGIN_SRC emacs-lisp
-  ;; Return or left-click with mouse follows link
-  (customize-set-variable 'org-return-follows-link t)
-  (customize-set-variable 'org-mouse-1-follows-link t)
   
-  ;; Display links as the description provided
-  (customize-set-variable 'org-link-descriptive t)
-
-  ;; Visually indent org-mode files to a given header level
-  (add-hook 'org-mode-hook #'org-indent-mode)
-
-  ;; Hide markup markers
-  (customize-set-variable 'org-hide-emphasis-markers t)
-  (when (locate-library "org-appear")
-    (add-hook 'org-mode-hook 'org-appear-mode))
 
   ;; Disable auto-pairing of "<" in org-mode with electric-pair-mode
   (defun crafted-org-enhance-electric-pair-inhibit-predicate ()
@@ -555,8 +558,8 @@ For reference information, see [[https://orgmode.com][Org-mode website]]
   (use-package magit
     :ensure t)
 #+end_src
-** [5/6] Completion
+** Completion
-*** DONE Vertico
+*** Vertico
 #+begin_src emacs-lisp
   (setq vertico-cycle t)
   (use-package vertico
@@ -566,7 +569,7 @@ For reference information, see [[https://orgmode.com][Org-mode website]]
     (vertico-mode +1))
 #+end_src
 
-*** DONE Marginalia
+*** Marginalia
 #+begin_src emacs-lisp
   (setq marginalia-annotators '(marginalia-annotators-heavy
                                 marginalia-annotators-light
@@ -576,7 +579,7 @@ For reference information, see [[https://orgmode.com][Org-mode website]]
     :config (marginalia-mode +1))
 #+end_src
 
-*** DONE Orderless
+*** Orderless
 #+begin_src emacs-lisp
   (use-package orderless
     :ensure t
@@ -584,7 +587,7 @@ For reference information, see [[https://orgmode.com][Org-mode website]]
                   completion-category-overrides '((file (styles . (partial-completion))))))
 #+end_src
 
-*** TODO Corfu and Cape
+*** Corfu and Cape
 #+begin_src emacs-lisp
   (setq corfu-cycle t
         corfu-auto t
@@ -629,7 +632,7 @@ For reference information, see [[https://orgmode.com][Org-mode website]]
     (add-hook 'eshell-mode-hook #'crafted-completion-corfu-eshell))
 #+end_src
 
-*** DONE Consult
+*** Consult
 #+begin_src emacs-lisp
   (use-package consult
     :ensure t
@@ -648,7 +651,7 @@ For reference information, see [[https://orgmode.com][Org-mode website]]
     :config (setq completion-in-region-function #'consult-completion-in-region))
 #+end_src
 
-*** DONE Embark
+*** Embark
 #+begin_src emacs-lisp
   (use-package embark
     :ensure t