Merge branch 'bankruptcy8' of https://tildegit.org/acdw/emacs into bankruptcy8

5 files changed, 141 insertions, 69 deletions

@@ -55,22 +55,22 @@ See `no-littering' for examples.")
 ;;; Default frame settings
 
 (setq default-frame-alist '((tool-bar-lines . 0)
-                            (menu-bar-lines . 0)
-                            (vertical-scroll-bars)
-                            (horizontal-scroll-bars))
+                                        (menu-bar-lines . 0)
+                                        (vertical-scroll-bars)
+                                        (horizontal-scroll-bars))
       frame-inhibit-implied-resize t
       frame-resize-pixelwise t
       window-resize-pixelwise t
       inhibit-x-resources t
       indicate-empty-lines nil
       indicate-buffer-boundaries '((top . right)
-                                   (bottom . right)))
+                                                   (bottom . right)))
 
 ;; Fonts
 
-(let ((font-name "Go Mono")
+(let ((font-name "DejaVu  Sans Mono")
       (font-size 105)
-      (variable-font-name "Go")
+      (variable-font-name "DejaVu Sans")
       (variable-font-size 1.0))
   (set-face-attribute 'default nil :family font-name
                       :height font-size :weight 'book)
@@ -84,9 +84,9 @@ See `no-littering' for examples.")
 (setq package-enable-at-startup nil
       package-quickstart nil
       straight-host-usernames '((github . "duckwork")
-                                (gitlab .  "acdw"))
+                                                (gitlab .  "acdw"))
       straight-check-for-modifications '(check-on-save
-                                         find-when-checking))
+                                                             find-when-checking))
 
 (setq no-littering-etc-directory .etc
       no-littering-var-directory .etc
@@ -117,17 +117,17 @@ See `no-littering' for examples.")
 (require 'straight-x)
 
 (dolist (pkg '(el-patch
-               no-littering
-               setup))
+                   no-littering
+                   setup))
   (straight-use-package pkg)
   (require pkg)
   (require (intern (format "+%s" pkg)) nil :noerror))
 
-;;; Appendix
+;; Setup `setup'
+
+(add-to-list 'setup-modifier-list 'setup-wrap-to-demote-errors)
 
-;; I've patched setup to look at `setup-ensure-function-inhibit' to decide
-;; whether to ensure functions or not with local macros.
-(setq setup-ensure-function-inhibit t)
+;;; Appendix
 
 ;; Get rid of a dumb alias.  straight-ಠ_ಠ-mode really slows down all
 ;; minibuffer completion functions.  Since it's a (rarely-used, even)
@@ -21,20 +21,19 @@
                    private))
   (require (or (car-safe feature) feature) (cdr-safe feature) :noerror))
 
