]> git.earman.xyz Git - emacsinit.git/commitdiff
Cleanup, re-tab
authorrearman <rearman@r717.net>
Wed, 1 Mar 2023 17:42:56 +0000 (12:42 -0500)
committerrearman <rearman@r717.net>
Wed, 1 Mar 2023 17:42:56 +0000 (12:42 -0500)
custom-set-variables.el
defuns.el
early-init.el
hooks-puts.el
package-config.el
setq-defaults.el
work-eqs.el

index d0ee2efe54a068daaa395cdd9b973c9e73cb4d4c..f11928640354626e0ed994e4fa7cc4ce09f23b14 100644 (file)
@@ -1,25 +1,25 @@
+;; -*- lexical-binding: t; -*-
 (custom-set-variables
  ;; custom-set-variables was added by Custom.
  ;; If you edit it by hand, you could mess it up, so be careful.
  ;; Your init file should contain only one such instance.
  ;; If there is more than one, they won't work right.
  '(ledger-reports
-        '(("assets" "%(binary) -f %(ledger-file) bal assets")
-                ("income" "%(binary) -f %(ledger-file) bal income")
-                ("expenses" "%(binary) -f %(ledger-file) bal expenses")
-                ("liabilities" "%(binary) -f %(ledger-file) bal liabilities")
-                ("bal" "%(binary) -f %(ledger-file) bal")
-                ("reg" "%(binary) -f %(ledger-file) reg")
-                ("payee" "%(binary) -f %(ledger-file) reg @%(payee)")
-                ("account" "%(binary) -f %(ledger-file) reg %(account)")))
+   '(("assets" "%(binary) -f %(ledger-file) bal assets")
+     ("income" "%(binary) -f %(ledger-file) bal income")
+     ("expenses" "%(binary) -f %(ledger-file) bal expenses")
+     ("liabilities" "%(binary) -f %(ledger-file) bal liabilities")
+     ("bal" "%(binary) -f %(ledger-file) bal")
+     ("reg" "%(binary) -f %(ledger-file) reg")
+     ("payee" "%(binary) -f %(ledger-file) reg @%(payee)")
+     ("account" "%(binary) -f %(ledger-file) reg %(account)")))
  '(minibuffer-prompt-properties '(read-only t cursor-intangible t face minibuffer-prompt))
  '(package-selected-packages
