- emacs: remove some old cruft

- emacs: move all `add-hook's to their respective use-package defs
- emacs: add the normal hooks to conf-mode too
master
an 2022-06-21 07:53:18 -06:00
parent 812d165126
commit b94f488092
3 changed files with 31 additions and 60 deletions

View File

@ -1,8 +1,3 @@
(defgroup agw nil
"Alison G. Watson's customizations."
:prefix "agw-"
:group 'convenience)
(defvar agw-mode-map (make-sparse-keymap)
"Global keymap for `agw-mode'.")
@ -46,16 +41,6 @@
(copyright-update)
(delete-trailing-whitespace)))
(defun agw-remove-elc ()
"Removes an elc file if it exists."
(let ((elc (concat buffer-file-name "c")))
(if (file-exists-p elc)
(delete-file elc))))
(defun agw-el-mode ()
"Sets up `emacs-lisp-mode'."
(add-hook 'after-save-hook #'agw-remove-elc nil t))
(defun agw-evil-visual-state-tag (&optional selection)
"Displays the mode for the visual state."
(let ((selection (or selection evil-visual-selection)))
@ -118,23 +103,6 @@
"Major mode for Lithium sound definitions."
(setq font-lock-defaults '(agw-lithtxt-highlights)))
(fset 'agw-create-mthd-link
(kmacro-lambda-form [?i ?\[ escape ?l ?v ?f ?\( ?h ?y ?f ?\( ?i
?\] ?\{ ?: ?# ?m ?t ?h ?d ?- escape ?p ?l
?i ?\} escape ?v ?F ?- ?g ?u]
0
"%d"))
(fset 'agw-create-memb-link
(kmacro-lambda-form [?v ?$ ?h ?y ?i ?\[ escape ?A ?\] ?\{ ?\}
escape ?i ?: ?# ?m ?e ?m ?b ?- escape ?p ?v
?F ?- ?g ?u]
0
"%d"))
(fset 'agw-create-back-link
(kmacro-lambda-form [?v ?f ?\] ?h ?y ?$ ?p ?v ?F ?- ?g ?u] 0 "%d"))
(provide 'agw-lithtxt-mode)
;; EOF

View File

@ -13,6 +13,11 @@
initial-scratch-message nil
mark-ring-max 1024))
(defgroup agw nil
"Alison G. Watson's customizations."
:prefix "agw-"
:group 'convenience)
(if (eq system-type 'windows-nt)
(progn
(setenv "PATH" (concat "C:/emacs/bin;" (getenv "PATH")))

View File

@ -25,14 +25,6 @@
hscroll-step 1)
(set-scroll-bar-mode nil)
;; `prog-mode'
(add-hook 'prog-mode-hook #'agw-flyspell-prog-mode)
(add-hook 'prog-mode-hook #'subword-mode)
;; `text-mode'
(add-hook 'text-mode-hook #'agw-flyspell-prog-mode)
(add-hook 'text-mode-hook #'subword-mode)
;; macros
(setq initial-buffer-choice
(lambda ()
@ -40,20 +32,9 @@
(current-buffer)
(find-file "~/org/init.org"))))
(add-hook 'emacs-lisp-mode-hook #'agw-no-tabs)
(add-hook 'lisp-mode-hook #'agw-no-tabs)
(add-hook 'reb-lisp-mode-hook #'agw-no-tabs)
(add-hook 'scheme-mode-hook #'agw-no-tabs)
(add-hook 'before-save-hook #'agw-before-save)
(agw-set-key "b d" #'kill-this-buffer)
(agw-set-key "b e" #'ibuffer)
(agw-set-key "m j" #'agw-create-back-link)
(agw-set-key "m k" #'agw-create-memb-link)
(agw-set-key "m l" #'agw-create-mthd-link)
(agw-set-key "a" #'org-archive-to-archive-sibling)
(agw-set-key "A" #'org-force-cycle-archived)
@ -96,7 +77,18 @@
(enable-theme 'agw-base16-fira))
;; major modes
(use-package elisp-mode)
(use-package prog-mode
:hook ((prog-mode . agw-flyspell-prog-mode)))
(use-package text-mode
:hook ((text-mode . agw-flyspell-mode)))
(use-package lisp-mode
:hook (lisp-mode . agw-no-tabs))
(use-package elisp-mode
:hook (emacs-lisp-mode . agw-no-tabs))
(use-package eldoc)
(use-package sfz-mode
@ -181,7 +173,6 @@
(use-package markdown-mode
:ensure t
:hook (markdown-mode . agw-flyspell-mode)
:mode (("\\.mdwn\\'" . markdown-mode)))
(use-package ninja-mode
@ -217,8 +208,7 @@
;; org-mode
(use-package org
:hook ((org-mode . agw-flyspell-mode)
(org-mode . agw-org-mode))
:hook (org-mode . agw-org-mode)
:init
(setq org-fontify-whole-heading-line t
org-hide-emphasis-markers t
@ -298,7 +288,8 @@
(use-package rainbow-delimiters
:ensure t
:hook (prog-mode . rainbow-delimiters-mode)
:hook ((prog-mode . rainbow-delimiters-mode)
(conf-mode . rainbow-delimiters-mode))
:init
(setq rainbow-delimiters-max-face-count 8)
:config
@ -319,7 +310,8 @@
(use-package whitespace
:hook ((prog-mode . whitespace-mode)
(text-mode . whitespace-mode))
(text-mode . whitespace-mode)
(conf-mode . whitespace-mode))
:init
(setq whitespace-style '(face
space-before-tab
@ -334,7 +326,8 @@
(use-package hl-line
:hook ((prog-mode . hl-line-mode)
(text-mode . hl-line-mode)))
(text-mode . hl-line-mode)
(conf-mode . hl-line-mode)))
(use-package image-file
:config
@ -355,6 +348,7 @@
(setq vc-follow-symlinks t))
(use-package files
:hook (before-save . agw-before-save)
:init
(setq require-final-newline t))
@ -482,12 +476,16 @@
:config
(fringe-mode 0))
(use-package subword)
(use-package subword
:hook ((prog-mode . subword-mode)
(text-mode . subword-mode)
(conf-mode . subword-mode)))
(use-package rainbow-mode
:ensure t
:hook ((prog-mode . rainbow-mode)
(text-mode . rainbow-mode)))
(text-mode . rainbow-mode)
(conf-mode . rainbow-mode)))
;; end of init
(setq gc-cons-threshold (* 1 1000 1000))