Remove org-appear, add yasnippet-capf

home/emacs/default.nix

@@ -49,7 +49,6 @@
         # org-packages
         org-roam
         org-noter
-        org-appear
         org-cliplink
         org-journal
         org-modern

home/emacs/init.el

@@ -281,12 +281,6 @@
       org-journal-file-type 'monthly
       org-journal-file-format "%Y-%m.org")
 
-(setq org-hide-emphasis-markers 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")
@@ -444,8 +438,7 @@
 
 (setq corfu-cycle t
       corfu-auto t
-      corfu-auto-prefix 3
-      corfu-auto-delay 0.5)
+      corfu-auto-prefix 3)
 
 (use-package corfu
   :ensure t
@@ -456,7 +449,16 @@
     (eldoc-add-command #'corfu-insert)
     (keymap-set corfu-map "M-p" #'corfu-popupinfo-scroll-down)
     (keymap-set corfu-map "M-n" #'corfu-popupinfo-scroll-up)
-    (keymap-set corfu-map "M-d" #'corfu-popupinfo-toggle)))
+    (keymap-set corfu-map "M-d" #'corfu-popupinfo-toggle))
+
+  ;; No auto-completion or completion-on-quit in eshell
+  (defun crafted-completion-corfu-eshell ()
+    "Special settings for when using corfu with eshell."
+    (setq-local corfu-quit-at-boundary t
+                corfu-quit-no-match t
+                corfu-auto nil)
+    (corfu-mode))
+  (add-hook 'eshell-mode-hook #'crafted-completion-corfu-eshell))
 
 (use-package cape
   :ensure t
@@ -473,16 +475,7 @@
 
   ;; Ensure that pcomplete does not write to the buffer
   ;; and behaves as a pure `completion-at-point-function'.
-  (advice-add 'pcomplete-completions-at-point :around #'cape-wrap-purify)
-
-  ;; No auto-completion or completion-on-quit in eshell
-  (defun crafted-completion-corfu-eshell ()
-    "Special settings for when using corfu with eshell."
-    (setq-local corfu-quit-at-boundary t
-                corfu-quit-no-match t
-                corfu-auto nil)
-    (corfu-mode))
-  (add-hook 'eshell-mode-hook #'crafted-completion-corfu-eshell))
+  (advice-add 'pcomplete-completions-at-point :around #'cape-wrap-purify))
 
 (use-package consult
   :ensure t
@@ -519,9 +512,15 @@
   :after yasnippet
   :config (yas-reload-all))
 
+(use-package yasnippet-capf
+  :ensure t
+  :after cape
+  :config
+  (add-to-list 'completion-at-point-functions #'yasnippet-capf))
+
 (use-package consult-yasnippet
   :ensure t
-  :after (yasnippet consult)
+  :after consult
   :bind (("C-c s s" . consult-yasnippet)))
 
 (unless (package-installed-p 'kbd-mode)

home/emacs/init.org

@@ -332,14 +332,6 @@ 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-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
@@ -531,8 +523,7 @@ For reference information, see [[https://orgmode.com][Org-mode website]]
 #+begin_src emacs-lisp
   (setq corfu-cycle t
         corfu-auto t
-        corfu-auto-prefix 3
-        corfu-auto-delay 0.5)
+        corfu-auto-prefix 3)
 
   (use-package corfu
     :ensure t
@@ -543,7 +534,16 @@ For reference information, see [[https://orgmode.com][Org-mode website]]
       (eldoc-add-command #'corfu-insert)
       (keymap-set corfu-map "M-p" #'corfu-popupinfo-scroll-down)
       (keymap-set corfu-map "M-n" #'corfu-popupinfo-scroll-up)
-      (keymap-set corfu-map "M-d" #'corfu-popupinfo-toggle)))
+      (keymap-set corfu-map "M-d" #'corfu-popupinfo-toggle))
+
+    ;; No auto-completion or completion-on-quit in eshell
+    (defun crafted-completion-corfu-eshell ()
+      "Special settings for when using corfu with eshell."
+      (setq-local corfu-quit-at-boundary t
+                  corfu-quit-no-match t
+                  corfu-auto nil)
+      (corfu-mode))
+    (add-hook 'eshell-mode-hook #'crafted-completion-corfu-eshell))
 
   (use-package cape
     :ensure t
@@ -560,16 +560,7 @@ For reference information, see [[https://orgmode.com][Org-mode website]]
 
     ;; Ensure that pcomplete does not write to the buffer
     ;; and behaves as a pure `completion-at-point-function'.
-    (advice-add 'pcomplete-completions-at-point :around #'cape-wrap-purify)
-
-    ;; No auto-completion or completion-on-quit in eshell
-    (defun crafted-completion-corfu-eshell ()
-      "Special settings for when using corfu with eshell."
-      (setq-local corfu-quit-at-boundary t
-                  corfu-quit-no-match t
-                  corfu-auto nil)
-      (corfu-mode))
-    (add-hook 'eshell-mode-hook #'crafted-completion-corfu-eshell))
+    (advice-add 'pcomplete-completions-at-point :around #'cape-wrap-purify))
 #+end_src
 
 *** Consult
@@ -614,9 +605,15 @@ For reference information, see [[https://orgmode.com][Org-mode website]]
     :after yasnippet
     :config (yas-reload-all))
 
+  (use-package yasnippet-capf
+    :ensure t
+    :after cape
+    :config
+    (add-to-list 'completion-at-point-functions #'yasnippet-capf))
+
   (use-package consult-yasnippet
     :ensure t
-    :after (yasnippet consult)
+    :after consult
     :bind (("C-c s s" . consult-yasnippet)))
 #+end_src
 ** Language-specific settings