-        '(magit browse-kill-ring use-package page-break-lines openwith gnuplot-mode expand-region company)))
+   '(magit browse-kill-ring use-package page-break-lines openwith gnuplot-mode expand-region company)))
 
 (custom-set-faces
  ;; custom-set-faces was added by Custom.
  ;; If you edit it by hand, you could mess it up, so be careful.
  ;; Your init file should contain only one such instance.
  ;; If there is more than one, they won't work right.
- '(mode-line ((t (:foreground "black" :background "gray"))))
- '(mode-line-inactive ((t (:foreground "black" :background "#cae0a6")))))
+)
index 7ae982235f11effd10352fd3b69d15c111c4869a..6be1c779c178782477f60ea2b665cc5e0ba27bb2 100644 (file)
--- a/defuns.el
+++ b/defuns.el
@@ -1,89 +1,89 @@
 ;; -*- lexical-binding: t; -*-
 ;; DEFUNS
 (defun open-line-below ()
-       "Creates a new empty line below the current line."
-       (interactive)
-       (end-of-line)
-       (newline)
-       (indent-for-tab-command))
+  "Creates a new empty line below the current line."
+  (interactive)
+  (end-of-line)
+  (newline)
+  (indent-for-tab-command))
 
 (defun open-line-above ()
-       "Creates a new empty line above the current line.
+  "Creates a new empty line above the current line.
 Can't go prev line first, edge case of beginning of buffer."
-       (interactive)
-       (beginning-of-line)
-       (newline)
-       (previous-line)
-       (indent-for-tab-command))
+  (interactive)
+  (beginning-of-line)
+  (newline)
+  (previous-line)
+  (indent-for-tab-command))
 
 (defun kill-bword-or-region ()
-       "Kill region if active, otherwise kill back one word."
-       (interactive)
-       (if (region-active-p)
-                       (call-interactively 'kill-region)
-               (call-interactively 'backward-kill-word)))
+  "Kill region if active, otherwise kill back one word."
+  (interactive)
+  (if (region-active-p)
+      (call-interactively 'kill-region)
+    (call-interactively 'backward-kill-word)))
 
 (defun backward-kill-line ()
-       "Kill back to beginning of line from point."
-       (interactive)
-       (kill-line 0))
+  "Kill back to beginning of line from point."
+  (interactive)
+  (kill-line 0))
 
 (defun backward-join-line ()
-       "A wrapper for join-line to make it go in the right direction."
-       (interactive)
-       (join-line 0))
+  "A wrapper for join-line to make it go in the right direction."
+  (interactive)
+  (join-line 0))
 
 (defun smart-beginning-of-line ()
-       "Move point to first non-whitespace character or beginning-of-line.
+  "Move point to first non-whitespace character or beginning-of-line.
 If point was already at that position, move point to beginning of line.
 Stolen from BrettWitty's dotemacs github repo."
-       (interactive "^")
-       (let ((oldpos (point)))
-               (back-to-indentation)
-               (and (= oldpos (point))
+  (interactive "^")
+  (let ((oldpos (point)))
+    (back-to-indentation)
+    (and (= oldpos (point))
         (beginning-of-line))))
 
 (defun eshell-send-on-close-paren ()
-       "Makes eshell act somewhat like genera.
+  "Makes eshell act somewhat like genera.
 Makes a closing paren execute the sexp.  Currently in test, look out for errors."
-       (interactive)
-       (insert-char ?\))
-       (let ((p (point)))
-               ;;(eshell-bol)
-               ;;(syntax-ppss-flush-cache (point))
-               ;;(goto-char p)
-               (cond ((= 0 (car (syntax-ppss)))
-                (eshell-send-input))
-               ((< (car (syntax-ppss)) 0)
-                (message "Check flush-cache"))
-               ((t nil)))))
+  (interactive)
+  (insert-char ?\))
+  (let ((p (point)))
+    ;;(eshell-bol)
+    ;;(syntax-ppss-flush-cache (point))
+    ;;(goto-char p)
+    (cond ((= 0 (car (syntax-ppss)))
+          (eshell-send-input))
+         ((< (car (syntax-ppss)) 0)
+          (message "Check flush-cache"))
+         ((t nil)))))
 
 (defun slot/get-queries (&optional pairs)
-       "Get multiple 'query-replace' pairs from the user.
+  "Get multiple 'query-replace' pairs from the user.
 PAIRS is a list of replacement pairs of the form (FROM . TO).
 Stolen from https://tony-zorman.com/posts/query-replace/2022-08-06-query-replace-many.html"
-       (-let* (((from to delim arg)
-                (query-replace-read-args
-                       (s-join " "
-                               (-non-nil
-                                (list "Replace Strings"
-                                (cond ((eq current-prefix-arg '-) "backward")
+  (-let* (((from to delim arg)
+          (query-replace-read-args
+           (s-join " "
+                   (-non-nil
+                    (list "Replace Strings"
+                          (cond ((eq current-prefix-arg '-) "backward")
                                 (current-prefix-arg         "word"))
-                                (when (use-region-p) "in region"))))
-                       nil))                       ; no regexp-flag
-               (from-to (cons (regexp-quote from)
+                          (when (use-region-p) "in region"))))
+           nil))                       ; no regexp-flag
+         (from-to (cons (regexp-quote from)
                         (s-replace "\\" "\\\\" to))))
-               ;; HACK: Since the default suggestion of replace.el will be
-               ;; the last one we've entered, an empty string will give us
-               ;; exactly that.  Instead of trying to fight against this,
-               ;; use it in order to signal an exit.
-               (if (-contains? pairs from-to)
-       (list pairs delim arg)
-                       (slot/get-queries (push from-to pairs)))))
+        ;; HACK: Since the default suggestion of replace.el will be
+        ;; the last one we've entered, an empty string will give us
+        ;; exactly that.  Instead of trying to fight against this,
+        ;; use it in order to signal an exit.
+        (if (-contains? pairs from-to)
+            (list pairs delim arg)
+          (slot/get-queries (push from-to pairs)))))
 
 (defun slot/replace-string-many
-               (pairs &optional delimited start end backward region-noncontiguous-p)
-       "Like 'replace-string', but query for several replacements.
+    (pairs &optional delimited start end backward region-noncontiguous-p)
+  "Like 'replace-string', but query for several replacements.
 Query for replacement pairs until the users enters an empty
 string (but see 'slot/get-queries').
 
@@ -91,78 +91,78 @@ Refer to 'query-replace' and 'perform-replace' for what the other
 arguments actually mean.
 Stolen from https://tony-zorman.com/posts/query-replace/2022-08-06-query-replace-many.html
 Edited and renamed to remove the Query."
-       (interactive
-        (let ((common (slot/get-queries)))
-                (list (nth 0 common) (nth 1 common)
-                (if (use-region-p) (region-beginning))
-                (if (use-region-p) (region-end))
-                (nth 2 common)
-                (if (use-region-p) (region-noncontiguous-p)))))
-       (perform-replace
-        (concat "\\(?:" (mapconcat #'car pairs "\\|") "\\)") ; build query
-        (cons (lambda (pairs _count)
-                (cl-loop for (from . to) in pairs
-                               when (string-match from (match-string 0))
-                               return to))
+  (interactive
+   (let ((common (slot/get-queries)))
+     (list (nth 0 common) (nth 1 common)
+          (if (use-region-p) (region-beginning))
+          (if (use-region-p) (region-end))
+          (nth 2 common)
+          (if (use-region-p) (region-noncontiguous-p)))))
+  (perform-replace
+   (concat "\\(?:" (mapconcat #'car pairs "\\|") "\\)") ; build query
+   (cons (lambda (pairs _count)
+          (cl-loop for (from . to) in pairs
+                   when (string-match from (match-string 0))
+                   return to))
         pairs)
-        nil :regexp
-        delimited nil nil start end backward region-noncontiguous-p))
+   nil :regexp
+   delimited nil nil start end backward region-noncontiguous-p))
 
 (defun slot/query-replace-many
-               (pairs &optional delimited start end backward region-noncontiguous-p)
-       "Like 'query-replace', but query for several replacements.
+    (pairs &optional delimited start end backward region-noncontiguous-p)
+  "Like 'query-replace', but query for several replacements.
 Query for replacement pairs until the users enters an empty
 string (but see 'slot/get-queries').
 
 Refer to 'query-replace' and 'perform-replace' for what the other
 arguments actually mean.
 Stolen from https://tony-zorman.com/posts/query-replace/2022-08-06-query-replace-many.html"
-       (interactive
-        (let ((common (slot/get-queries)))
-                (list (nth 0 common) (nth 1 common)
-                (when (use-region-p) (region-beginning))
-                (when (use-region-p) (region-end))
-                (nth 2 common)
-                (when (use-region-p) (region-noncontiguous-p)))))
-       (perform-replace
-        (concat "\\(?:" (mapconcat #'car pairs "\\|") "\\)") ; build query
-        (cons (lambda (pairs _count)
-                (cl-loop for (from . to) in pairs
-                               when (string-match from (match-string 0))
-                               return to))
+  (interactive
+   (let ((common (slot/get-queries)))
+     (list (nth 0 common) (nth 1 common)
+          (when (use-region-p) (region-beginning))
+          (when (use-region-p) (region-end))
+          (nth 2 common)
+          (when (use-region-p) (region-noncontiguous-p)))))
+  (perform-replace
+   (concat "\\(?:" (mapconcat #'car pairs "\\|") "\\)") ; build query
+   (cons (lambda (pairs _count)
+          (cl-loop for (from . to) in pairs
+                   when (string-match from (match-string 0))
+                   return to))
         pairs)
-        :query :regexp
-        delimited nil nil start end backward region-noncontiguous-p))
+   :query :regexp
+   delimited nil nil start end backward region-noncontiguous-p))
 
 (defun edit-keymap-planck ()
-       "Bring up planck keymap for editing."
-       (interactive)
-       (find-file "~/qmk_firmware/keyboards/planck/keymaps/ehrman/keymap.c"))
+  "Bring up planck keymap for editing."
+  (interactive)
+  (find-file "~/qmk_firmware/keyboards/planck/keymaps/ehrman/keymap.c"))
 
 (defun edit-keymap-tokyo60 ()
-       "Bring up tokyo60 keymap for editing."
-       (interactive)
-       (find-file "~/qmk_firmware/keyboards/tokyokeyboard/tokyo60/keymaps/ehrman/keymap.c"))
+  "Bring up tokyo60 keymap for editing."
+  (interactive)
+  (find-file "~/qmk_firmware/keyboards/tokyokeyboard/tokyo60/keymaps/ehrman/keymap.c"))
 
 (defun scratch-only ()
-       "Bring up the scratch buffer as the only visible buffer."
-       (interactive)
-       (switch-to-buffer (get-buffer-create "*scratch*"))
-       (delete-other-windows))
+  "Bring up the scratch buffer as the only visible buffer."
+  (interactive)
+  (switch-to-buffer (get-buffer-create "*scratch*"))
+  (delete-other-windows))
 
 (unless (equal system-type 'windows-nt)
-       (if(equal system-type 'berkeley-unix)
-                       (defun doas ()
-                               "Use TRAMP to reopen the current buffer as root using doas."
-                               (interactive)
-                               (when buffer-file-name
-                                       (find-alternate-file
-                                        (concat "/doas:root@localhost:"
-                                                                        buffer-file-name))))
-               (defun sudo ()
-                       "Use TRAMP to reopen the current buffer as root using sudo."
-                       (interactive)
-                       (when buffer-file-name
-                               (find-alternate-file
-                                (concat "/doas:root@localhost:"
-                                                                buffer-file-name))))))
+  (if(equal system-type 'berkeley-unix)
+      (defun doas ()
+       "Use TRAMP to reopen the current buffer as root using doas."
+       (interactive)
+       (when buffer-file-name
+         (find-alternate-file
+          (concat "/doas:root@localhost:"
+                  buffer-file-name))))
+    (defun sudo ()
+      "Use TRAMP to reopen the current buffer as root using sudo."
+      (interactive)
+      (when buffer-file-name
+       (find-alternate-file
+        (concat "/doas:root@localhost:"
+                buffer-file-name))))))
index ac7e27038821ec8d5310733173c6716b416cd6db..833291f0bbc741e6c41506ccba9a4bcc69f5d44e 100644 (file)
@@ -1,3 +1,4 @@
+;; -*- lexical-binding: t; -*-
 (menu-bar-mode -1)
 (tool-bar-mode -1)
 (scroll-bar-mode -1)
index 849207b9bc424c388314ab62d26ebc1eb25e67c5..19df73042ff68788e9c4d3bc868a545e3f06b748 100644 (file)
@@ -2,15 +2,12 @@
 ;; HOOKS
 (add-hook 'before-save-hook 'whitespace-cleanup)
 (add-hook 'dired-mode-hook 'dired-hide-details-mode t)
-(add-hook 'lisp-mode-hook (lambda () (setq tab-width 2)))
-(add-hook 'emacs-lisp-mode-hook (lambda () (setq tab-width 2)))
 (add-hook 'c-mode-common-hook (lambda ()
-                                                               (c-set-style "k&r")
-                                                               (setq tab-width 5
-                                                                         c-basic-offset 5
-                                                                         indent-tabs-mode t
-                                                                         comment-column 48)))
-
+                               (c-set-style "k&r")
+                               (setq tab-width 5
+                                     c-basic-offset 5
+                                     indent-tabs-mode t
+                                     comment-column 48)))
 
 ;; PUTS AND PUSHES
 (put 'upcase-region 'disabled nil)
index 9ce442d2757a4147217b34637dc60ac958a37d3d..d92198b28a0b96f3eefa1b9185f6b0775d27ef80 100644 (file)
 
 (require 'package)
 (setq package-archives
-                       '(("elpa" . "https://elpa.gnu.org/packages/")
-                               ("nongnu" . "https://elpa.nongnu.org/nongnu/")
-                               ("melpa" . "https://melpa.org/packages/")))
+      '(("elpa" . "https://elpa.gnu.org/packages/")
+       ("nongnu" . "https://elpa.nongnu.org/nongnu/")
+       ("melpa" . "https://melpa.org/packages/")))
 
 (unless (bound-and-true-p package--initialized)
-       (setq package-enable-at-startup nil)
-       (package-initialize))
+  (setq package-enable-at-startup nil)
+  (package-initialize))
 
 (unless (package-installed-p 'use-package)
-       (package-refresh-contents)
-       (package-install 'use-package))
+  (package-refresh-contents)
+  (package-install 'use-package))
 
 (setq use-package-always-ensure t)
 
 (unless (eq system-type 'windows-nt)
-       (use-package slime)
-       (use-package ledger-mode))
+  (use-package slime)
+  (use-package ledger-mode))
 
 (use-package company
-       :custom
-       (company-idle-delay 0)
-       (company-tooltip-idle-delay 10)
-       (company-minimum-prefix-length 1)
-       (company-require-match nil)
-       (company-show-quick-access t)
-       (company-format-margin-function 'company-text-icons-margin)
-       (company-text-face-extra-attributes '(:slant italic))
-       (company-selection-wrap-around t)
-       (company-tooltip-flip-when-above t)
-       (company-insertion-on-trigger nil)
-       (company-dabbrev-other-buffers t)
-       (company-dabbrev-code-other-buffers t)
-       (company-dabbrev-downcase nil)
-       (company-dabbrev-ignore-case 'keep-prefix)
-       (company-frontends '(company-pseudo-tooltip-unless-just-one-frontend-with-delay
-                                        company-preview-frontend
-                                        company-echo-metadata-frontend))
-       :config
-       (global-company-mode t)
-       :bind
-       (:map company-active-map
-       ("<tab>" . (lambda ()
-                                (interactive)
-                                (let ((company-tooltip-idle-delay 0.0))
-                                        (company-complete)
-                                        (and company-candidates
-                                       (company-call-frontends 'post-command)))))))
+  :custom
+  (company-idle-delay 0)
+  (company-tooltip-idle-delay 10)
+  (company-minimum-prefix-length 1)
+  (company-require-match nil)
+  (company-show-quick-access t)
+  (company-format-margin-function 'company-text-icons-margin)
+  (company-text-face-extra-attributes '(:slant italic))
+  (company-selection-wrap-around t)
+  (company-tooltip-flip-when-above t)
+  (company-insertion-on-trigger nil)
+  (company-dabbrev-other-buffers t)
+  (company-dabbrev-code-other-buffers t)
+  (company-dabbrev-downcase nil)
+  (company-dabbrev-ignore-case 'keep-prefix)
+  (company-frontends '(company-pseudo-tooltip-unless-just-one-frontend-with-delay
+                      company-preview-frontend
+                      company-echo-metadata-frontend))
+  :config
+  (global-company-mode t)
+  :bind
+  ((:map company-active-map
+        ("<tab>" . (lambda ()
+                     (interactive)
+                     (let ((company-tooltip-idle-delay 0.0))
+                       (company-complete)
+                       (and company-candidates
+                            (company-call-frontends 'post-command))))))))
 
 (use-package expand-region
-       :bind
-       (("C-=" . er/expand-region)))
+  :bind
+  (("C-=" . er/expand-region)))
 
 (use-package gnuplot-mode)
 
 (use-package magit
-       :init
-       (message "Loading Magit...")
-       :config
-       (message "Loaded Magit!")
-       :bind (:map ctl-x-map
-                               ("g" . magit-status)))
+  :init
+  (message "Loading Magit...")
+  :config
+  (message "Loaded Magit!")
+  :bind
+  ((:map ctl-x-map
+        ("g" . magit-status))))
 
 (use-package openwith
-       :config
-       (openwith-mode t))
+  :config
+  (openwith-mode t))
 
 (use-package org
-       :ensure nil
-       :bind (:map mode-specific-map
-                                ("l" . org-store-link)
-                                ("a" . org-agenda)
-                                ("c" . org-capture)
-                                :map org-mode-map
-                                ("C-'" . nil))
-       :custom
-       (org-M-RET-may-split-line nil)
-       (org-reverse-note-order t)
-       (org-agenda-window-setup 'other-window)
-       (org-use-fast-todo-selection 'expert)
-       (org-agenda-start-on-weekday nil)
-       (org-catch-invisible-edits 'show)
-       (org-directory "~/org")
-       (org-agenda-files '("~/org/"
-                                                                                       "~/org/kasten/"))
-       (org-refile-targets '((nil :maxlevel . 9)
-                                                                                               (org-agenda-files :maxlevel . 9)))
-       (org-default-notes-file (concat org-directory "/notes.org"))
-       (safe-local-variable-values '((after-save-hook org-auto-archive)))
-       (org-todo-keywords '((sequence "TODO(t@)"
-                                                                                                                                "WAITING(w@)"
-                                                                                                                                "IN-PROGRESS(i@)"
-                                                                                                                                "APPT(a@)" "|"
-                                                                                                                                "DELEGATED(l@)"
-                                                                                                                                "DONE(d@)"
-                                                                                                                                "CANCELLED(c@)")))
-       (org-capture-templates '(("n" "Note" entry (file+olp org-default-notes-file "Notes") "* %u %?")
-                                                                                                        ("t" "TODO" entry (file+olp org-default-notes-file "Tasks") "* TODO %? \n %u")
-                                                                                                        ("s" "Service" entry (file+olp org-default-notes-file "Service") "* TODO %? \n %u")
-                                                                                                        ("z" "Zettel" entry (file erfassen-zettel) "* %? ::")))
-       (org-agenda-custom-commands '(("n" "Agenda and all TODOs"
-                                                                                                                                ((agenda "") (alltodo "")))
-                                                                                                                               ("u" "Unscheduled TODOs"
-                                                                                                                                alltodo "" ((org-agenda-skip-function
-                                                                                                                                                                                       (lambda nil
-                                                                                                                                                                                               (org-agenda-skip-entry-if 'scheduled
-                                                                                                                                                                                                                                                                                                       'deadline
-                                                                                                                                                                                                                                                                                                       'regexp "\n]+>")))
-                                                                                                                                                                                (org-agenda-overriding-header "Unscheduled TODO entries: ")))))
-       :config
-       (defun erfassen-zettel ()
-               "Add a new zettel to the kasten.
+  :ensure nil
+
+  :custom
+  (org-M-RET-may-split-line nil)
+  (org-reverse-note-order t)
+  (org-agenda-window-setup 'other-window)
+  (org-use-fast-todo-selection 'expert)
+  (org-agenda-start-on-weekday nil)
+  (org-catch-invisible-edits 'show)
+  (org-directory "~/org")
+  (org-agenda-files '("~/org/"
+                     "~/org/kasten/"))
+  (org-refile-targets '((nil :maxlevel . 9)
+                       (org-agenda-files :maxlevel . 9)))
+  (org-default-notes-file (concat org-directory "/notes.org"))
+  (safe-local-variable-values '((after-save-hook org-auto-archive)))
+  (org-todo-keywords '((sequence "TODO(t@)"
+                                "WAITING(w@)"
+                                "IN-PROGRESS(i@)"
+                                "APPT(a@)" "|"
+                                "DELEGATED(l@)"
+                                "DONE(d@)"
+                                "CANCELLED(c@)")))
+  (org-capture-templates '(("n" "Note" entry (file+olp org-default-notes-file "Notes") "* %u %?")
+                          ("t" "TODO" entry (file+olp org-default-notes-file "Tasks") "* TODO %? \n %u")
+                          ("s" "Service" entry (file+olp org-default-notes-file "Service") "* TODO %? \n %u")
+                          ("z" "Zettel" entry (file erfassen-zettel) "* %? ::")))
+  (org-agenda-custom-commands '(("n" "Agenda and all TODOs"
+                                ((agenda "") (alltodo "")))
+                               ("u" "Unscheduled TODOs"
+                                alltodo "" ((org-agenda-skip-function
+                                             (lambda nil
+                                               (org-agenda-skip-entry-if 'scheduled
+                                                                         'deadline
+                                                                         'regexp "\n]+>")))
+                                            (org-agenda-overriding-header "Unscheduled TODO entries: ")))))
+  :config
+  (defun erfassen-zettel ()
+    "Add a new zettel to the kasten.
 Creates a new file <datestamp>.org in ~/org/kasten."
-               (interactive)
-               (expand-file-name (format "%s.org" (format-time-string "%Y-%m-%d-%H%M")) "~/org/kasten/"))
+    (interactive)
+    (expand-file-name (format "%s.org" (format-time-string "%Y-%m-%d-%H%M")) "~/org/kasten/"))
 
-       (defun org-auto-archive ()
-               "Automatically archive completed tasks in an org file.
+  (defun org-auto-archive ()
+    "Automatically archive completed tasks in an org file.
 Intended for use as an after-save-hook."
-               (interactive)
-               (org-map-entries
-                (lambda ()
-                        (org-archive-subtree)
-                        (setq org-map-continue-from (org-element-property :begin (org-element-at-point))))
-                "TODO=\"DONE\"|TODO=\"CANCELLED\"|TODO=\"DELEGATED\""
-                'file)
-               (save-buffer)))
+    (interactive)
+    (org-map-entries
+     (lambda ()
+       (org-archive-subtree)
+       (setq org-map-continue-from (org-element-property :begin (org-element-at-point))))
+     "TODO=\"DONE\"|TODO=\"CANCELLED\"|TODO=\"DELEGATED\""
+     'file)
+    (save-buffer))
+  :bind
+  ((:map mode-specific-map
+        ("l" . org-store-link)
+        ("a" . org-agenda)
+        ("c" . org-capture))
+   (:map org-mode-map
+        ("C-'" . nil))))
 
 (use-package page-break-lines
-       :config
-       (global-page-break-lines-mode))
+  :config
+  (global-page-break-lines-mode))
 
 (use-package browse-kill-ring
-       :config
-       (browse-kill-ring-default-keybindings))
+  :config
+  (browse-kill-ring-default-keybindings))
 
 (use-package recentf
-       :ensure nil
-       :hook
-       (after-init . recentf-mode)
-       :custom
-       (recentf-auto-cleanup "05:00am")
-       (recentf-max-saved-items 200)
-       (recentf-exclude '((expand-file-name package-user-dir)
-                                ".cache"
-                                ".cask"
-                                ".elfeed"
-                                "bookmarks"
-                                "cache"
-                                "ido.*"
-                                "recentf")))
+  :ensure nil
+  :hook
+  (after-init . recentf-mode)
+  :custom
+  (recentf-auto-cleanup "05:00am")
+  (recentf-max-saved-items 200)
+  (recentf-exclude '((expand-file-name package-user-dir)
+                    ".cache"
+                    ".cask"
+                    ".elfeed"
+                    "bookmarks"
+                    "cache"
+                    "ido.*"
+                    "recentf")))
index 430a9504414e2d2ebc1da7129a4cb002e119c4f4..3778a15d3f6b7ca70129f44cda3e4b9ea33b7bc5 100644 (file)
@@ -1,42 +1,42 @@
 ;; -*- lexical-binding: t; -*-
 ;; SETQ AND DEFAULTS
 (setq-default indicate-empty-lines t
-                         fill-column 80
-                         read-file-name-completion-ignore-case t
-                         read-buffer-completion-ignore-case t
-                         cursor-type 'bar
-                         cursor-in-non-selected-windows 'hollow)
+             fill-column 80
+             read-file-name-completion-ignore-case t
+             read-buffer-completion-ignore-case t
+             cursor-type 'bar
+             cursor-in-non-selected-windows 'hollow)
 
 (setq require-final-newline t
-         text-quoting-style 'straight
-         ring-bell-function 'ignore
-         use-short-answers t
-         mode-line-compact t
-         make-backup-files nil
-         auto-save-default nil
-         confirm-nonexistent-file-or-buffer nil
-         show-paren-delay 0
-         show-paren-style 'expression
-         blink-matching-paren 'jump
-         global-hl-line-sticky-flag t
-         echo-keystrokes 0.01
-         save-interprogram-paste-before-kill t
-         confirm-kill-emacs 'y-or-n-p
-         confirm-kill-processes nil
-         frame-title-format "%b - EMACS"
-         eshell-destroy-buffer-when-process-dies t
-         dired-listing-switches "-alv --group-directories-first"
-         custom-file (concat user-emacs-directory "custom-set-variables.el")
-         ediff-window-setup-function 'ediff-setup-windows-plain
-         ediff-split-window-function (if (> (frame-width) 150)
-                                                                         'split-window-horizontally
-                                                                       'split-window-vertically)
-         prettify-symbols-alist '(("lambda" . 955)
-                                                          ("delta" . 120517)
-                                                          ("epsilon" . 120518)
-                                                          ("->" . 8594)
-                                                          ("<=" . 8804)
-                                                          (">=" . 8805)))
+      text-quoting-style 'straight
+      ring-bell-function 'ignore
+      use-short-answers t
+      mode-line-compact t
+      make-backup-files nil
+      auto-save-default nil
+      confirm-nonexistent-file-or-buffer nil
+      show-paren-delay 0
+      show-paren-style 'expression
+      blink-matching-paren 'jump
+      global-hl-line-sticky-flag t
+      echo-keystrokes 0.01
+      save-interprogram-paste-before-kill t
+      confirm-kill-emacs nil
+      confirm-kill-processes nil
+      frame-title-format "%b - EMACS"
+      eshell-destroy-buffer-when-process-dies t
+      dired-listing-switches "-alv --group-directories-first"
+      custom-file (concat user-emacs-directory "custom-set-variables.el")
+      ediff-window-setup-function 'ediff-setup-windows-plain
+      ediff-split-window-function (if (> (frame-width) 150)
+                                     'split-window-horizontally
+                                   'split-window-vertically)
+      prettify-symbols-alist '(("lambda" . 955)
+                              ("delta" . 120517)
+                              ("epsilon" . 120518)
+                              ("->" . 8594)
+                              ("<=" . 8804)
+                              (">=" . 8805)))
 
 ;; OPTIONS
 (save-place-mode 1)
 (global-hl-line-mode t)
 (global-prettify-symbols-mode t)
 (global-display-line-numbers-mode t)
+(let ((my-bg-col "#cae0a6"))
+  (set-face-foreground 'mode-line "black")
+  (set-face-foreground 'mode-line-inactive "darkgray")
+  (set-face-background 'mode-line my-bg-col)
+  (set-face-background 'mode-line-inactive my-bg-col)
+  (add-to-list 'default-frame-alist '(background-color . my-bg-col)))
 (set-face-background 'show-paren-match nil)
 (set-face-underline 'show-paren-match t)
-(add-to-list 'default-frame-alist '(background-color . "#cae0a6"))
+
 
 (unless (display-graphic-p)
   (xterm-mouse-mode 1))
index e04051e7966feac51516cbb916f9951e7413e99e..bb091437c152afb9271c5fbc51941fa473e7031b 100644 (file)
 ;; -*- lexical-binding: t; -*-
 ;; WORK (NON-EDITING) RELATED DEFUNS
 (defun square (x)
-       "Calculate the square of a value."
-       (expt x 2))
+  "Calculate the square of a value."
+  (expt x 2))
 
 (defun cube (x)
-       "Calculate the cube of a value."
-       (expt x 3))
+  "Calculate the cube of a value."
+  (expt x 3))
 
 (defun inv (x)
-       "Calculate the inverse of a value."
-       (/ 1 (float x)))
+  "Calculate the inverse of a value."
+  (/ 1 (float x)))
 
 (defun scaleval (pmax pmin emax emin &optional ai)
-       "Calculate the slope and offset given PLC Max/Min and Eng. Max/Min.
+  "Calculate the slope and offset given PLC Max/Min and Eng. Max/Min.
 With optional argument 'ai', also calculate a final scaled value from an input."
-       (let* ((div (/ (- pmax pmin) (- (float emax) (float emin))))
-                                (ofst (- emin (/ pmin div))))
-               (if (eq nil ai)
-                               (list div ofst)
-                       (list div ofst (+ ofst (/ ai div))))))
+  (let* ((div (/ (- pmax pmin) (- (float emax) (float emin))))
+        (ofst (- emin (/ pmin div))))
+    (if (eq nil ai)
+       (list div ofst)
+      (list div ofst (+ ofst (/ ai div))))))
 
 (defun cfm-circ (fpm radius)
-       "Calculate the CFM of a circular duct given fpm and radius (in)."
-       (list (* pi fpm (square (/ radius 12)))))
+  "Calculate the CFM of a circular duct given fpm and radius (in)."
+  (list (* pi fpm (square (/ radius 12)))))
 
 (defun cfm-rect (fpm width height)
-       "Calculate the CFM of a rectangular duct given fpm, width (in) and height (in)."
-       (list (* fpm (/ width 12) (/ height 12))))
+  "Calculate the CFM of a rectangular duct given fpm, width (in) and height (in)."
+  (list (* fpm (/ width 12) (/ height 12))))
 
 (defun pid-tune (Kᵤ Tᵤ &optional loop-type)
-       "Use the Ziegler-Nichols method to tune a P, PI or PID loop.
+  "Use the Ziegler-Nichols method to tune a P, PI or PID loop.
 Takes Kᵤ, Tᵤ and optional loop-type (P, PI, or PID [default]) as arguments,
  and returns appropriate kp, ki, and kd."
-       (cond ((or (equal 'p loop-type)
-                                                (equal 'P loop-type))
-                                (list (* 0.5 Kᵤ)))
-                               ((or (equal 'pi loop-type)
-                                                (equal 'PI loop-type))
-                                (list (* 0.45 Kᵤ) (/ (* 0.54 Kᵤ) Tᵤ)))
-                               (t
-                                (list (* 0.6 Kᵤ) (/ (* 1.2 Kᵤ) Tᵤ) (/ (* 3.0 Kᵤ Tᵤ) 40)))))
+  (cond ((or (equal 'p loop-type)
+            (equal 'P loop-type))
+        (list (* 0.5 Kᵤ)))
+       ((or (equal 'pi loop-type)
+            (equal 'PI loop-type))
+        (list (* 0.45 Kᵤ) (/ (* 0.54 Kᵤ) Tᵤ)))
+       (t
+        (list (* 0.6 Kᵤ) (/ (* 1.2 Kᵤ) Tᵤ) (/ (* 3.0 Kᵤ Tᵤ) 40)))))
 
 (defun gn-water-per-lb (temp humidity)
-       "Calculate the grains of water per lb of air, given temp (F) and
+  "Calculate the grains of water per lb of air, given temp (F) and
 humidity (%).
 Returns a list of Sat. Water Press., Hum. Ratio, and Gns water per lb air."
-       (let* ((sat-water-press (+ .0182795
-                                                                                                                (* temp .001029904)
-                                                                                                                (* (square temp) 0.00002579408)
-                                                                                                                (* (cube temp) (* 2.400493 (expt 10 -7)))
-                                                                                                                (* (expt temp 4) (* 8.100939 (expt 10 -10)))
-                                                                                                                (* (expt temp 5) (* 3.256805 (expt 10 -11)))
-                                                                                                                (* (expt temp 6) (* -1.001922 (expt 10 -13)))
-                                                                                                                (* (expt temp 7) (* 2.44161 (expt 10 -16)))))
-                                (hum-press (* (/ humidity 100.0) sat-water-press))
-                                (hum-ratio (/ (* hum-press 0.62198) (- 14.7 hum-press)))
-                                (gns-water-lb-air (* hum-ratio 7000)))
-               (list sat-water-press hum-ratio gns-water-lb-air)))
+  (let* ((sat-water-press (+ .0182795
+                            (* temp .001029904)
+                            (* (square temp) 0.00002579408)
+                            (* (cube temp) (* 2.400493 (expt 10 -7)))
+                            (* (expt temp 4) (* 8.100939 (expt 10 -10)))
+                            (* (expt temp 5) (* 3.256805 (expt 10 -11)))
+                            (* (expt temp 6) (* -1.001922 (expt 10 -13)))
+                            (* (expt temp 7) (* 2.44161 (expt 10 -16)))))
+        (hum-press (* (/ humidity 100.0) sat-water-press))
+        (hum-ratio (/ (* hum-press 0.62198) (- 14.7 hum-press)))
+        (gns-water-lb-air (* hum-ratio 7000)))
+    (list sat-water-press hum-ratio gns-water-lb-air)))
 
 (defun mm-to-in (mm)
-       "Convert milimeters to inches."
-       (/ mm 25.4))
+  "Convert milimeters to inches."
+  (/ mm 25.4))
 
 (defun in-to-mm (in)
-       "Convert milimeters to inches."
-       (* in 25.4))
+  "Convert milimeters to inches."
+  (* in 25.4))
 
 (defun k-to-c (tempk)
-       "Convert degrees Kelvin to degrees Celsius."
-       (- tempk 273.15))
+  "Convert degrees Kelvin to degrees Celsius."
+  (- tempk 273.15))
 
 (defun c-to-k (tempc)
-       "Convert degrees Celsius to degrees Kelvin."
-       (+ tempc 273.15))
+  "Convert degrees Celsius to degrees Kelvin."
+  (+ tempc 273.15))
 
 (defun c-to-f (tempc)
-       "Convert degrees Celsius to degrees Fahrenheit."
-       (+ (* tempc 1.8) 32.0))
+  "Convert degrees Celsius to degrees Fahrenheit."
+  (+ (* tempc 1.8) 32.0))
 
 (defun f-to-c (tempf)
-       "Convert degrees Fahrenheit to degrees Celsius."
-       (/ (- tempf 32.0) 1.8))
+  "Convert degrees Fahrenheit to degrees Celsius."
+  (/ (- tempf 32.0) 1.8))
 
 (defun k-to-f (tempk)
-       "Convert degrees Kelvin to degrees Fahrenheit.
+  "Convert degrees Kelvin to degrees Fahrenheit.
 Applies 'c-to-f' to 'k-to-c'."
-       (c-to-f (k-to-c tempk)))
+  (c-to-f (k-to-c tempk)))
 
 (defun f-to-k (tempf)
-       "Convert degrees Fahrenheit to degrees Kelvin.
+  "Convert degrees Fahrenheit to degrees Kelvin.
 Applies 'c-to-k' to 'f-to-c'."
-       (c-to-k (f-to-c tempf)))
+  (c-to-k (f-to-c tempf)))
 
 (defun max-counts (resolution)
-       "Calculate the max count for a PLC analog, given card's bit-resolution.
+  "Calculate the max count for a PLC analog, given card's bit-resolution.
 Formula is 1 - 2^(resolution)"
-       (- (expt 2 resolution) 1))
+  (- (expt 2 resolution) 1))
 
 (defun volts-to-counts (vin vmax resolution)
-       "Convert a voltage signal to a PLC count.
+  "Convert a voltage signal to a PLC count.
 Calculates a ratio of vin/vmax, then scales by 'max-counts'."
-       (* (/ (float vin) (float vmax)) (float (max-counts resolution))))
+  (* (/ (float vin) (float vmax)) (float (max-counts resolution))))
 
 (defun counts-to-volts (cin vmax resolution)
-       "Convert a PLC count to a voltage.
+  "Convert a PLC count to a voltage.
 Calculates a ratio of cin/'max-counts', then multiplies by vmax."
-       (* (/ cin (float (max-counts resolution))) vmax))
+  (* (/ cin (float (max-counts resolution))) vmax))
 
 (defun eff-imp (r1 &optional r2)
-       "Calculate the effective input impedance, given two resistances.
+  "Calculate the effective input impedance, given two resistances.
 For use in 'amps-to-volts' and related.  The handling of only one resistance
 given is done here, instead of doing it in every function that uses this."
-       (if (eq nil r2)
-                       r1
-               (inv (+ (inv (float r1)) (inv (float r2))))))
+  (if (eq nil r2)
+      r1
+    (inv (+ (inv (float r1)) (inv (float r2))))))
 
 (defun amps-to-volts (amps r1 &optional r2)
-       "Calculate the voltage, given amperage and impedance.
+  "Calculate the voltage, given amperage and impedance.
 Multiplies the amperage by the effective impedance calculated with 'eff-imp'."
-       (* amps (eff-imp r1 r2)))
+  (* amps (eff-imp r1 r2)))
 
 (defun volts-to-amps (volts r1 &optional r2)
-       "Calculate the amperage, given voltage and impedance.
+  "Calculate the amperage, given voltage and impedance.
 Divides the voltage by the effective impedance calculated with 'eff-imp'."
-       (/ volts (eff-imp r1 r2)))
+  (/ volts (eff-imp r1 r2)))
 
 (defun amps-to-counts (amps vmax resolution r1 &optional r2)
-       "Convert an amp signal to PLC Counts.
+  "Convert an amp signal to PLC Counts.
 Converts the amperage to a voltage using 'amps-to-volts' (with r1 and optional r2),
 then applies 'volts-to-counts' to the resulting voltage, vmax, and resolution."
-       (volts-to-counts (amps-to-volts amps r1 r2) vmax resolution))
+  (volts-to-counts (amps-to-volts amps r1 r2) vmax resolution))
 
 (defun count-range (type upper lower vmax resolution &optional r1 r2)
-       "Given an upper and lower signal, return the list of upper and lower PLC counts.
+  "Given an upper and lower signal, return the list of upper and lower PLC counts.
 Type takes either a v or an i, corresponding to a voltage or current signal.
 With a current signal, use r1 and maybe r2 to calculate 'amps-to-counts'.
 Otherwise ignore r1/r2 and calculate 'volts-to-counts'."
-       (cond ((or (equal 'v type)
-                                                (equal 'V type))
-                                (list (volts-to-counts upper vmax resolution)
-                                                        (volts-to-counts lower vmax resolution)))
-                               ((or (equal 'i type)
-                                                (equal 'I type))
-                                (list (amps-to-counts upper vmax resolution r1 r2)
-                                                        (amps-to-counts lower vmax resolution r1 r2)))))
+  (cond ((or (equal 'v type)
+            (equal 'V type))
+        (list (volts-to-counts upper vmax resolution)
+              (volts-to-counts lower vmax resolution)))
+       ((or (equal 'i type)
+            (equal 'I type))
+        (list (amps-to-counts upper vmax resolution r1 r2)
+              (amps-to-counts lower vmax resolution r1 r2)))))