Merge branch 'main' of github.com:duckwork/.emacs.d

2 files changed, 32 insertions, 40 deletions

@@ -351,7 +351,8 @@
     ;; Add advice to pulse evaluated regions
     (:advise eval-region :around
              (defun eval-region@pulse (fn beg end &rest args)
-               (pulse-momentary-highlight-region beg end)
+               (let ((pulse-flag t))
+                 (pulse-momentary-highlight-region beg end))
                (apply fn beg end args))))
 
   (:with-mode lisp-interaction-mode ;; -___-
@@ -375,10 +376,16 @@
                                      (or (executable-find "magick")
                                          (executable-find "convert")))
    kill-read-only-ok t
+   kill-ring-max 500                    ; RAM is cheap, right?
+   mark-ring-max 50
+   kmacro-ring-max 20
+   search-ring-max 200
+   global-mark-ring-max 100
+   regexp-search-ring-max 100
    load-prefer-newer t
    native-comp-async-report-warnings-errors nil
    password-cache t
-   password-cache-expiry 3600           ; 5 minutes
+   password-cache-expiry (* 60 5)       ; seconds
    set-mark-command-repeat-pop t)
 
   (when (fboundp 'command-completion-default-include-p)
@@ -845,6 +852,7 @@ specific to most general, they are these:
            smie-indent-basic tab-width)
   
   (:hook #'show-paren-mode
+         #'prettify-symbols-mode
          ;; #'electric-pair-local-mode
          #'acdw/setup-fringes
          #'display-fill-column-indicator-mode
@@ -1172,33 +1180,9 @@ specific to most general, they are these:
            circe-format-self-say (format
                                   "{nick:%1$d.%1$ds} > {body}"
                                   (- acdw-irc/left-margin 3))
-           circe-network-inhibit-autoconnect '("Pissnet" "Twitch IRC")
-           circe-network-options
-           `(("Libera Chat"
-              :channels ("#emacs" "#systemcrafters" "##webpals"
-                         "#emacsconf-org")
-              :sasl-username ,circe-default-nick
-              :sasl-password ,(acdw/make-password-fetcher
-                               :host "libera.chat"))
-             ("Tilde Chat" :host "irc.tilde.chat" :port 6697 :use-tls t
-              :channels ("#meta" "#bread" "#dadjokes" "#team"
-                         "#emacs" "#nsfw")
-              :sasl-username ,circe-default-nick
-              :sasl-password ,(acdw/make-password-fetcher
-                               :host "tilde.chat"))
-             ("Casa" :host "m455.casa" :port 6697 :use-tls t
-              :channels ("#basement")
-              :sasl-username ,circe-default-nick
-              :sasl-password ,(acdw/make-password-fetcher
-                               :host "m455.casa"))
-             ("Pissnet" :host "piss.hmm.st" :port 6697 :use-tls t
-              :channels ("#i-just-peed")
-              :sasl-username ,circe-default-nick
-              :sasl-password ,(acdw/make-password-fetcher
-                               :host "piss.hmm.st"))
-             ("Twitch IRC" :host "irc.chat.twitch.tv" :port 6697 :use-tls t
-              :nick "caseofducks" :user "caseofducks"
-              :pass ,(acdw/make-password-fetcher :host "irc.chat.twitch.tv")))
+           circe-prompt-string (format (format "%%%ds> "
+                                               (- acdw-irc/left-margin 2))
+                                       " ")
            circe-reduce-lurker-spam t
            circe-server-auto-join-default-type :after-auth
            circe-server-buffer-action (lambda (buf)
@@ -1229,7 +1213,7 @@ specific to most general, they are these:
             #'enable-circe-color-nicks
             ;; #'enable-circe-display-images
             #'enable-circe-new-day-notifier
-            #'circe-chat@set-prompt
+            ;; #'circe-chat@set-prompt
             #'topsy-mode))
   (:bind "C-c C-s" #'circe-command-SLAP)
 
@@ -1249,8 +1233,8 @@ specific to most general, they are these:
     (:hook #'visual-fill-column-mode
            #'visual-line-mode)
     
-    (:local-set visual-fill-column-extra-text-width (cons acdw-irc/left-margin
-                                                          0)
+    (:local-set visual-fill-column-extra-text-width
+                (cons acdw-irc/left-margin 0)
                 fringes-outside-margins t
                 right-margin-width 5
                 scroll-margin 0
@@ -1536,7 +1520,9 @@ See also `crux-reopen-as-root-mode'."
 
   (:with-mode elfeed-show-mode
     (:hook #'reading-mode)
-
+    (:local-set shr-max-image-proportion 0.9
+                shr-width nil
+                fill-column 0)
     ;; see https://irreal.org/blog/?p=8885
     (:bind "SPC" (defun elfeed-scroll-up-command (&optional arg)
                    "Scroll up or go to next feed item in Elfeed"
@@ -1986,7 +1972,7 @@ browser defined in `browse-url-secondary-browser-function'."
                    :files ("nyan-mode.el" "img")))
   (:option nyan-animate-nyancat nil
            nyan-bar-length 20
-           nyan-minimum-window-width fill-column)
+           nyan-minimum-window-width (+ fill-column (/ nyan-bar-length 2)))
   (nyan-mode +1)
   (defun disable-nyan-mode ()
     "Disable `nyan-mode' in current buffer."
@@ -2087,7 +2073,8 @@ browser defined in `browse-url-secondary-browser-function'."
            org-clock-clocked-in-display 'mode-line
            org-clock-frame-title-format (cons '(t org-mode-line-string)
                                               (cons " --- " frame-title-format))
-           org-clock-string-limit 25    ; gives enough information
+           org-clock-string-limit 7     ; just the clock bit
+           ;; org-clock-string-limit 25    ; gives enough information
            org-clock-persist t
            org-confirm-babel-evaluate nil
            org-cycle-separator-lines 0
@@ -2333,7 +2320,13 @@ the default is \"/\"."
   (:global "M-`" #'popper-toggle-latest
            "C-`" #'popper-cycle)
   (popper-mode +1)
-  (popper-echo-mode +1))
+  (when (fboundp 'popper-echo-mode)
+    (popper-echo-mode +1)))
+
+(setup (:straight-when (powershell
+                        :host github
+                        :repo "jschaf/powershell.el")
+         (acdw/system :work)))
 
 ;; (setup (:straight persistent-scratch)
 ;;   (:option persistent-scratch-backup-directory (acdw/dir "scratch" t)
@@ -2468,7 +2461,8 @@ the default is \"/\"."
 
 (setup (:straight super-save)
   (:option auto-save-default nil
-           super-save-auto-save-when-idle nil
+           super-save-auto-save-when-idle t
+           super-save-idle-duration 60
            super-save-exclude '(".gpg")
            super-save-remote-files nil)
   (auto-save-visited-mode -1)
@@ -33,9 +33,7 @@ Otherwise, cdr should be a function that takes two points (see `count-words')."
 
 (defun acdw-modeline/buffer-name ()     ; gonsie
   "Display the buffer name in a face reflecting its modified status."
-  (propertize (concat " "
-                      (truncate-string (/ (window-total-width) 2)
-                                       (buffer-name) "~"))
+  (propertize (concat (format " %-20s" (truncate-string 20 (buffer-name) "~")))
               'face 'bold
               ;; (if (buffer-modified-p)
               ;;     'font-lock-warning-face