remove magit and tiny-tools (I'm using straight to load them)

[lib.git] / emacs_el / configuration / don-configuration.org

diff --git a/emacs_el/configuration/don-configuration.org b/emacs_el/configuration/don-configuration.org
index cd1fd3832dda0470d87dbc1e59baf1ebd8fd14db..60f3c536bf3d40536761d963af0e11bd92987e80 100644 (file)
--- a/emacs_el/configuration/don-configuration.org
+++ b/emacs_el/configuration/don-configuration.org
@@ -504,7 +504,7 @@ value, scrolling continues until there is no more output.
            lsp-ui-doc-delay 2)
   :hook (lsp-mode . lsp-ui-mode)
   :bind (:map lsp-ui-mode-map
-             ("c-c i" . lsp-ui-imenu)))
+             ("C-c i" . lsp-ui-imenu)))
 #+END_SRC
 *** LSP Pyright -- Python language server
 #+BEGIN_SRC emacs-lisp
@@ -539,7 +539,7 @@ value, scrolling continues until there is no more output.
 
   :bind (
          :map corfu-map
-              ("M-m" , corfu-move-to-minibuffer)
+              ("M-m" . corfu-move-to-minibuffer)
               )
   :init
   (global-corfu-mode)
@@ -572,7 +572,6 @@ value, scrolling continues until there is no more output.
 ;; load tinyprocmail
 (use-package tinyprocmail
   :straight (tinytools :type git :type git :host github :repo "jaalto/project--emacs-tiny-tools")
-  ; :load-path "~/lib/emacs_el/tiny-tools/lisp/tiny"
   :mode (".procmailrc" . turn-on-tinyprocmail-mode)
   )
 #+END_SRC
@@ -589,15 +588,18 @@ value, scrolling continues until there is no more output.
   )
 (use-package magit-annex
   :defer t
+  :after magit
   )
 (use-package magit-vcsh
   :defer t
+  :after magit
   )
 #+END_SRC
 
 *** Forge (github/gitlab)
 #+BEGIN_SRC emacs-lisp
 (use-package forge
+  :defer t
   :after magit
   )
 #+END_SRC
