Attempt to make init faster

Only load things for work when needed, etc.

diff --git a/init.el b/init.el
index fa354b42fef2f7e568896b930c139c0c5df8aeca..a5682ae89b1fabe9623b0220700acf31cbd3d3a7 100644 (file)
--- a/init.el
+++ b/init.el
@@ -10,27 +10,28 @@
 (add-to-list 'load-path (concat user-emacs-directory "sedit-mouse/"))
 (add-to-list 'load-path (concat user-emacs-directory "fully-mono-themes/"))
 
-(require 're-editing-defuns)
 (require 're-packages)
+(require 're-editing-defuns)
 (require 'acme-mouse)
-(require 'sedit-mouse)
 (require 'fully-mono-themes)
 (require 're-os-specific)
 (require 're-bindings)
 
 (add-hook 'after-init-hook
          (lambda ()
+           (require 'sedit-mouse)
            (require 're-logic-defuns)
            (require 're-repl-defuns)
            (require 're-math-defuns)
            (require 're-electronics-defuns)
-           (require 're-plc-defuns)
            (require 're-unit-conversions)
-           (require 're-refrigeration-defuns)
-           (require 're-skeletons)
-           (require 're-org)
-           (require 're-org-defuns)
-           (require 're-howm-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))))
 
 (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 b01d9de9436d587b6c585d7c49f840e593723770..1240b21432bf213b48462493fbc97bf62c933b70 100644 (file)
--- a/re/re-bindings.el
+++ b/re/re-bindings.el
@@ -164,8 +164,8 @@
 (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 "<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)

diff --git a/re/re-packages.el b/re/re-packages.el
index 288a49160ef1abf1e64160b9012acb26fcb465e9..b2eefd516c05b447daec5e41aa1436d0be92b873 100644 (file)
--- a/re/re-packages.el
+++ b/re/re-packages.el
@@ -7,6 +7,12 @@
 
 (add-to-list 'package-archives '("melpa" . "https://melpa.org/packages/") t)
 
+(use-package benchmark-init
+  :ensure
+  t
+  :config
+  (add-hook 'after-init-hook 'benchmark-init/deactivate))
+
 (use-package ledger-mode
   :ensure
   t
@@ -95,9 +101,8 @@
   t
   :defer
   t
-  :init
-  (load (expand-file-name "~/quicklisp/slime-helper.el"))
   :config
+  (load (expand-file-name "~/quicklisp/slime-helper.el"))
   (setq inferior-lisp-program "sbcl")
   (when (file-exists-p "~/lisp/sbcl.core-for-slime")
     (setq slime-lisp-implementations '((sbcl ("sbcl" "--core" "sbcl.core-for-slime") :directory "~/lisp"))))
@@ -112,6 +117,8 @@
 (use-package geiser
   :ensure
   t
+  :defer
+  t
   :config
   (if (equal system-type 'windows-nt)
       (setq geiser-chicken-binary '("C:/tools/chicken/bin/csi.exe" "-:c"))
@@ -132,27 +139,26 @@
   :config
   (global-aggressive-indent-mode t))
 
-(when (equal system-type 'windows-nt)
-  (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-template howm-template-list))
-
 (use-package howm
   :ensure
   t
   :config
-  (setq howm-keyword-file "~/howm/.howm-keys"
+  (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-template howm-template-list
+       howm-keyword-file "~/howm/.howm-keys"
        howm-history-file "~/howm/.howm-history"
-       howm-menu-file "0000-00-00-000000.txt" ; tell it where the file is, don't search for it
+       howm-menu-file "0000-00-00-000000.txt"
        howm-keyword-case-fold-search t
        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))
-
-(use-package edit-indirect :ensure t)
+  (add-hook 'howm-mode-hook 'howm-mode-set-buffer-name)
+  :bind
+  (("<f6>" quote howm-menu))
+  (("<f8>" quote re/howm-menu-new-frame)))
 
 (use-package markdown-mode
   :ensure
@@ -174,5 +180,7 @@
        ("C-M-p" . markdown-outline-previous)
        ("C-M-n" . markdown-outline-next)))
 
+(use-package edit-indirect :ensure t :after 'markdown-mode)
+
 (provide 're-packages)
 ;;; re-packages.el ends here

diff --git a/re/re-skeletons.el b/re/re-skeletons.el
deleted file mode 100644 (file)
index 131f763..0000000
--- a/re/re-skeletons.el
+++ /dev/null
@@ -1,75 +0,0 @@
-;;; re-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-skeletons)
-;;; re-skeletons.el ends here

diff --git a/re/re-work-skeletons.el b/re/re-work-skeletons.el
new file mode 100644 (file)
index 0000000..bc8599e
--- /dev/null
+++ b/re/re-work-skeletons.el
@@ -0,0 +1,75 @@
+;;; 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