a bit of fat trimming

3 files changed, 17 insertions, 59 deletions

diff --git a/attic/elisp/misc.el b/attic/elisp/misc.el
index 90d4639..3c9a7b8 100644
--- a/attic/elisp/misc.el
+++ b/attic/elisp/misc.el
@@ -564,17 +564,6 @@
   (jao-notmuch-tree--next t t exit))
 
 
-;;; imenu
-(use-package imenu
-  :config
-  (defun jao-imenu-hook ()
-    (unless (featurep 'pulsar)
-      (cond ((derived-mode-p 'org-mode) (org-reveal t))
-            (outline-minor-mode (outline-show-entry))
-            ((derived-mode-p 'outline-mode) (outline-show-entry)))))
-
-  (add-hook 'imenu-after-jump-hook #'jao-imenu-hook))
-
 ;;; elpher/gemini
 (use-package elpher :ensure t)
 (defun jao-elpher--browse (url &rest _) (elpher-go url))
diff --git a/custom/jao-custom-org.el b/custom/jao-custom-org.el
index 8c4d88c..410dea9 100644
--- a/custom/jao-custom-org.el
+++ b/custom/jao-custom-org.el
@@ -96,6 +96,7 @@
 ;;; Appearance
 ;; Show hidden emphasis markers
 (use-package org-appear
+  :disabled t
   :ensure t
   :init (setq org-appear-autolinks nil
               org-appear-delay 0.0
diff --git a/init.el b/init.el
index b89b210..05b6ffb 100644
--- a/init.el
+++ b/init.el
@@ -1409,10 +1409,6 @@
 (defun jao--find-file-other-window (url &rest _)
   (find-file-other-window (jao--fln url)))
 
-(use-package elpher :ensure t)
-
-(defun jao-elpher--browse (url &rest _) (elpher-go url))
-
 (defvar jao-browse--sound-rx
   (format "^https?://.*/.*\\.%s" (regexp-opt '("mp3" "flv"))))
 
@@ -1423,8 +1419,7 @@
   (apply jao-browse-url-function args))
 
 (setq browse-url-handlers
-      `(("^\\(gemini\\|gopher\\)://.*" . jao-elpher--browse)
-        (jao-video--url-p . jao-maybe-view-video)
+      `((jao-video--url-p . jao-maybe-view-video)
         (,jao--doc-exts . jao--browse-doc)
         (,jao--see-exts . jao--see)
         ("^file://?.+\\.html?$" . ,jao-browse-url-function)
@@ -1755,9 +1750,8 @@
       eshell-destroy-buffer-when-process-dies nil
       eshell-escape-control-x t)
 
-(use-package eshell-vterm :ensure t)
-
-(when jao-use-vterm (eshell-vterm-mode))
+;; (use-package eshell-vterm :ensure t)
+;; (when jao-use-vterm (eshell-vterm-mode))
 
 ;;;;; bol
 (defun jao-eshell-maybe-bol ()
@@ -1895,7 +1889,7 @@
 (global-diff-hl-mode 1)
 (diff-hl-margin-mode 1)
 
-;;;; magit and forge
+;;;; magit/forge
 (use-package magit
   :ensure t
   :commands magit-status
@@ -1920,53 +1914,27 @@
         magit-section-visibility-indicator '("…" . t)
         magit-status-buffer-switch-function 'switch-to-buffer
         magit-status-show-hashes-in-headers t)
-  :config
+  :bind ((:map forge-topic-mode-map ("M-w" . copy-region-as-kill))))
 
-  (use-package forge
-    :ensure t
-    :demand t
-    :init
-    (setq forge-topic-list-limit (cons 100 -1)
-          forge-pull-notifications nil))
+;;;; forge
+(use-package forge
+  :ensure t
+  :after magit
+  :init
+  (setq forge-topic-list-limit (cons 100 -1)
+        forge-pull-notifications nil)
+  :config
 
   (add-hook 'magit-status-sections-hook #'forge-insert-assigned-pullreqs t)
-  (add-hook 'magit-status-sections-hook #'forge-insert-assigned-issues t)
-
-  :bind ((:map forge-topic-mode-map ("M-w" . copy-region-as-kill))))
+  (add-hook 'magit-status-sections-hook #'forge-insert-assigned-issues t))
 
-;;;;; code reviews
+;;;; code reviews
 (use-package code-review
   :ensure t
   :after forge
   :bind (:map magit-status-mode-map
               ("C-c C-r" . code-review-forge-pr-at-point)))
 
-;;;;; eldoc for magit status/log buffers
-(defun jao-magit-eldoc-for-commit (_callback)
-  (when-let ((commit (magit-commit-at-point)))
-    (with-temp-buffer
-      (magit-git-insert "show"
-                        "--format=format:%an <%ae>, %ar"
-                        (format "--stat=%d" (window-width))
-                        commit)
-      (goto-char (point-min))
-      (put-text-property (point-min) (line-end-position) 'face 'bold)
-      (buffer-string))))
-
-(defun jao-magit-eldoc-setup ()
-  (add-hook 'eldoc-documentation-functions
-            #'jao-magit-eldoc-for-commit nil t)
-  (eldoc-mode 1))
-
-(add-hook 'magit-log-mode-hook #'jao-magit-eldoc-setup)
-(add-hook 'magit-status-mode-hook #'jao-magit-eldoc-setup)
-
-(with-eval-after-load "eldoc"
-  (eldoc-add-command 'magit-next-line)
-  (eldoc-add-command 'magit-previous-line)
-  (eldoc-add-command 'magit-section-forward)
-  (eldoc-add-command 'magit-section-backward))
-
 ;;;; other git packages
 (use-package git-timemachine :ensure t)
 
@@ -2427,7 +2395,7 @@
   :commands (pie-mode))
 
 ;;;; Prolog
-(use-package ediprolog :ensure t)
+;; (use-package ediprolog :ensure t)
 
 (use-package prolog
   :ensure t