@@ -605,15 +607,15 @@ value, scrolling continues until there is no more output.
 ** Perl
 #+BEGIN_SRC emacs-lisp
 (use-package cperl-mode
+  :mode ("\\.pl'" . cperl-mode)
+  ("\\.perl5\\'" . cperl-mode)
+  ("\\.perl\\'" . cperl-mode)
+  ("\\.miniperl\\'" . cperl-mode)
+  ("\\.\\([Pp][Llm]\\|al\\)\\'" . cperl-mode)
+    ;; use c-mode for perl .xs files
+  ("\\.xs\\'" . c-mode)
   :config
-  (progn
-    ;; Use c-mode for perl .xs files
-    (add-to-list 'auto-mode-alist '("\\.xs\\'" . c-mode))
-    (add-to-list 'auto-mode-alist '("\\.\\([pP][Llm]\\|al\\)\\'" . cperl-mode))
-    (add-to-list 'interpreter-mode-alist '("perl" . cperl-mode))
-    (add-to-list 'interpreter-mode-alist '("perl5" . cperl-mode))
-    (add-to-list 'interpreter-mode-alist '("miniperl" . cperl-mode))
-    (setq cperl-hairy t
+       (setq cperl-hairy t
           cperl-indent-level 4
           cperl-auto-newline nil
           cperl-auto-newline-after-colon nil
@@ -628,13 +630,12 @@ value, scrolling continues until there is no more output.
           cperl-tab-always-indent t)
     (setq cperl-lazy-help-time nil)
     ;;(add-hook 'cperl-mode-hook (lambda () (cperl-set-style "PerlStyle")))
-))
+)
 #+END_SRC
 
 ** Markdown mode
 #+BEGIN_SRC emacs-lisp
 (use-package markdown-mode
-  :ensure t
   :defer t
   :mode (("\\.md\\'" . markdown-mode)
          ("\\.mdwn\\'" . markdown-mode)
@@ -654,9 +655,11 @@ value, scrolling continues until there is no more output.
 #+BEGIN_SRC emacs-lisp
 ; load sql-indent when sql is loaded
 (use-package sql-indent
+  :after sql
   :hook sql-mode
   )
 (use-package sql
+  :commands (sql-mode)
   :mode (("\\.sql\\'" . sql-mode))
   )
 #+END_SRC
@@ -762,8 +765,7 @@ Attempts to automatically identify the right indentation for a file
 ** Orderless: advanced completion style
 #+begin_src emacs-lisp
 (use-package orderless
-  :demand t
-  :config
+  :init
   ;; Configure a custom style dispatcher (see the Consult wiki)
   ;; (setq orderless-style-dispatchers '(+orderless-dispatch)
   ;;       orderless-component-separator #'orderless-escapable-split-on-space)
@@ -806,6 +808,12 @@ Attempts to automatically identify the right indentation for a file
   :hook
   (embark-collect-mode . consult-preview-at-point-mode))
 #+end_src
+** which-key (show possible completions of a key combination)
+#+BEGIN_SRC emacs-lisp
+(use-package which-key
+  :demand t
+  )
+#+END_SRC
 ** Consult
 #+begin_src emacs-lisp
 (use-package consult
@@ -1029,13 +1037,17 @@ _d_: subtree
 ** Reftex
 #+BEGIN_SRC emacs-lisp
 (use-package reftex
+  :hook ((LaTeX-mode latex-mode) . reftex-mode)
   :config
   (setq-default reftex-default-bibliography
-                  '("~/projects/research/references.bib")))
+                  '("~/projects/research/references.bib"))
+  (setq-default reftex-plug-into-AUCTeX t)
+  )
 #+END_SRC
 ** BibTex
 #+BEGIN_SRC emacs-lisp
 (use-package bibtex
+  :mode "\\.bib\\'"
   :config (setq bibtex-user-optional-fields
                 (quote (("annote" "Personal annotation (ignored)")
                         ("abstract" "")
@@ -1046,24 +1058,14 @@ _d_: subtree
 #+END_SRC
 ** LaTeX
 #+BEGIN_SRC emacs-lisp
-(use-package tex-site
+(use-package tex
   :straight auctex
   :mode ("\\.tex\\'" . LaTeX-mode)
-  :mode ("\\.bib\\'" . bibtex-mode)
   :config
   ; (add-to-list 'TeX-style-path '"/home/don/lib/emacs_el/auctex/style")
-  ;; REFTEX (much enhanced management of cross-ref, labels, etc)
-  ;; http://www.strw.leidenuniv.nl/~dominik/Tools/reftex/
-  ; (autoload 'reftex-mode     "reftex" "RefTeX Minor Mode" t)
-  ; (autoload 'turn-on-reftex  "reftex" "RefTeX Minor Mode" nil)
-  ; (autoload 'reftex-citation "reftex-cite" "Make citation" nil)
-  ; (autoload 'reftex-index-phrase-mode "reftex-index" "Phrase mode" t)
-  (add-hook 'LaTeX-mode-hook 'turn-on-reftex)   ; with AUCTeX LaTeX mode
-  (add-hook 'latex-mode-hook 'turn-on-reftex)   ; with Emacs latex mode
   (add-hook 'LaTeX-mode-hook 'outline-minor-mode)   ; with AUCTeX LaTeX mode
   (add-hook 'latex-mode-hook 'outline-minor-mode)   ; with Emacs latex mode
 
-  (setq-default reftex-plug-into-AUCTeX t)
   ;; support fake section headers
   (setq TeX-outline-extra
         '(("%chapter" 1)
@@ -1200,6 +1202,8 @@ From http://julien.danjou.info/projects/emacs-packages#rainbow-mode, this colori
 
 #+BEGIN_SRC emacs-lisp
 (use-package rainbow-mode
+  :hook ((LaTeX-mode ess-mode python-mode cperl-mode) . rainbow-mode)
+  :delight 🌈
   ;; add ess to the x major mode
   :config (add-to-list 'rainbow-x-colors-major-mode-list 'ESS[S])
   (add-to-list 'rainbow-x-colors-major-mode-list 'ESS[R])
@@ -1230,6 +1234,7 @@ From http://julien.danjou.info/projects/emacs-packages#rainbow-mode, this colori
   :mode ("\\.Rmd" . poly-markdown+r-mode)
   )
 (use-package polymode
+  :defer t
   )
 
 #+END_SRC
@@ -1241,19 +1246,44 @@ From http://julien.danjou.info/projects/emacs-packages#rainbow-mode, this colori
    :straight nil
    :delight
    :init
-   (setq outline-minor-mode-prefix "C-c C-2")
+   ; (setq outline-minor-mode-prefix nil)
+   :config
+   (define-prefix-command 'cm-map nil "Outline-")
+   (global-set-key "\M-o" cm-map)
+   ; Outline-minor-mode key map
+; HIDE
+(define-key cm-map "q" 'outline-hide-sublevels)    ; Hide everything but the top-level headings
+(define-key cm-map "t" 'outline-hide-body)         ; Hide everything but headings (all body lines)
+(define-key cm-map "o" 'outline-hide-other)        ; Hide other branches
+(define-key cm-map "c" 'outline-hide-entry)        ; Hide this entry's body
+(define-key cm-map "l" 'outline-hide-leaves)       ; Hide body lines in this entry and sub-entries
+(define-key cm-map "d" 'outline-hide-subtree)      ; Hide everything in this entry and sub-entries
+; SHOW
+(define-key cm-map "a" 'outline-show-all)          ; Show (expand) everything
+(define-key cm-map "e" 'outline-show-entry)        ; Show this heading's body
+(define-key cm-map "i" 'outline-show-children)     ; Show this heading's immediate child sub-headings
+(define-key cm-map "k" 'outline-show-branches)     ; Show all sub-headings under this heading
+(define-key cm-map "s" 'outline-show-subtree)      ; Show (expand) everything in this heading & below
+; MOVE
+(define-key cm-map "u" 'outline-up-heading)                ; Up
+(define-key cm-map "n" 'outline-next-visible-heading)      ; Next
+(define-key cm-map "p" 'outline-previous-visible-heading)  ; Previous
+(define-key cm-map "f" 'outline-forward-same-level)        ; Forward - same level
+(define-key cm-map "b" 'outline-backward-same-level)       ; Backward - same level
+
 )
 #+END_SRC
 *** outshine (outlining) integration
 #+BEGIN_SRC emacs-lisp
-(use-package outshine
-  :after outline
-  :hook (outline-minor-mode . outshine-mode)
-)
+; (use-package outshine
+;   :after outline
+;   :hook (outline-minor-mode . outshine-mode)
+; )
 #+END_SRC
 ** Writeroom Mode
 #+BEGIN_SRC emacs-lisp
 (use-package writeroom-mode
+  :commands (writeroom-mode)
   :config
   (defun my/writing-mode ()
     "Start my writing mode; enable visual-line-mode and auto-fill-mode"
@@ -1459,9 +1489,12 @@ From http://julien.danjou.info/projects/emacs-packages#rainbow-mode, this colori
 ** Beancount
 #+BEGIN_SRC emacs-lisp
 (use-package beancount
-  :straight nil
+  :straight (beancount
+             :type git
+             :host github
+             :repo "cnsunyour/beancount.el")
   :load-path "~/lib/emacs_el/beancount-mode/"
-  :mode "\\.beancount\\'"
+  :mode "\\.bean\\(?:count\\)?\\'"
   
   )
 #+END_SRC
@@ -1540,26 +1573,20 @@ From http://julien.danjou.info/projects/emacs-packages#rainbow-mode, this colori
 (use-package mutt-mode
   :mode "muttngrc"
   :mode "muttrc"
+  :config
+  (setq mutt-alias-file-list (quote ("~/.mutt/aliases" "~/.mail_aliases")))
 )
 #+END_SRC
 *** Set mail User agent
 #+BEGIN_SRC emacs-lisp
 (setq mail-user-agent (quote sendmail-user-agent))
 #+END_SRC
-*** Mail aliases
-#+BEGIN_SRC emacs-lisp
-; (use-package
-;   :straight t
-;   :hook message
-;   :config
-;   (setq mutt-alias-file-list (quote ("~/.mutt/aliases" "~/.mail_aliases")))
-; )
-#+END_SRC
 * Base emacs
 ** Reverting buffers
 #+BEGIN_SRC emacs-lisp
 (use-package autorevert
   :delight auto-revert-mode
+  :demand t
   :config
   (setq global-auto-revert-non-file-buffers t
         global-auto-revert-ignore-modes '(pdf-view-mode)
@@ -2705,28 +2732,6 @@ emacs, and use a different desktop file to restore history
 (put 'downcase-region 'disabled nil)
 (put 'narrow-to-region 'disabled nil)
 
-; Outline-minor-mode key map
-(define-prefix-command 'cm-map nil "Outline-")
-; HIDE
-(define-key cm-map "q" 'outline-hide-sublevels)    ; Hide everything but the top-level headings
-(define-key cm-map "t" 'outline-hide-body)         ; Hide everything but headings (all body lines)
-(define-key cm-map "o" 'outline-hide-other)        ; Hide other branches
-(define-key cm-map "c" 'outline-hide-entry)        ; Hide this entry's body
-(define-key cm-map "l" 'outline-hide-leaves)       ; Hide body lines in this entry and sub-entries
-(define-key cm-map "d" 'outline-hide-subtree)      ; Hide everything in this entry and sub-entries
-; SHOW
-(define-key cm-map "a" 'outline-show-all)          ; Show (expand) everything
-(define-key cm-map "e" 'outline-show-entry)        ; Show this heading's body
-(define-key cm-map "i" 'outline-show-children)     ; Show this heading's immediate child sub-headings
-(define-key cm-map "k" 'outline-show-branches)     ; Show all sub-headings under this heading
-(define-key cm-map "s" 'outline-show-subtree)      ; Show (expand) everything in this heading & below
-; MOVE
-(define-key cm-map "u" 'outline-up-heading)                ; Up
-(define-key cm-map "n" 'outline-next-visible-heading)      ; Next
-(define-key cm-map "p" 'outline-previous-visible-heading)  ; Previous
-(define-key cm-map "f" 'outline-forward-same-level)        ; Forward - same level
-(define-key cm-map "b" 'outline-backward-same-level)       ; Backward - same level
-(global-set-key "\M-o" cm-map)
 ; fix up tmux xterm keys
 ; stolen from http://unix.stackexchange.com/questions/24414/shift-arrow-not-working-in-emacs-within-tmux
 (defun fix-up-tmux-keys ()