X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=init.el;h=4855c41e3683d550e0a02ef607eb35299e546e98;hb=74067d92342d66f294e40d254bc4d13418f1b62e;hp=021fc6c9ccfdcfd3cc8a34779c92a442ee4d39c3;hpb=318f10aac932014c2ec2531bc49ccc26d7510edc;p=dot-emacs

diff --git a/init.el b/init.el
index 021fc6c..4855c41 100644
--- a/init.el
+++ b/init.el
@@ -1,4 +1,4 @@
-;; Copyright (C) 2019 Ian Kelling
+;; Copyright (C) 2020 Ian Kelling
 
 ;; This program is free software: you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
@@ -14,13 +14,13 @@
 ;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 ;; do m-x benchmark-init to see some benchmark stats
-;;(add-to-list 'load-path "~/.emacs.d/src/benchmark-init-el/")
+;;(add-to-list 'load-path (concat user-emacs-directory "src/benchmark-init-el/")
 ;;(require 'benchmark-init-loaddefs)
 ;;(benchmark-init/activate)
 
 ;;; init.el --- the start of customization
 
-;; (toggle-debug-on-error) ;uncomment to help debug
+;;(toggle-debug-on-error) ;uncomment to help debug
 
 
 ;; stop from minimizing & freezing the gui
@@ -46,11 +46,16 @@
           ;; taken from wiegley, dunno why the t is there.
           t)
 
+;; stuff to allow an alternate location for ~/.emacs.d
+(setq user-emacs-directory (file-name-directory user-init-file))
+(when (getenv "EHOME")
+  (setenv "HOME" (getenv "EHOME")))
+
 ;; 2019-6-26, 1.26s
 ;; ; to profile init:
 ;; ; uncomment the following block
- (require 'benchmark-init)
- (add-hook 'after-init-hook 'benchmark-init/deactivate)
+;;(require 'benchmark-init)
+;;(add-hook 'after-init-hook 'benchmark-init/deactivate)
 ;; ; Then run:
 ;; ; emacs -f benchmark-init/show-durations-tabulated
 ;; ; emacs -f benchmark-init/show-durations-tree
@@ -60,18 +65,13 @@
 
 ;; these need to be done before the hook in order to satisfy the byte compiler or batch mode
 
-;; this is the builtin org mode
-;;(add-to-list 'load-path "~/.emacs.d/emacs/site-lisp/org")
-
-(add-to-list 'load-path "~/.emacs.d/src/readline-complete")
+(add-to-list 'load-path (concat user-emacs-directory "src/readline-complete"))
 
 ;; disabled since not used.
-;;(add-to-list 'load-path "~/.emacs.d/src/bbdb-csv-import")
-;;(add-to-list 'load-path "~/.emacs.d/src/ghci-completion")
-;;(add-to-list 'load-path "~/.emacs.d/src/mediawiki-el")
-;;(add-to-list 'load-path "~/.emacs.d/src/spray")
+;;(add-to-list 'load-path (concat user-emacs-directory "src/bbdb-csv-import"))
+;;(add-to-list 'load-path (concat user-emacs-directory "src/spray"))
 
-(add-to-list 'load-path "~/.emacs.d/src/visible-mark")
+(add-to-list 'load-path (concat user-emacs-directory "src/visible-mark"))
 
 
 
@@ -207,17 +207,17 @@
 ;; from its README.md
 (eval-when-compile
   (require 'use-package))
-
+(use-package use-package-ensure-system-package
+  :ensure t)
 
 ;; Ubiquitous Packages. these could go anywhere actually
-(use-package saveplace
-  :unless noninteractive
-  :config
-  (save-place-mode 1))
+
 ;; find file at point
 (use-package ffap)
 
 
+
+
 (setq package-archives
       (quote
        (("gnu" . "https://elpa.gnu.org/packages/")
@@ -232,7 +232,7 @@
 
 
 ;; keep our init.el clean, by moving customization elisp to it's own file
-(setq custom-file "~/.emacs.d/custom.el")
+(setq custom-file (concat user-emacs-directory "custom.el"))
 ;; empty atm
 ;;(load custom-file 'noerror)
 
@@ -412,7 +412,9 @@
 
 ;; avoid window config hook saving too much, it can
 ;; get into loops in some random situations
-(setq my-auto-save-last nil)
+(defvar my-auto-save-last nil)
+(defvar my-as nil)
+(defvar my-auto-save-last nil)
 (defun my-auto-save-win ()
   (unless (eq (current-buffer) my-auto-save-last)
     (my-auto-save (current-buffer))))
@@ -449,7 +451,7 @@
 
 (defun my-as-on-local (&rest ignore)
   (interactive)
-  (setq-local my-as on))
+  (setq-local my-as t))
 
 ;; based on suggestion in the emacs docs, redefine these 2 functions
 ;; to avoid prompt spamming the user when we do auto-save
@@ -505,6 +507,7 @@ A non-nil CURRENT-ONLY argument means save only current buffer."
       ;; assume hard linked files are done on purpose, don't screw them up
       backup-by-copying-when-linked t)
 
+(defvar last-backup-time 0)
 ;; todo, the time needs to be an integer, not a vector type thing
 (defun constant-backup ()
   "Backup conditioned on some time passing since last one.
@@ -549,18 +552,6 @@ A non-nil CURRENT-ONLY argument means save only current buffer."
 ;; lowest bound of functionality is actually about 15 input events
 ;; (setq auto-save-interval ...)
 
-;;; c-like settings
-;; change last thing from gnu.
-;; notably this avoids brace indent after if, and 4 space indent
-(setq c-default-style '((java-mode . "java")
-                        (awk-mode . "awk")
-                        (other . "stroustrup")))
-;; for emacs itself, use
-;; (setq c-default-style '((java-mode . "java")
-;;                         (awk-mode . "awk")
-;;                         (other . "gnu")))
-;; (setq-default c-basic-offset 2)
-
 ;;; color theme
 
 ;; A Theme builder is available at http://elpa.gnu.org/themes/ along with
@@ -573,7 +564,9 @@ A non-nil CURRENT-ONLY argument means save only current buffer."
   (while custom-enabled-themes
     (disable-theme (car custom-enabled-themes)))
   (load-theme arg t))
-(setq color-theme-is-global t)
+
+;; not a real var? remove when I see this again
+;;(setq color-theme-is-global t)
 
 ;; temporary, make night be default
 
@@ -645,9 +638,10 @@ A non-nil CURRENT-ONLY argument means save only current buffer."
 (use-package saveplace
   :unless noninteractive
   :config
-  save-place-version-control 'nospecial
-  save-place-limit 4000
-  save-place-file "~/.emacs.d/places"
+  (setq
+   save-place-version-control 'nospecial
+   save-place-limit 4000
+   save-place-file (concat user-emacs-directory "places"))
   (save-place-mode 1))
 
 
@@ -659,7 +653,7 @@ A non-nil CURRENT-ONLY argument means save only current buffer."
         ;; save every minute
         savehist-autosave-interval 60
         ;; keep the home clean
-        savehist-file "~/.emacs.d/.savehist")
+        savehist-file (concat user-emacs-directory ".savehist"))
   (savehist-mode 1))
 
 ;;; dired
@@ -667,202 +661,11 @@ A non-nil CURRENT-ONLY argument means save only current buffer."
 ;; dired - reuse current buffer by pressing 'a'
 (put 'dired-find-alternate-file 'disabled nil)
 
-;;; mu4e
-
-;; alsot tried notmuch, it had some glitches, and it's config has a list
-;; of folders which i'd rather not publish, so it's config is archived.
-
-;;(add-to-list 'load-path "/usr/local/share/emacs/site-lisp/mu4e")
-;;(add-to-list 'load-path "/usr/share/emacs/site-lisp/mu4e")
-;;  (require 'mu4e)
-
-;; (setq mu4e-headers-results-limit 2000)
-
-
-
-(defun my-mu4e-init ()
-  (setq mu4e-headers-fields (delq (assoc :mailing-list mu4e-headers-fields) mu4e-headers-fields))
-  ;; it's implemented in mu4e, but not in the actions list for
-  ;; some reason.
-  (add-to-list 'mu4e-view-actions
-               '("browser view" . mu4e-action-view-in-browser) t)
-
-  (add-to-list 'mu4e-headers-actions
-               '("from this sender" . mu4e-action-msgs-by-this-sender) t)
-  (add-to-list 'mu4e-view-actions
-               '("from this sender" . mu4e-action-msgs-by-this-sender) t)
-  ;; normally, you would add to this, but we want to
-  ;; modify unread messages. the first 4 are defined by default.
-  (setq mu4e-bookmarks
-        `( ,(make-mu4e-bookmark
-             :name  "Unread messages"
-             ;; old less restrictive unread, for adapting in the future:
-             ;; flag:unread AND NOT flag:trashed AND NOT maildir:/Junk AND NOT maildir:/fwfw AND NOT maildir:/log
-             :query "flag:unread maildir:/INBOX"
-             :key ?u)
-           ,(make-mu4e-bookmark
-             :name "Today's messages"
-             :query "date:today..now"
-             :key ?t)
-           ,(make-mu4e-bookmark
-             :name "Last 7 days"
-             :query "date:7d..now"
-             :key ?w)
-           ,(make-mu4e-bookmark
-             :name "Messages with images"
-             :query "mime:image/*"
-             :key ?p))
-        )
-  )
-
-(eval-after-load "mu4e" '(my-mu4e-init))
-
-(setq
- ;; message mode prompted me on first message.
- ;; a function which describes options then sets this
- ;; the other options were to use smtp directly or pass to another mail client
- ;; here we use the standard sendmail interface. This applies for gnus too.
- send-mail-function (quote sendmail-send-it)
- ;; https://github.com/djcb/mu/issues/1025
- mail-user-agent 'mu4e-user-agent
- ;; common to gnus. default sendmail-query-once asks us, then sets this via customize.
- send-mail-function (quote sendmail-send-it)
- ;; use the standard imap folders
- mu4e-sent-folder   "/Sent"
- mu4e-drafts-folder "/Drafts"
- mu4e-trash-folder  "/Trash"
- ;; reindex new mail this often in seconds
- ;; show addresses instead of just names
- mu4e-view-show-addresses t
- mu4e-use-fancy-chars t
- mu4e-confirm-quit nil
- mu4e-headers-leave-behavior 'apply ;; dont ask, do whatever was marked
- ;; default 500.
- mu4e-headers-results-limit 1000
- ;; tell exim to use from: as envelope from.
- ;; exim's default is use outgoing_msg_localpart@hostname.
- mail-specify-envelope-from t
-
- ;; looking up the list of maildirs when doing jo from summary
- ;; can take a few seconds if we have a ton of messages.
- ;; Only take that time for the first lookup.
- ;; if we add a new maildir, just restart mu4e for it to be in that list.
- mu4e-cache-maildir-list t
- ;; default is 8, way too small for my big monitors
- mu4e-headers-visible-lines 50
- message-sendmail-envelope-from 'header
- ;; trying this out
- ;;mu4e-view-use-gnus t
- ;; had problems where mu4e and gnus would hang verifying signatures, gnus man
- ;; said this should help, but it didnt work. they still got verified.
- ;; mm-verify-option 'never
- )
-
-;; fucks up reading unread bookmark. when that is fixed, enable it
-;; (setq mu4e-update-interval 60)
-
-
-;; this file includes setting up my email addresses, which are not public,
-;; including
-;; mu4e-user-mail-address-list
-;; and a function
-;; inspired by mu4e info manual, search for mu4e-compose-pre-hook.
-(when (file-exists-p "/p/c/mymu4e.el")
-  (load "/p/c/mymu4e.el"))
-
-(defun my-decrypt ()
-  ;; use for decrypting in mu4e
-  (interactive)
-  (beginning-of-buffer)
-  (when (search-forward "-----BEGIN PGP MESSAGE-----" nil t)
-    (read-only-mode 0)
-    (let ((start (match-beginning 0))
-          (end (search-forward "-----END PGP MESSAGE-----" nil t)))
-      (shell-command-on-region start end "gpg2 -dq" nil t shell-command-default-error-buffer t)
-      )))
-(add-hook 'mu4e-view-mode-hook 'my-decrypt)
-
-(defun iank-set-from-name (regexes)
-  "If we find an address matching regex, then set that address as the to,
-and whatever was used"
-  (when mu4e-compose-parent-message
-    (let ((found nil))
-      (while (and regexes (not found))
-        (setq re (car regexes)
-              regexes (cdr regexes)
-              found (mu4e-message-contact-field-matches
-                     mu4e-compose-parent-message :to re)))
-      (when found
-        (setq user-full-name (car found))
-        ;; we get an error unless we do this. that is a bug. I could
-        ;; send a patch...  also a bug: setting message-from-style nil
-        ;; doesnt work in mu4e unless user-full-name is also nil.
-        (unless user-full-name
-          (setq message-from-style nil))
-        (setq user-mail-address (cdr found)
-              mail-signature nil))
-      found)))
-(defun iank-set-from (regexes)
-  "If we find an address matching regex, then set that address as the to,
-and Ian Kelling as the name"
-  (when mu4e-compose-parent-message
-    (let ((found nil))
-      (while (and regexes (not found))
-        (setq re (car regexes)
-              sig (cadr regexes)
-              regexes (cddr regexes)
-              found (cdr (mu4e-message-contact-field-matches
-                          mu4e-compose-parent-message :to re))))
-      (when found (setq user-mail-address found
-                        user-full-name "Ian Kelling"))
-      found)))
-
-
-(defun mu-exit-wait ()
-  (interactive)
-  ;; taken from the mu source
-  (let* ((buf (get-buffer mu4e~proc-name))
-	 (proc (and (buffer-live-p buf) (get-buffer-process buf))))
-    (mu4e-quit)
-    ;; without sleep, we get database locked by another process error when hitting u
-    ;; if another mu was running.
-    (if proc (sleep-for 0 1000))))
-
-(defun fsf-mu4e ()
-  (interactive)
-  (my-mu4e-commmon)
-  (setq
-   user-mail-address "iank@fsf.org"
-   iank-user-mail-address user-mail-address
-   ;; WARNING: be careful editing this, there needs to be a space after --, and my editor
-   ;; and git will automatically remove it unless i manually disable it.
-   mail-signature fsf-sig
-   ) ;; end setq
-  (add-hook 'mu4e-compose-pre-hook 'my-mu4e-to)
-  (mu4e))
-
-
-
-
-(defun mu4e-action-msgs-by-this-sender (msg)
-  "In header view, view messages by the sender of the message under point."
-  (let ((from (mu4e-message-field msg :from)))
-    (unless from
-      (mu4e-error "No from header for this message"))
-    ;; from is structured like: (("Anacron" . "root@x2.lan"))
-    (mu4e-headers-search (concat "f:" (cdar from)))))
-
-
-
 ;;; elisp settings
 ;; when manually evaluating lisp, go into debugger on error
 (setq eval-expression-debug-on-error t)
 
 
-(eval-after-load "python-mode"
-  '(progn
-     (define-key python-mode-map (kbd "C-j") nil)))
-
 ;;; isearch
 (setq
  isearch-allow-scroll t
@@ -987,50 +790,65 @@ and Ian Kelling as the name"
 ;; interactive modes don't need whitespace checks
 (defun interactive-lisp-coding-defaults ()
   (whitespace-mode -1))
-(setq prelude-interactive-lisp-coding-hook 'prelude-interactive-lisp-coding-defaults)
 
+;;; modes with little configuration needed
 
-;; ielm is an interactive Emacs Lisp shell
-(defun ielm-mode-defaults ()
-  (run-hooks 'prelude-interactive-lisp-coding-hook)
-  (turn-on-eldoc-mode))
-(add-hook 'ielm-mode-hook 'ielm-mode-defaults)
+(custom-set-variables
+ '(css-indent-offset 2)
+ '(sh-here-document-word "'EOF'")
+ '(outline-minor-mode-prefix "
")
+ '(tramp-default-method "ssh")
+ ;; change last thing from gnu.
+ ;; notably this avoids brace indent after if, and 4 space indent
+ ;; for emacs itself, use
+ ;; (setq c-default-style '((java-mode . "java")
+ ;;                         (awk-mode . "awk")
+ ;;                         (other . "gnu")))
+ ;; (setq-default c-basic-offset 2)
+ '(c-default-style '((java-mode . "java")
+                     (awk-mode . "awk")
+                     (other . "stroustrup")))
+ )
 
-;;; modes with little configuration needed
 
-(setq outline-minor-mode-prefix "
"
-      css-indent-offset 2
-      ;; auto indent shell script comments
-      sh-indent-comment t
-      sh-here-document-word "'EOF'"
-      tramp-default-method "ssh"
-      ;; ediff-buffers is the main command to use
-      ;; don't start another frame for the control panel
-      ;; unfortunately, this doesn't allow me to use 2 frames for the diff buffers
-      ;; so disable this temporarily with the next line if you want that
-      ;; sometime I should setup 2 functions to explicitly do each type
-      ediff-window-setup-function 'ediff-setup-windows-plain
-      ;;(setq ediff-window-setup-function 'ediff-setup-windows-default)
-      ;; do side by side diffs
-      ediff-split-window-function 'split-window-horizontally
-      ;; ediff things I tried which didn't work, which intuitively I think should
-      ;; work better: I can open the second diff buffer in a new frame, and
-      ;; close it's window in the first frame after starting ediff, but when I
-      ;; hit n to go to the next diff, it restores the window in the first
-      ;; frame. Another thing I tried is to open 2 new frames and set them up
-      ;; as I want. However, if I try to open the *Ediff Control Panel* buffer
-      ;; in a different window from its original one, my mouse jumps to one of
-      ;; the diff frames, or if that isn't visible, the buffer just hangs
-      ;; until I select the original ediff control panel window. This seems
-      ;; like a bug to me. I am using a very recent development version of
-      ;; emacs.
-
-      )
+(setq
+ ;; ediff-buffers is the main command to use
+ ;; don't start another frame for the control panel
+ ;; unfortunately, this doesn't allow me to use 2 frames for the diff buffers
+ ;; so disable this temporarily with the next line if you want that
+ ;; sometime I should setup 2 functions to explicitly do each type
+ ediff-window-setup-function 'ediff-setup-windows-plain
+ ;;(setq ediff-window-setup-function 'ediff-setup-windows-default)
+ ;; do side by side diffs
+ ediff-split-window-function 'split-window-horizontally
+ ;; ediff things I tried which didn't work, which intuitively I think should
+ ;; work better: I can open the second diff buffer in a new frame, and
+ ;; close it's window in the first frame after starting ediff, but when I
+ ;; hit n to go to the next diff, it restores the window in the first
+ ;; frame. Another thing I tried is to open 2 new frames and set them up
+ ;; as I want. However, if I try to open the *Ediff Control Panel* buffer
+ ;; in a different window from its original one, my mouse jumps to one of
+ ;; the diff frames, or if that isn't visible, the buffer just hangs
+ ;; until I select the original ediff control panel window. This seems
+ ;; like a bug to me. I am using a very recent development version of
+ ;; emacs.
+
+ )
 
 ;; disabled temporarily. todo, look into it
 ;;(add-hook 'outline-minor-mode-hook 'outshine-mode)
 
 
+
+;; this file includes setting up my email addresses, which are not public,
+;; including
+;; mu4e-user-mail-address-list
+;; and a function
+;; inspired by mu4e info manual, search for mu4e-compose-pre-hook.
+(when (file-exists-p "/p/c/mymu4e.el")
+  (load "/p/c/mymu4e.el"))
+
+
 (when (file-exists-p "/a/h/iank-mod.el")
   (load-file "/a/h/iank-mod.el"))
 
@@ -1059,18 +877,24 @@ and Ian Kelling as the name"
 ;; todo, put this on a hook with prog mode
 ;;(highlight-indentation-mode 1)
 
-(add-hook 'auto-revert-tail-mode-hook
-          (lambda ()
-            (when (string=
-                   buffer-file-name
-                   "/var/log/cloudman/development/cm-service.log")
-              (setq-local prev-auto-revert-max 0)
-              ;; set buffer-local hook
-              (add-hook 'after-revert-hook 'tail-colorize nil t))))
-(defun tail-colorize ()
-  (ansi-color-apply-on-region prev-auto-revert-max (point-max))
-  (setq-local prev-auto-revert-max (point-max)))
 
+;; example of a syntax highlighted tail
+(use-package autorevert
+  :defer t
+  :config
+  (defvar prev-auto-revert-max)
+  (defun tail-colorize ()
+    (ansi-color-apply-on-region prev-auto-revert-max (point-max))
+    (setq-local prev-auto-revert-max (point-max)))
+  (add-hook 'auto-revert-tail-mode-hook
+            (lambda ()
+              (when (string=
+                     buffer-file-name
+                     "/var/log/cloudman/development/cm-service.log")
+                (setq-local prev-auto-revert-max 0)
+                ;; set buffer-local hook
+                (add-hook 'after-revert-hook 'tail-colorize nil t))))
+  )
 
 ;; delete active selection with self-insert commands
 (delete-selection-mode t)
@@ -1080,7 +904,7 @@ and Ian Kelling as the name"
 
 ;; dot mode, repeats last action
 (require 'dot-mode)
-(add-hook 'find-file-hooks 'dot-mode-on)
+(add-hook 'find-file-hook 'dot-mode-on)
 
 ;; clean up obsolete buffers automatically at midnight
 (require 'midnight)
@@ -1121,7 +945,6 @@ and Ian Kelling as the name"
 
 ;; todo, turn on auto-fill just for txt files
 ;;(add-hook 'text-mode-hook 'turn-on-auto-fill)
-(add-hook 'text-mode-hook 'turn-on-flyspell)
 
 ;; random extra highlights
 (require 'volatile-highlights)
@@ -1233,7 +1056,7 @@ and Ian Kelling as the name"
       shift-select-mode nil
       truncate-partial-width-windows nil
       uniquify-buffer-name-style 'forward
-      oddmuse-directory "~/.emacs.d/oddmuse"
+      oddmuse-directory (concat user-emacs-directory "oddmuse")
       echo-keystrokes 0.1
       mark-ring-max 160
       sort-fold-case t  ; case insensitive line sorting
@@ -1245,9 +1068,6 @@ and Ian Kelling as the name"
       ring-bell-function 'ignore
       case-replace nil
       revert-without-query '(".*")
-      ;; don't pause display code on input.
-      ;; smoother display performance at slight cost of input performance
-      redisplay-dont-pause t
       font-lock-maximum-decoration t) ; probably default and not necesary
 
 
@@ -1260,18 +1080,6 @@ and Ian Kelling as the name"
               imenu-auto-rescan t
               indicate-empty-lines t) ; mark end of buffer
 
-(require 'smooth-scroll)
-;; long gnus summary buffers lags too much with this,
-;; but I like it enough to leave it enabled by default
-;; and crank up the step size to be faster
-;; and it doesn't have a way to enable it only for certain modes etc.
-;; todo sometime, make it work for certain modes only
-(smooth-scroll-mode t)
-;; its too slow with the default of 2
-(setq smooth-scroll/vscroll-step-size 6)
-;; sublimity doesn't work as good going fast by default
-;; smooth-scrolling.el, does not do smooth scrolling. its about cursor location
-
 
 (blink-cursor-mode '(-4))
 (menu-bar-mode -1)
@@ -1341,7 +1149,7 @@ and Ian Kelling as the name"
 (defun fill-buffer ()
   (interactive)
   (save-mark-and-excursion
-    (beginning-of-buffer)
+    (goto-char (point-min))
     (while (= (forward-line) 0)
       (fill-paragraph))))
 
@@ -1434,72 +1242,6 @@ Go to the next directory based on where the cursor is."
 ;; make window title be the buffer name
 (setq frame-title-format "%b")
 
-;; -----------------------------
-;; fixing up the mode line
-;; modified from mastering emacs blog
-;; ----------------------------
-
-(defvar mode-line-cleaner-alist
-  `((auto-complete-mode . "")
-    (yas/minor-mode . "")
-    (paredit-mode . "")
-    (auto-fill-function . "")
-    (eldoc-mode . "")
-    (abbrev-mode . "")
-    (flyspell-mode . "")
-    (glasses-mode . "")
-    (dot-mode . "")
-    (yas-global-mode . "")
-    (yas-minor-mode . "")
-    (undo-tree-mode . "")
-    (volatile-highlights-mode . "")
-    (highlight-symbol-mode . "")
-    ;; Major modes
-    (lisp-interaction-mode . "λ")
-    (hi-lock-mode . "")
-    (python-mode . "Py")
-    (emacs-lisp-mode . "EL")
-    (nxhtml-mode . "nx"))
-  "Alist for `clean-mode-line'.
-
-  When you add a new element to the alist, keep in mind that you
-  must pass the correct minor/major mode symbol and a string you
-  want to use in the modeline *in lieu of* the original.")
-
-
-(defun clean-mode-line ()
-  (interactive)
-  (loop for cleaner in mode-line-cleaner-alist
-        do (let* ((mode (car cleaner))
-                  (mode-str (cdr cleaner))
-                  (old-mode-str (cdr (assq mode minor-mode-alist))))
-             (when old-mode-str
-               (setcar old-mode-str mode-str))
-             ;; major mode
-             (when (eq mode major-mode)
-               (setq mode-name mode-str)))))
-
-                                        ; disabled
-                                        ;  (add-hook 'after-change-major-mode-hook 'clean-mode-line)
-
-
-;; alias the new `flymake-report-status-slim' to
-;; `flymake-report-status'
-(defalias 'flymake-report-status 'flymake-report-status-slim)
-(defun flymake-report-status-slim (e-w &optional status)
-  "Show \"slim\" flymake status in mode line."
-  (when e-w
-    (setq flymake-mode-line-e-w e-w))
-  (when status
-    (setq flymake-mode-line-status status))
-  (let* ((mode-line " Φ"))
-    (when (> (length flymake-mode-line-e-w) 0)
-      (setq mode-line (concat mode-line ":" flymake-mode-line-e-w)))
-    (setq mode-line (concat mode-line flymake-mode-line-status))
-    (setq flymake-mode-line mode-line)
-    (force-mode-line-update)))
-
-
 (defun my-after-change-major-mode-hook ()
   (setq mode-line-mule-info nil
         minor-mode-alist nil
@@ -1613,8 +1355,8 @@ Go to the next directory based on where the cursor is."
 (defun variable-pitch-off ()
   (variable-pitch-mode 0))
 (add-hook 'yaml-mode-hook 'variable-pitch-off)
+(add-hook 'dns-mode-hook 'variable-pitch-off)
 
-(eval-after-load "org" '(my-org-face-init))
 
 (defun my-org-face-init()
   (set-face-attribute 'org-table nil :family (face-attribute 'fixed-pitch :family))
@@ -1625,6 +1367,8 @@ Go to the next directory based on where the cursor is."
   (set-face-attribute 'org-date nil :family (face-attribute 'fixed-pitch :family))
   )
 
+(eval-after-load "org" '(my-org-face-init))
+
 (defun remove-org-binds ()
   (define-key org-mode-map (kbd "<M-return>") nil)
   (define-key org-mode-map (kbd "C-'") nil)
@@ -1680,8 +1424,6 @@ Go to the next directory based on where the cursor is."
                     nil))))))
 (add-hook 'prog-mode-hook 'prog-mode-defaults)
 
-;; enable flyspell in prog mode. text mode is handled
-(add-hook 'prog-mode-hook 'flyspell-prog-mode)
 
 
 ;;; yank auto-indent
@@ -1730,6 +1472,23 @@ indent yanked text (with prefix arg don't indent)."
 ;;  # eval: (outline-minor-mode)
 ;; # outline-regexp: "\\( *\\)# [*]\\{1,8\\} "
 
+(defun outline-level ()
+  "Return the depth to which a statement is nested in the outline.
+Point must be at the beginning of a header line.
+This is actually either the level specified in `outline-heading-alist'
+or else the number of characters matched by `outline-regexp'."
+  (or (cdr (assoc (match-string 0) outline-heading-alist))
+      (let ((whitespace-end (match-end 1))
+            (match-begin (match-beginning 0)))
+        (if (= whitespace-end match-begin)
+            (- (match-end 0) match-begin)
+          (- (match-end 0) whitespace-end)
+          ))))
+;; originally:
+;;(or (cdr (assoc (match-string 0) outline-heading-alist))
+;;    (- (match-end 0) (match-beginning 0))))
+
+
 
 ;; avoid stupid git crap like "warning, terminal not fully functional"
 (setenv "PAGER" "cat")
@@ -1778,6 +1537,10 @@ indent yanked text (with prefix arg don't indent)."
   :defer t)
 ;; rw-hunspell sets up hunspell dictionary automagically.
 
+(use-package flyspell
+  :ensure-system-package hunspell
+  :hook ((prog-mode . flyspell-prog-mode)
+         (text-mode . turn-on-flyspell)))
 
 ;; Rant: Hunspell SHOULD be standard. its used by firefox and openoffice and
 ;; osx. In contrast, the first few words I added to aspell dictionary were
@@ -1789,15 +1552,19 @@ indent yanked text (with prefix arg don't indent)."
 
 
 ;;; tex
-(setq-default TeX-PDF-mode t) ; use pdf
-;; more sensible defaults based on info manual quickstart
-(setq TeX-auto-save t
-      TeX-parse-self t
-      ;; not documented, but looking at the source, I find this
-      ;; stops me from being asked what command on every C-c-c
-      ;; when doing a latex document.
-      TeX-command-force "LaTeX"
-      )
+
+(use-package latex-mode
+  :no-require t
+  :config
+  (setq-default TeX-PDF-mode t) ; use pdf
+  ;; more sensible defaults based on info manual quickstart
+  (setq TeX-auto-save t
+        TeX-parse-self t
+        ;; not documented, but looking at the source, I find this
+        ;; stops me from being asked what command on every C-c-c
+        ;; when doing a latex document.
+        TeX-command-force "LaTeX"
+        ))
 
 ;;; visible mark mode
 
@@ -1833,7 +1600,7 @@ indent yanked text (with prefix arg don't indent)."
 ;;; znc/erc
 (defun chirp()
   (interactive)
-  (setq vol 50)
+  (setq vol 20)
   (when (string= (system-name) "kd") (setq vol 80))
   ;; speed is there so i can adjust and make it go slow so it plays long enough to adjust in pavucontrol
   (start-process-shell-command "ignoreme" nil (format "mpv --speed=1 --no-terminal --vo=null --volume=%d /a/bin/data/bird.mp3" vol)))
@@ -1896,7 +1663,7 @@ indent yanked text (with prefix arg don't indent)."
 ;; worth the benefit of only having one concept in my mind.
 (dolist
     (r `(
-         (?i (file . ,"~/.emacs.d/init.el"))
+         (?i (file . ,(concat user-emacs-directory "init.el")))
          (?o (file . ,"/a/work.org"))
          (?t (file . ,"/a/t.org"))
          (?s (file . ,"/usr/share/doc/exim4-base/spec.txt.gz"))
@@ -1918,7 +1685,7 @@ indent yanked text (with prefix arg don't indent)."
 (use-package undo-tree
   :config
   ;; more resilient undo-tree-history if we have its location set up front.
-  (setq undo-tree-history-directory-alist '(("." . "~/.undo-tree-history"))
+  (setq undo-tree-history-directory-alist '(("." . (concat user-emacs-directory ".undo-tree-history")))
         undo-outer-limit 100000000 ; per undo command
         undo-limit 500000000 ; undo history limit
         undo-strong-limit 600000000 ; undo history limit plus some extra
@@ -2411,6 +2178,8 @@ modes like org-mode which have their own yank function."
             (define-key comint-mode-map (kbd "C-r") 'comint-history-isearch-backward-regexp)))
 
 ;;;;; M-r ?? unused
+
+
 ;;;;; C-a copy buffer
 
 (defun copy-all ()
@@ -2474,34 +2243,10 @@ modes like org-mode which have their own yank function."
 
 (global-set-key (kbd "M-d") 'run)
 
-;;;;; C-M-d - swap buffer across windows
-;; from http://www.emacswiki.org/emacs/TransposeWindows
+;;;;; C-M-d - split-window-horizontally
+
+(global-set-key (kbd "C-M-d") 'split-window-horizontally)
 
-(setq swapping-buffer nil)
-(setq swapping-window nil)
-(defun swap-buffers-in-windows ()
-  "Swap buffers between two windows"
-  (interactive)
-  (if (and swapping-window
-           swapping-buffer)
-      (let ((this-buffer (current-buffer))
-            (this-window (selected-window)))
-        (if (and (window-live-p swapping-window)
-                 (buffer-live-p swapping-buffer))
-            (progn (switch-to-buffer swapping-buffer)
-                   (select-window swapping-window)
-                   (switch-to-buffer this-buffer)
-                   (select-window this-window)
-                   (message "Swapped buffers."))
-          (message "Old buffer/window killed.  Aborting."))
-        (setq swapping-buffer nil)
-        (setq swapping-window nil))
-    (progn
-      (setq swapping-buffer (current-buffer))
-      (setq swapping-window (selected-window))
-      (message "Buffer and window marked for swapping."))))
-
-(global-set-key (kbd "C-M-d") 'swap-buffers-in-windows)
 
 ;;;;; C-f - kill-whole-line
 
@@ -2537,7 +2282,7 @@ modes like org-mode which have their own yank function."
 
 (global-set-key (kbd "M-g") 'abort-recursive-edit)
 
-;;;;; C-M-g - gnus
+;;;;; C-M-g - mu4e
 
 (global-set-key (kbd "C-M-g") 'mu4e)
 
@@ -2559,7 +2304,7 @@ modes like org-mode which have their own yank function."
 ;;  todo; check out smex-show-unbound-commands shows frequently used commands that have no key bindings.
 ;; this must be before smex-initialize
 (setq
- smex-save-file "~/.emacs.d/.smex-items")
+ smex-save-file (concat user-emacs-directory ".smex-items"))
 
 ;; this uses smex
 (global-set-key (kbd "M-x") 'counsel-M-x)
@@ -2724,8 +2469,7 @@ modes like org-mode which have their own yank function."
           (progn (basic-save-buffer) (delete-frame))
         (save-buffers-kill-terminal t))))
 
-;;;;; C-* - split-window-horizontally
-(global-set-key (kbd "C-*") 'split-window-horizontally)
+;;;;; C-* - --- terminal
 ;;;;; C-M-* - calc-dispatch
 
 (global-set-key (kbd "C-M-*") 'calc-dispatch)
@@ -2906,8 +2650,12 @@ modes like org-mode which have their own yank function."
 (defun vim-style-join-line ()
   (interactive)
   (join-line '(4)))
+;; terminal
+(global-set-key (kbd "C-_") 'vim-style-join-line)
+;; gui
 (global-set-key (kbd "C-/") 'vim-style-join-line)
 (define-key undo-tree-map (kbd "C-/") nil)
+(define-key undo-tree-map (kbd "C-_") nil)
 
 ;;;;; C-M-/ - copy-buffer-file-name