chore(editor/origami): move setup to a central list of hooks

core/siren-core-modules.el

@@ -39,6 +39,7 @@
 (require 'siren-marginalia)
 (require 'siren-minions)
 (require 'siren-mwim)
+(require 'siren-origami)
 (require 'siren-rainbow)
 (require 'siren-recentf)
 (require 'siren-savehist)

modules/editor/siren-origami.el

@@ -12,7 +12,31 @@
             "M-0" 'origami-open-all-nodes
             "M-9" 'origami-close-all-nodes
             "C-=" 'origami-forward-toggle-node
-            "C-c C-h" 'origami-forward-toggle-node))
+            "C-c C-h" 'origami-forward-toggle-node)
+
+  :hook
+  ((dart-mode
+    go-mode
+    js-mode
+    json-mode
+    php-mode
+    protobuf-mode
+    rjsx-mode
+    rust-mode
+    typescript-mode) . siren-origami-mode-enable)
+
+  :preface
+  (defun siren-origami-mode-enable ()
+    (origami-mode t))
+
+  :config
+  (dolist (item '((dart-mode . origami-c-style-parser)
+                  (json-mode . origami-c-style-parser)
+                  (protobuf-mode . origami-c-style-parser)
+                  (rjsx-mode . origami-c-style-parser)
+                  (rust-mode . origami-c-style-parser)
+                  (typescript-mode . origami-c-style-parser)))
+    (add-to-list 'origami-parser-alist item)))
 
 (use-package lsp-origami
   :after lsp-mode)

modules/languages/siren-dart.el

@@ -7,7 +7,6 @@
 ;;; Code:
 
 (require 'siren-lsp)
-(require 'siren-origami)
 (require 'siren-projectile)
 
 (use-package dart-mode
@@ -29,14 +28,9 @@
       (auto-highlight-symbol-mode -1))
 
     (lsp-deferred)
-    (origami-mode t)
     (subword-mode y))
 
   :init
-  (with-eval-after-load 'origami
-    (add-to-list 'origami-parser-alist
-                 '(dart-mode . origami-c-style-parser)))
-
   (with-eval-after-load 'projectile
     (add-to-list 'projectile-project-root-files-bottom-up "pubspec.yaml")
     (add-to-list 'projectile-project-root-files-bottom-up "BUILD")))

modules/languages/siren-golang.el

@@ -9,7 +9,6 @@
 (require 'siren-dap)
 (require 'siren-flycheck)
 (require 'siren-lsp)
-(require 'siren-origami)
 (require 'siren-prog-mode)
 (require 'siren-projectile)
 (require 'siren-reformatter)
@@ -47,7 +46,6 @@
     (when (fboundp 'auto-highlight-symbol-mode)
       (auto-highlight-symbol-mode -1))
 
-    (origami-mode t)
     (subword-mode t))
 
   (defun siren-go-dot-mod-mode-setup ()

modules/languages/siren-js.el

@@ -7,7 +7,6 @@
 ;;; Code:
 
 (require 'siren-lsp)
-(require 'siren-origami)
 
 (use-package js-mode
   :straight (:type built-in)
@@ -17,8 +16,7 @@
 
   :general
   (:keymaps 'js-mode-map
-            "C-j" 'newline-and-indent
-            "C-c C-h" 'siren-toggle-hiding)
+            "C-j" 'newline-and-indent)
 
   :hook
   (js-mode . siren-js-mode-setup)
@@ -31,8 +29,7 @@
                   indent-level width
                   tab-width width))
 
-    (subword-mode t)
-    (origami-mode t)))
+    (subword-mode t)))
 
 (use-package lsp-javascript
   :straight lsp-mode

modules/languages/siren-json.el

@@ -8,7 +8,6 @@
 
 (require 'siren-js)
 (require 'siren-lsp)
-(require 'siren-origami)
 
 (use-package json-mode
   :mode "\\.json\\'"
@@ -28,14 +27,7 @@
     (let ((width 2))
       (setq-local js-indent-level width
                   json-reformat:indent-width width
-                  tab-width width))
-
-    (origami-mode t))
-
-  :init
-  (with-eval-after-load 'origami
-    (add-to-list 'origami-parser-alist
-                 '(json-mode . origami-c-style-parser))))
+                  tab-width width))))
 
 (use-package lsp-json
   :straight lsp-mode

modules/languages/siren-jsx.el

@@ -6,8 +6,6 @@
 
 ;;; Code:
 
-(require 'siren-origami)
-
 (use-package rjsx-mode
   :mode "components\\/.*\\.js\\'"
 
@@ -15,13 +13,7 @@
 
   :preface
   (defun siren-rjsx-mode-setup ()
-    (origami-mode t)
-    (subword-mode t))
-
-  :init
-  (with-eval-after-load 'origami
-    (add-to-list 'origami-parser-alist
-                 '(rjsx-mode . origami-c-style-parser))))
+    (subword-mode t)))
 
 (provide 'siren-jsx)
 ;;; siren-jsx.el ends here

modules/languages/siren-php.el

@@ -6,7 +6,6 @@
 
 ;;; Code:
 
-(require 'siren-origami)
 (require 'siren-rainbow)
 
 (use-package php-mode
@@ -18,8 +17,7 @@
   :preface
   (defun siren-php-mode-setup ()
     (rainbow-mode t)
-    (subword-mode t)
-    (origami-mode t)))
+    (subword-mode t)))
 
 (provide 'siren-php)
 ;;; siren-php.el ends here

modules/languages/siren-protobuf.el

@@ -8,7 +8,6 @@
 
 (require 'siren-clang-format)
 (require 'siren-flycheck)
-(require 'siren-origami)
 (require 'siren-prog-mode)
 (require 'siren-reformatter)
 
@@ -31,19 +30,13 @@
       (setq-local flycheck-checker 'protobuf-buf)
       (buf-format-on-save-mode t))
 
-    (subword-mode t)
-    (origami-mode t))
+    (subword-mode t))
 
   (defun flycheck-protobuf-buf-project-root (&optional _checker)
     "Return the nearest directory holding the buf.yaml configuration."
     (and buffer-file-name
          (locate-dominating-file buffer-file-name "buf.yaml")))
 
-  :init
-  (with-eval-after-load 'origami
-    (add-to-list 'origami-parser-alist
-                 '(protobuf-mode . origami-c-style-parser)))
-
   :config
   (unbind-key "C-c C-u" 'c-mode-base-map)
 

modules/languages/siren-rust.el

@@ -7,7 +7,6 @@
 ;;; Code:
 
 (require 'siren-lsp)
-(require 'siren-origami)
 
 (use-package rust-mode
   :mode "\\.rs\\'"
@@ -24,13 +23,7 @@
   (defun siren-rust-mode-setup ()
     (setq-local rust-format-on-save t)
 
-    (origami-mode t)
-    (subword-mode t))
-
-  :init
-  (with-eval-after-load 'origami
-    (add-to-list 'origami-parser-alist
-                 '(rust-mode . origami-c-style-parser))))
+    (subword-mode t)))
 
 (use-package lsp-rust
   :straight lsp-mode

modules/languages/siren-typescript.el

@@ -8,7 +8,6 @@
 
 (require 'siren-flycheck)
 (require 'siren-lsp)
-(require 'siren-origami)
 (require 'siren-web-mode)
 
 (use-package typescript-mode
@@ -31,12 +30,7 @@
 
     (lsp-deferred)
     (subword-mode t)
-    (origami-mode t))
-
-  :init
-  (with-eval-after-load 'origami
-    (add-to-list 'origami-parser-alist
-                 '(typescript-mode . origami-c-style-parser))))
+    (flycheck-mode t)))
 
 (use-package tide
   :hook
@@ -55,7 +49,6 @@
     (setq-local flycheck-check-syntax-automatically '(save mode-enabled)
                 company-tooltip-align-annotations t)
 
-    (flycheck-mode t)
     (eldoc-mode t)
     (tide-hl-identifier-mode t))