-(setq debug-on-error t)
+(setq debug-on-error (memq system-type '(msdos windows-nt)))
 
 (setup (:require +emacs)
-  (:also-load +lisp)
   ;; +emacs.el contains super-basic defaults that are basically necessary for
   ;; good functioning.  In this block, I add extra things or more "experimental"
   ;; ones that might not belong in a separate file.
+  (:also-load +lisp)
   (:option truncate-string-ellipsis "…")
   ;; Bindings
   (:global "C-x C-k" #'kill-current-buffer
            "C-x 4 n" #'clone-buffer
            "C-c v" #'visible-mode
-           "C-M-;" #'+lisp-comment-or-uncomment-sexp
-           "<f12>" #'consult-buffer)
+           "C-M-;" #'+lisp-comment-or-uncomment-sexp)
   ;; Unbind stuff, too.
   (dolist (key '("C-M-j"
                  "M-j"))
@@ -56,10 +55,7 @@
   (+ensure-after-init #'+key-global-mode))
 
 (setup (:require auth-source)
-  (:option auth-sources (list (private/ "authinfo")
-                              (private/ "authinfo.gpg")
-                              "~/.authinfo"
-                              "~/.authinfo.gpg")))
+  (:option auth-sources (list (private/ "authinfo"))))
 
 (setup (:require goto-addr)
   (if (fboundp #'global-goto-address-mode)
@@ -139,7 +135,7 @@
     (cons (+browse-url-secondary-browser-regexps-combine) ; non-text websites
      browse-url-secondary-browser-function)
     (cons "."                           ; everything else
-     browse-url-browser-function)))
+     +browse-url-browser-function)))
   ;; Transform URLs before passing to `browse-url'
   (:option +browse-url-transformations `((,(rx "//" (or "youtube.com"
                                                         "youtu.be"))
@@ -193,11 +189,16 @@
                   dired+)
   (:option dired-recursive-copies 'always
            dired-recursive-deletes 'always
-           dired-create-destination-dirs 'ask
+           dired-create-destination-dirs 'always
+           dired-do-revert-buffer t
+           dired-hide-details-hide-symlink-targets nil
+           dired-isearch-filenames 'dwim
            delete-by-moving-to-trash t
+           dired-auto-revert-buffer t
            dired-listing-switches "-Al"
            ls-lisp-dirs-first t
            dired-ls-F-marks-symlinks t
+           dired-clean-confirm-killing-deleted-buffers nil
            dired-no-confirm '(byte-compile
                               load chgrp chmod chown
                               copy move hardlink symlink
@@ -256,8 +257,14 @@
   (add-hook 'eshell-mode-hook
             (defun +eshell@setup ()
               "Eshell improperly does loading. Gah."
+              (interactive)
               (dolist (setting `((outline-regexp . ,eshell-prompt-regexp)
-                                 (page-delimiter . ,eshell-prompt-regexp)))
+                                 (page-delimiter . ,eshell-prompt-regexp)
+                                 (imenu-generic-expression
+                                  . ,`(("Prompt"
+                                        ,(concat eshell-prompt-regexp
+                                                 "\\(.*\\)")
+                                        1)))))
                 (set (make-local-variable (car setting)) (cdr setting)))
               (dolist (binding `(("C-d" . +eshell-quit-or-delete-char)))
                 (define-key eshell-mode-map
@@ -328,14 +335,7 @@
   ;; This setup is weird because of dependency issues
   (:straight (transient :host github :repo "magit/transient" :branch "master")
              (magit :host github :repo "magit/magit")
-             (git-modes :host github :repo "magit/git-modes"))
-  (when (eq system-type 'gnu/linux)
-    (:straight (forge :host github :repo "magit/forge"))
-    (with-eval-after-load 'magit
-      (require 'forge)
-      (add-to-list 'forge-alist
-                   '("tildegit.org" "tildegit.org/api/v1" "tildegit.org"
-                     forge-gitea-repository)))))
+             (git-modes :host github :repo "magit/git-modes")))
 
 (setup minibuffer
   (:require +minibuffer)
@@ -775,8 +775,15 @@
       (:option consult--regexp-compiler 'consult--orderless-regexp-compiler))))
 
 (setup (:straight crux)
-  (:+key "C-o" #'crux-smart-open-line
-         "C-x 4 t" #'crux-transpose-windows)
+  ;; yes it's silly I have an addon to this addon.
+  (:also-load +crux)
+  (:option crux-shell-func #'crux-eshell)
+  (:global "C-o" #'crux-smart-open-line
+           "C-x 4 t" #'crux-transpose-windows
+           "M-w" #'+crux-kill-ring-save
+           "C-k" #'crux-kill-and-join-forward
+           "C-c d" #'+crux-insert-date-or-time)
+  (:+leader "s"  #'crux-visit-shell-buffer)
 
   (el-patch-feature crux)
   (with-eval-after-load 'crux
@@ -826,21 +833,36 @@ See also `crux-reopen-as-root-mode'."
 
 (setup (:straight elfeed)
   (:also-load +elfeed)
-  (:option elfeed-use-curl t
-           elfeed-curl-extra-arguments '("--insecure")
-           elfeed-show-unique-buffers t
-           elfeed-db-directory (sync/ "elfeed/db/" t))
+  (+define-dir elfeed/ (sync/ "emacs/elfeed/" t))
+  (:option
+   elfeed-curl-program-name (executable-find "curl")
+   elfeed-use-curl elfeed-curl-program-name
+   elfeed-curl-extra-arguments '("--insecure")
+   elfeed-enclosure-default-dir (cl-loop for dir in '("~/var/download/"
+                                                      "~/Downloads/")
+                                         if (file-exists-p dir)
+                                         return dir)
+   elfeed-search-filter "@1-month-ago +unread"
+   elfeed-search-trailing-width 24
+   elfeed-search-title-min-width 24
+   elfeed-search-title-max-width 78
+   elfeed-show-unique-buffers t
+   elfeed-db-directory (elfeed/ "db/" t))
   ;; https://old.reddit.com/r/emacs/comments/rlli0u/whats_your_favorite_defadvice/hphfh4e/
   (advice-add #'elfeed-search-update--force :after #'elfeed-db-save)
   (:with-mode elfeed-show-mode
     (:bind "SPC" #'+elfeed-scroll-up-command
            "S-SPC" #'+elfeed-scroll-down-command)
-    (:hook #'reading-mode)))
+    (:hook #'reading-mode)
+    (define-advice elfeed-show-entry (:after (&rest _))
+      (run-at-time 0 nil #'elfeed-show-refresh))))
 
 (setup (:straight elfeed-org)
-  (:option rmh-elfeed-org-files (list (sync/ "elfeed/elfeed.org" t)))
+  (:option rmh-elfeed-org-files (list (elfeed/ "/elfeed.org" t)))
   (elfeed-org))
 
+(setup (:straight elpher))
+
 (setup (:straight embark)
   (:option prefix-help-command 'embark-prefix-help-command)
   (:+key "C-." #'embark-act
@@ -864,6 +886,9 @@ See also `crux-reopen-as-root-mode'."
   (:hook-into emacs-lisp-mode
               lisp-interaction-mode))
 
+(setup (:straight eshell-bookmark)
+  (add-hook 'eshell-mode-hook #'eshell-bookmark-setup))
+
 (setup (:straight eshell-syntax-highlighting)
   (:hook-into eshell-mode))
 
@@ -890,6 +915,14 @@ See also `crux-reopen-as-root-mode'."
                    :repo "duckwork/filldent.el"))
   (:+key "M-q" #'filldent-dwim))
 
+(setup (:straight-when (forge
+                        :host github :repo "magit/forge")
+         (eq system-type 'gnu/linux))
+  (require 'forge)
+  (add-to-list 'forge-alist
+               '("tildegit.org" "tildegit.org/api/v1" "tildegit.org"
+                 forge-gitea-repository)))
+
 (setup (:straight (frowny
                    :host github
                    :repo "duckwork/frowny.el"))
@@ -1078,7 +1111,7 @@ See also `crux-reopen-as-root-mode'."
 
 (setup (:straight-when pdf-tools
          (eq system-type 'gnu/linux))
-  (pdf-tools-install))
+  (pdf-tools-install t))
 
 (setup (:straight (shell-command+
                    :host nil
@@ -1161,7 +1194,18 @@ See also `crux-reopen-as-root-mode'."
                           0))))
         (funcall topsy-fn))))))
 
-(setup (:straight transpose-frame))
+(setup (:straight transpose-frame)
+  (defvar +transpose-frame-map
+    (let ((map (make-sparse-keymap)))
+      (dolist (bind '(("t" . transpose-frame)
+                      ("v" . flip-frame)
+                      ("h" . flop-frame)
+                      ("r" . rotate-frame-clockwise)
+                      ("R" . rotate-frame-anticlockwise)))
+        (define-key map (car bind) (cdr bind)))
+      map)
+    "Map for transposing frames.")
+  (define-key +key-mode-map (kbd "C-x 5 t") +transpose-frame-map))
 
 (setup (:straight trashed)
   (:option trashed-action-confirmer #'y-or-n-p))
@@ -1209,7 +1253,8 @@ See also `crux-reopen-as-root-mode'."
   (:require vlf-setup))
 
 (setup (:straight whitespace-cleanup-mode)
-  (:option whitespace-cleanup-mode-preserve-point t)
+  (:option whitespace-cleanup-mode-preserve-point t
+           whitespace-cleanup-mode-only-if-initially-clean nil)
   (global-whitespace-cleanup-mode +1))
 
 (setup (:straight zoom-frm))
@@ -0,0 +1,46 @@
+;;; +crux.el -*- lexical-binding: t; -*-
+
+;;; Code:
+
+(require 'crux)
+
+(defgroup +crux nil
+  "Extra crux customizations."
+  :group 'crux
+  :prefix "+crux-")
+
+(defun +crux-kill-ring-save (begin end arg)
+  "Copy region to the kill-ring, possibly indenting it first.
+Copy from BEGIN to END using `kill-ring-save' if no argument was
+passed, or with `crux-indent-rigidly-and-copy-to-clipboard' if
+one was."
+  (interactive "r\nP")
+  (call-interactively (if arg #'kill-ring-save
+                        #'crux-indent-rigidly-and-copy-to-clipboard)))
+
+(defcustom +crux-default-date-format "%c"
+  "Default date format to use for `+crux-insert-date-or-time'.
+Should be a format parsable by `format-time-string'."
+  :type 'string)
+
+(defcustom +crux-alternate-date-format "%FT%T%z"
+  "Alternate date format to use for `+crux-insert-date-or-time'.
+Should be a format parsable by `format-time-string'."
+  :type 'string)
+
+(defun +crux-insert-date-or-time (arg)
+  "Insert current date or time.
+Called without a prefix ARG, insert the time formatted by
+`+crux-default-date-format'.  When called with \\[universal-argument],
+format the time with `+crux-alternate-date-format'.  Otherwise,
+prompt for the time format."
+  (interactive "*P")
+  (let ((time (current-time)))
+    (insert (cond
+             ((null arg) (format-time-string +crux-default-date-format time))
+             ((eq (car-safe arg) 4)
+              (format-time-string +crux-alternate-date-format time))
+             (t (format-time-string (read-string "Time Format: ") time))))))
+
+(provide '+crux)
+;;; +crux.el ends here
@@ -24,31 +24,6 @@
 (require 'setup)
 (require 'straight)
 
-;; I don't like the "magic" `setup' performs to ensure a symbol is a
-;; function in `:global', `:bind', `:hook', `:hook-into', and others.
-;; So here, I'll just make it return the symbol unmodified.
-(el-patch-feature setup)
-(with-eval-after-load 'setup
-  (el-patch-defvar
-    (el-patch-add setup-ensure-function-inhibit nil
-                  "Whether to inhibit `setup-ensure-function'."))
-  (el-patch-defun setup-ensure-function (sexp)
-    (el-patch-concat
-      "Attempt to return SEXP as a quoted function name."
-      (el-patch-add
-        "\nIf `setup-ensure-function-inhibit' is non-nil, just return SEXP."))
-    (el-patch-wrap 3 0
-      (if (and setup-ensure-function-inhibit
-               (not (eq sexp (setup-get 'mode))))
-          sexp
-        (cond ((eq (car-safe sexp) 'function)
-               sexp)
-              ((eq (car-safe sexp) 'quote)
-               `#',(cadr sexp))
-              ((symbolp sexp)
-               `#',sexp)
-              (sexp))))))
-
 (setup-define :face
     (lambda (face spec)
       `(custom-set-faces '(,face ,spec 'now "Customized by `setup'.")))
@@ -83,5 +83,11 @@ If Emacs is already started, run FUNCTION.  Otherwise, add it to
       (funcall function)
     (add-hook 'after-init-hook function)))
 
+(defun +remember-prefix-arg (p-arg P-arg)
+  "Display prefix ARG, in \"p\" and \"P\" `interactive' types.
+I keep forgetting how they differ."
+  (interactive "p\nP")
+  (message "p: %S       P: %S" p-arg P-arg))
+
 (provide 'acdw)
 ;;; acdw.el ends here