]> git.earman.xyz Git - emacsinit.git/commitdiff
Move binds to use-package decs, restructure some includes
authorrearman <rearman@r717.net>
Wed, 20 Aug 2025 13:30:38 +0000 (09:30 -0400)
committerrearman <rearman@r717.net>
Wed, 20 Aug 2025 13:30:38 +0000 (09:30 -0400)
Trying to maximize lazy-loading whenever possible

init.el
re/re-bindings.el
re/re-howm-skeletons.el [new file with mode: 0644]
re/re-org-skeletons.el [new file with mode: 0644]
re/re-org.el
re/re-packages.el
re/re-work-skeletons.el [deleted file]

diff --git a/init.el b/init.el
index a5682ae89b1fabe9623b0220700acf31cbd3d3a7..156f5af5e3b0d9b602af2cd087075be636c08b1d 100644 (file)
--- 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)
            (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)))
index 1240b21432bf213b48462493fbc97bf62c933b70..eb26e705a5db23850cb7c3d9471bc63885859ef1 100644 (file)
@@ -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))
 (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))))
                        "]"
                        (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-<f6>" #'re/org-show-agenda)
-(keymap-global-set "S-<f7>" #'re/org-agenda-new-frame)
-(keymap-global-set "S-<f8>" #'re/org-agenda-show-custom)
-
-;; HOWM
-;; (keymap-global-set "<f6>" #'howm-menu)
-;; (keymap-global-set "<f8>" #'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 (file)
index 0000000..06ac02f
--- /dev/null
@@ -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-org-skeletons.el b/re/re-org-skeletons.el
new file mode 100644 (file)
index 0000000..710abd9
--- /dev/null
@@ -0,0 +1,54 @@
+;;; re-org-skeletons.el -*- lexical-binding: t; -*-
+;; This file is not part of GNU Emacs
+
+;;; Code:
+(define-skeleton skel-org-block
+  "Insert an org source code block"
+  ""
+  "#+begin_src "
+  _ - "\n\n"
+  "#+end_src\n")
+
+(define-skeleton skel-org-block-elisp
+  "Insert an org emacs lisp block"
+  ""
+  "#+begin_src emacs-lisp\n"
+  _ - \n
+  "#+end_src\n")
+
+(define-skeleton skel-facility-properties
+  "Insert the structure for a new facility."
+  ""
+  "** "
+  _ - \n
+  "*** System Notes\n"
+  "*** Before Startup\n"
+  "**** TODO Get Licenses      :licenses:\n"
+  "***** TODO Wonderware\n"
+  "***** TODO TOPServer\n"
+  "**** TODO Review Preliminary Sequences\n"
+  "*** PLC [/]\n"
+  "*** HMI [/]\n"
+  "*** Commissioning [/]\n"
+  "*** After Startup \n"
+  "**** TODO Markup Preliminary Sequences\n")
+
+(define-skeleton skel-person-properties
+  "Insert the org title and filetags for a person."
+  ""
+  "* @"
+  _ - \n
+  ":properties:\n"
+  ":email:\n"
+  ":office:\n"
+  ":cell:\n"
+  ":end:\n")
+
+(define-skeleton skel-workorder-properties
+  "Insert the org title and filetags for a workorder"
+  ""
+  "* TODO Workorder "
+  _ - ":#:customer:city:state:topics:\n")
+
+(provide 're-org-skeletons)
+;;; re-org-skeletons.el ends here
index 918aa7c398b6ab7266ff3ce0ffc707d23bfa48f9..d7a6bd3c11b912881ccf816fdb8d3a3631017654 100644 (file)
       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-<right>" #'org-shiftmetaright)
-           (keymap-set org-mode-map "M-<left>" #'org-shiftmetaleft)
-           (keymap-set org-mode-map "M-S-<right>" #'org-metaright)
-           (keymap-set org-mode-map "M-S-<left>" #'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
index b2eefd516c05b447daec5e41aa1436d0be92b873..389f8076497af1e9bd2a12c0bdc0bbea6fac8dc0 100644 (file)
   :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
   :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
   :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
   (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)))
 
   :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-<f6>" . re/org-show-agenda)
+   ("S-<f7>" . re/org-agenda-new-frame)
+   ("S-<f8>" . re/org-agenda-show-custom)
+   :map org-mode-map
+   ("M-<right>" . org-shiftmetaright)
+   ("M-<left>" . org-shiftmetaleft)
+   ("M-S-<right>" . org-metaright)
+   ("M-S-<left>" . 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")
        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
-  (("<f6>" quote howm-menu))
-  (("<f8>" quote re/howm-menu-new-frame)))
+  (("<f6>" . howm-menu)
+   ("<f8>" . re/howm-menu-new-frame)
+   :map howm-mode-map
+   ("k" . re/howm-create-keyword)))
 
 (use-package markdown-mode
   :ensure
diff --git a/re/re-work-skeletons.el b/re/re-work-skeletons.el
deleted file mode 100644 (file)
index bc8599e..0000000
+++ /dev/null
@@ -1,75 +0,0 @@
-;;; re-work-skeletons.el -*- lexical-binding: t; -*-
-;; This file is not part of GNU Emacs
-
-;;; Code:
-(define-skeleton skel-org-block
-  "Insert an org source code block"
-  ""
-  "#+begin_src "
-  _ - "\n\n"
-  "#+end_src\n")
-
-(define-skeleton skel-org-block-elisp
-  "Insert an org emacs lisp block"
-  ""
-  "#+begin_src emacs-lisp\n"
-  _ - \n
-  "#+end_src\n")
-
-(define-skeleton skel-facility-properties
-  "Insert the structure for a new facility."
-  ""
-  "** "
-  _ - \n
-  "*** System Notes\n"
-  "*** Before Startup\n"
-  "**** TODO Get Licenses      :licenses:\n"
-  "***** TODO Wonderware\n"
-  "***** TODO TOPServer\n"
-  "**** TODO Review Preliminary Sequences\n"
-  "*** PLC [/]\n"
-  "*** HMI [/]\n"
-  "*** Commissioning [/]\n"
-  "*** After Startup \n"
-  "**** TODO Markup Preliminary Sequences\n")
-
-(define-skeleton skel-person-properties
-  "Insert the org title and filetags for a person."
-  ""
-  "* @"
-  _ - \n
-  ":properties:\n"
-  ":email:\n"
-  ":office:\n"
-  ":cell:\n"
-  ":end:\n")
-
-(define-skeleton skel-workorder-properties
-  "Insert the org title and filetags for a workorder"
-  ""
-  "* 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