From fb6c3247c6216c67d805047421190701d15dd1a6 Mon Sep 17 00:00:00 2001 From: rearman Date: Wed, 20 Aug 2025 09:30:38 -0400 Subject: [PATCH] Move binds to use-package decs, restructure some includes Trying to maximize lazy-loading whenever possible --- init.el | 6 +- re/re-bindings.el | 28 +++----- re/re-howm-skeletons.el | 28 ++++++++ ...-work-skeletons.el => re-org-skeletons.el} | 27 +------- re/re-org.el | 17 ----- re/re-packages.el | 67 ++++++++++++++----- 6 files changed, 94 insertions(+), 79 deletions(-) create mode 100644 re/re-howm-skeletons.el rename re/{re-work-skeletons.el => re-org-skeletons.el} (69%) diff --git a/init.el b/init.el index a5682ae..156f5af 100644 --- a/init.el +++ b/init.el @@ -19,7 +19,6 @@ (add-hook 'after-init-hook (lambda () - (require 'sedit-mouse) (require 're-logic-defuns) (require 're-repl-defuns) (require 're-math-defuns) @@ -28,10 +27,7 @@ (require 're-howm-defuns) (when (equal system-type 'windows-nt) (require 're-plc-defuns) - (require 're-refrigeration-defuns) - (require 're-work-skeletons) - (require 're-org) - (require 're-org-defuns)))) + (require 're-refrigeration-defuns)))) (add-to-list 'auto-mode-alist '("\\.keymap\\'" . c-mode)) (add-hook 'c-mode-hook (lambda () (require 're-c-style))) diff --git a/re/re-bindings.el b/re/re-bindings.el index 1240b21..eb26e70 100644 --- a/re/re-bindings.el +++ b/re/re-bindings.el @@ -80,8 +80,6 @@ (keymap-set vc-dir-mode-map "b b" #'re/vc-show-branches))) ;; (E)Lisp -(keymap-global-set "C-M-z" #'eval-region) -(keymap-global-set "C-M-S-q" #'sedit-auto-prettify-sexp) (defvar *re/lisp-mode-hooks* '(emacs-lisp-mode-hook lisp-mode-hook slime-mode-hook scheme-mode-hook geiser-mode-hook)) @@ -89,18 +87,28 @@ (dolist (hook *re/lisp-mode-hooks*) (add-hook hook (lambda () + (require 'sedit-mouse) (acme-mouse-mode 0) (sedit-mouse-mode 1) (electric-pair-mode 1) + (keymap-set lisp-mode-shared-map "C-M-z" #'eval-region) + (keymap-set lisp-mode-shared-map + "C-M-S-q" + #'sedit-auto-prettify-sexp) (keymap-set lisp-mode-shared-map "]" (re/balance-and-eval-sexp #'sedit-auto-prettify-sexp))))) (add-hook 'lisp-interaction-mode-hook - (lambda nil + (lambda () + (require 'sedit-mouse) (acme-mouse-mode 0) (sedit-mouse-mode 1) (electric-pair-mode 1) + (keymap-set lisp-interaction-mode-map "C-M-z" #'eval-region) + (keymap-set lisp-interaction-mode-map + "C-M-S-q" + #'sedit-auto-prettify-sexp) (keymap-set lisp-interaction-mode-map "]" (re/balance-and-eval-sexp #'eval-print-last-sexp)))) @@ -154,19 +162,5 @@ "]" (re/balance-and-eval-sexp #'geiser-repl-maybe-send)))) -;; Org Starters -(keymap-global-set "C-c l" #'org-store-link) -(keymap-global-set "C-c a" #'org-agenda) -(keymap-global-set "C-c c" #'org-capture) -(keymap-global-set "C-c b" #'org-switchb) -(keymap-global-set "S-" #'re/org-show-agenda) -(keymap-global-set "S-" #'re/org-agenda-new-frame) -(keymap-global-set "S-" #'re/org-agenda-show-custom) - -;; HOWM -;; (keymap-global-set "" #'howm-menu) -;; (keymap-global-set "" #'re/howm-menu-new-frame) -(keymap-global-set "C-c , k" #'re/howm-create-keyword) - (provide 're-bindings) ;;; re-bindings.el ends here diff --git a/re/re-howm-skeletons.el b/re/re-howm-skeletons.el new file mode 100644 index 0000000..06ac02f --- /dev/null +++ b/re/re-howm-skeletons.el @@ -0,0 +1,28 @@ +;;; re-howm-skeletons.el -*- lexical-binding: t; -*- +;; This file is not part of GNU Emacs + +;;; Code: + +(define-skeleton howm-facility + "Insert the structure for a facility note in HOWM" + "" + "SystemNotes" + _ - \n + "BeforeStartup\n" + "PLC\n" + "HMI\n" + "Commissioning\n" + "AfterStartup\n") + +(define-skeleton howm-person + "Insert the structure for a person note in HOWM" + "" + "Company: " + _ - \n + "Position: \n" + "Email: \n" + "Office: \n" + "Cell: \n") + +(provide 're-howm-skeletons) +;;; re-howm-skeletons.el ends here diff --git a/re/re-work-skeletons.el b/re/re-org-skeletons.el similarity index 69% rename from re/re-work-skeletons.el rename to re/re-org-skeletons.el index bc8599e..710abd9 100644 --- a/re/re-work-skeletons.el +++ b/re/re-org-skeletons.el @@ -1,4 +1,4 @@ -;;; re-work-skeletons.el -*- lexical-binding: t; -*- +;;; re-org-skeletons.el -*- lexical-binding: t; -*- ;; This file is not part of GNU Emacs ;;; Code: @@ -50,26 +50,5 @@ "* TODO Workorder " _ - ":#:customer:city:state:topics:\n") -(define-skeleton howm-facility - "Insert the structure for a facility note in HOWM" - "" - "SystemNotes" - _ - \n - "BeforeStartup\n" - "PLC\n" - "HMI\n" - "Commissioning\n" - "AfterStartup\n") - -(define-skeleton howm-person - "Insert the structure for a person note in HOWM" - "" - "Company: " - _ - \n - "Position: \n" - "Email: \n" - "Office: \n" - "Cell: \n") - -(provide 're-work-skeletons) -;;; re-skeletons.el ends here +(provide 're-org-skeletons) +;;; re-org-skeletons.el ends here diff --git a/re/re-org.el b/re/re-org.el index 918aa7c..d7a6bd3 100644 --- a/re/re-org.el +++ b/re/re-org.el @@ -131,22 +131,5 @@ org-attach-id-to-path-function-list '(org-attach-id-ts-folder-format org-attach-id-uuid-folder-format)) -(add-hook 'org-mode-hook - (lambda () - (keymap-set org-mode-map "M-" #'org-shiftmetaright) - (keymap-set org-mode-map "M-" #'org-shiftmetaleft) - (keymap-set org-mode-map "M-S-" #'org-metaright) - (keymap-set org-mode-map "M-S-" #'org-metaleft) - (keymap-set org-mode-map "C-M-u" #'org-up-element) - (keymap-set org-mode-map "C-M-d" #'org-down-element) - (keymap-set org-mode-map - "C-M-b" - #'org-backward-heading-same-level) - (keymap-set org-mode-map - "C-M-f" - #'org-forward-heading-same-level) - (keymap-set org-mode-map "C-M-p" #'org-previous-visible-heading) - (keymap-set org-mode-map "C-M-n" #'org-next-visible-heading))) - (provide 're-org) ;;; re-org.el ends here diff --git a/re/re-packages.el b/re/re-packages.el index b2eefd5..389f807 100644 --- a/re/re-packages.el +++ b/re/re-packages.el @@ -13,12 +13,6 @@ :config (add-hook 'after-init-hook 'benchmark-init/deactivate)) -(use-package ledger-mode - :ensure - t - :bind - ((:map ledger-mode-map ("C-c s" . ledger-sort-buffer)))) - (use-package visual-fill-column :ensure t @@ -57,7 +51,13 @@ :config (corfu-popupinfo-mode)) -(use-package expand-region :ensure t :bind (("C-=" quote er/expand-region))) +(use-package expand-region + :ensure + t + :defer + t + :bind + (("C-=" quote er/expand-region))) (use-package magit :ensure @@ -65,11 +65,13 @@ :config (message "Magit Loaded") :bind - ((:map ctl-x-map ("g" . magit-status)))) + (:map ctl-x-map ("g" . magit-status))) (use-package openwith :ensure t + :defer + t :config (openwith-mode t) (setq openwith-associations @@ -107,10 +109,10 @@ (when (file-exists-p "~/lisp/sbcl.core-for-slime") (setq slime-lisp-implementations '((sbcl ("sbcl" "--core" "sbcl.core-for-slime") :directory "~/lisp")))) :custom - (slime-net-coding-system 'utf-8-unix)) - -;; (add-hook 'slime-mode-hook -;; (lambda nil (unless (slime-connected-p) (save-excursion (slime))))) + (slime-net-coding-system 'utf-8-unix) + (add-hook 'slime-mode-hook + (lambda () + (unless (slime-connected-p) (save-excursion (slime)))))) ;; (use-package paredit :ensure t :bind (("C-c p" quote paredit-mode))) @@ -139,10 +141,43 @@ :config (global-aggressive-indent-mode t)) +(use-package org + :ensure + nil + :defer + t + :config + (require 're-org) + (require 're-org-defuns) + (require 're-org-skeletons) + :bind + (("C-c l" . org-store-link) + ("C-c a" . org-agenda) + ("C-c c" . org-capture) + ("C-c b" . org-switchb) + ("S-" . re/org-show-agenda) + ("S-" . re/org-agenda-new-frame) + ("S-" . re/org-agenda-show-custom) + :map org-mode-map + ("M-" . org-shiftmetaright) + ("M-" . org-shiftmetaleft) + ("M-S-" . org-metaright) + ("M-S-" . org-metaleft) + ("C-M-u" . org-up-element) + ("C-M-d" . org-down-element) + ("C-M-b" . org-backward-heading-same-level) + ("C-M-f" . org-forward-heading-same-level) + ("C-M-p" . org-previous-visible-heading) + ("C-M-n" . org-next-visible-heading))) + (use-package howm :ensure t + :init + (add-hook 'after-save-hook 'howm-mode-set-buffer-name) + (add-hook 'howm-mode-hook 'howm-mode-set-buffer-name) :config + (require 're-howm-skeletons) (setq howm-template-list '("= %title%cursor\n%date %file\n\n" "= %title%cursor Meeting\n%date %file\n\nAttendees: \n" "= @%title%cursor\n%date %file\n\n") @@ -154,11 +189,11 @@ howm-remember-insertion-format "%s" howm-menu-expiry-hours 1 howm-menu-refresh-after-save nil) - (add-hook 'after-save-hook 'howm-mode-set-buffer-name) - (add-hook 'howm-mode-hook 'howm-mode-set-buffer-name) :bind - (("" quote howm-menu)) - (("" quote re/howm-menu-new-frame))) + (("" . howm-menu) + ("" . re/howm-menu-new-frame) + :map howm-mode-map + ("k" . re/howm-create-keyword))) (use-package markdown-mode :ensure -- 2.39.5