summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorCase Duckworth2021-10-11 21:29:03 -0500
committerCase Duckworth2021-10-11 21:29:03 -0500
commit8891198e040c2d2cf82e6c8fcea5ee893e99fad9 (patch)
tree847dcdb70f59ad2a5ff2bd6e4e0b9f0c6d95ec1d
parentFurther configure mu4e (diff)
parentChange up the modeline (diff)
downloademacs-8891198e040c2d2cf82e6c8fcea5ee893e99fad9.tar.gz
emacs-8891198e040c2d2cf82e6c8fcea5ee893e99fad9.zip
Merge branch 'main' of github.com:duckwork/.emacs.d
-rw-r--r--init.el68
-rw-r--r--lisp/acdw-modeline.el4
2 files changed, 32 insertions, 40 deletions
diff --git a/init.el b/init.el index 616edfb..e419f66 100644 --- a/init.el +++ b/init.el
@@ -351,7 +351,8 @@
351 ;; Add advice to pulse evaluated regions 351 ;; Add advice to pulse evaluated regions
352 (:advise eval-region :around 352 (:advise eval-region :around
353 (defun eval-region@pulse (fn beg end &rest args) 353 (defun eval-region@pulse (fn beg end &rest args)
354 (pulse-momentary-highlight-region beg end) 354 (let ((pulse-flag t))
355 (pulse-momentary-highlight-region beg end))
355 (apply fn beg end args)))) 356 (apply fn beg end args))))
356 357
357 (:with-mode lisp-interaction-mode ;; -___- 358 (:with-mode lisp-interaction-mode ;; -___-
@@ -375,10 +376,16 @@
375 (or (executable-find "magick") 376 (or (executable-find "magick")
376 (executable-find "convert"))) 377 (executable-find "convert")))
377 kill-read-only-ok t 378 kill-read-only-ok t
379 kill-ring-max 500 ; RAM is cheap, right?
380 mark-ring-max 50
381 kmacro-ring-max 20
382 search-ring-max 200
383 global-mark-ring-max 100
384 regexp-search-ring-max 100
378 load-prefer-newer t 385 load-prefer-newer t
379 native-comp-async-report-warnings-errors nil 386 native-comp-async-report-warnings-errors nil
380 password-cache t 387 password-cache t
381 password-cache-expiry 3600 ; 5 minutes 388 password-cache-expiry (* 60 5) ; seconds
382 set-mark-command-repeat-pop t) 389 set-mark-command-repeat-pop t)
383 390
384 (when (fboundp 'command-completion-default-include-p) 391 (when (fboundp 'command-completion-default-include-p)
@@ -845,6 +852,7 @@ specific to most general, they are these:
845 smie-indent-basic tab-width) 852 smie-indent-basic tab-width)
846 853
847 (:hook #'show-paren-mode 854 (:hook #'show-paren-mode
855 #'prettify-symbols-mode
848 ;; #'electric-pair-local-mode 856 ;; #'electric-pair-local-mode
849 #'acdw/setup-fringes 857 #'acdw/setup-fringes
850 #'display-fill-column-indicator-mode 858 #'display-fill-column-indicator-mode
@@ -1172,33 +1180,9 @@ specific to most general, they are these:
1172 circe-format-self-say (format 1180 circe-format-self-say (format
1173 "{nick:%1$d.%1$ds} > {body}" 1181 "{nick:%1$d.%1$ds} > {body}"
1174 (- acdw-irc/left-margin 3)) 1182 (- acdw-irc/left-margin 3))
1175 circe-network-inhibit-autoconnect '("Pissnet" "Twitch IRC") 1183 circe-prompt-string (format (format "%%%ds> "
1176 circe-network-options 1184 (- acdw-irc/left-margin 2))
1177 `(("Libera Chat" 1185 " ")
1178 :channels ("#emacs" "#systemcrafters" "##webpals"
1179 "#emacsconf-org")
1180 :sasl-username ,circe-default-nick
1181 :sasl-password ,(acdw/make-password-fetcher
1182 :host "libera.chat"))
1183 ("Tilde Chat" :host "irc.tilde.chat" :port 6697 :use-tls t
1184 :channels ("#meta" "#bread" "#dadjokes" "#team"
1185 "#emacs" "#nsfw")
1186 :sasl-username ,circe-default-nick
1187 :sasl-password ,(acdw/make-password-fetcher
1188 :host "tilde.chat"))
1189 ("Casa" :host "m455.casa" :port 6697 :use-tls t
1190 :channels ("#basement")
1191 :sasl-username ,circe-default-nick
1192 :sasl-password ,(acdw/make-password-fetcher
1193 :host "m455.casa"))
1194 ("Pissnet" :host "piss.hmm.st" :port 6697 :use-tls t
1195 :channels ("#i-just-peed")
1196 :sasl-username ,circe-default-nick
1197 :sasl-password ,(acdw/make-password-fetcher
1198 :host "piss.hmm.st"))
1199 ("Twitch IRC" :host "irc.chat.twitch.tv" :port 6697 :use-tls t
1200 :nick "caseofducks" :user "caseofducks"
1201 :pass ,(acdw/make-password-fetcher :host "irc.chat.twitch.tv")))
1202 circe-reduce-lurker-spam t 1186 circe-reduce-lurker-spam t
1203 circe-server-auto-join-default-type :after-auth 1187 circe-server-auto-join-default-type :after-auth
1204 circe-server-buffer-action (lambda (buf) 1188 circe-server-buffer-action (lambda (buf)
@@ -1229,7 +1213,7 @@ specific to most general, they are these:
1229 #'enable-circe-color-nicks 1213 #'enable-circe-color-nicks
1230 ;; #'enable-circe-display-images 1214 ;; #'enable-circe-display-images
1231 #'enable-circe-new-day-notifier 1215 #'enable-circe-new-day-notifier
1232 #'circe-chat@set-prompt 1216 ;; #'circe-chat@set-prompt
1233 #'topsy-mode)) 1217 #'topsy-mode))
1234 (:bind "C-c C-s" #'circe-command-SLAP) 1218 (:bind "C-c C-s" #'circe-command-SLAP)
1235 1219
@@ -1249,8 +1233,8 @@ specific to most general, they are these:
1249 (:hook #'visual-fill-column-mode 1233 (:hook #'visual-fill-column-mode
1250 #'visual-line-mode) 1234 #'visual-line-mode)
1251 1235
1252 (:local-set visual-fill-column-extra-text-width (cons acdw-irc/left-margin 1236 (:local-set visual-fill-column-extra-text-width
1253 0) 1237 (cons acdw-irc/left-margin 0)
1254 fringes-outside-margins t 1238 fringes-outside-margins t
1255 right-margin-width 5 1239 right-margin-width 5
1256 scroll-margin 0 1240 scroll-margin 0
@@ -1536,7 +1520,9 @@ See also `crux-reopen-as-root-mode'."
1536 1520
1537 (:with-mode elfeed-show-mode 1521 (:with-mode elfeed-show-mode
1538 (:hook #'reading-mode) 1522 (:hook #'reading-mode)
1539 1523 (:local-set shr-max-image-proportion 0.9
1524 shr-width nil
1525 fill-column 0)
1540 ;; see https://irreal.org/blog/?p=8885 1526 ;; see https://irreal.org/blog/?p=8885
1541 (:bind "SPC" (defun elfeed-scroll-up-command (&optional arg) 1527 (:bind "SPC" (defun elfeed-scroll-up-command (&optional arg)
1542 "Scroll up or go to next feed item in Elfeed" 1528 "Scroll up or go to next feed item in Elfeed"
@@ -1986,7 +1972,7 @@ browser defined in `browse-url-secondary-browser-function'."
1986 :files ("nyan-mode.el" "img"))) 1972 :files ("nyan-mode.el" "img")))
1987 (:option nyan-animate-nyancat nil 1973 (:option nyan-animate-nyancat nil
1988 nyan-bar-length 20 1974 nyan-bar-length 20
1989 nyan-minimum-window-width fill-column) 1975 nyan-minimum-window-width (+ fill-column (/ nyan-bar-length 2)))
1990 (nyan-mode +1) 1976 (nyan-mode +1)
1991 (defun disable-nyan-mode () 1977 (defun disable-nyan-mode ()
1992 "Disable `nyan-mode' in current buffer." 1978 "Disable `nyan-mode' in current buffer."
@@ -2087,7 +2073,8 @@ browser defined in `browse-url-secondary-browser-function'."
2087 org-clock-clocked-in-display 'mode-line 2073 org-clock-clocked-in-display 'mode-line
2088 org-clock-frame-title-format (cons '(t org-mode-line-string) 2074 org-clock-frame-title-format (cons '(t org-mode-line-string)
2089 (cons " --- " frame-title-format)) 2075 (cons " --- " frame-title-format))
2090 org-clock-string-limit 25 ; gives enough information 2076 org-clock-string-limit 7 ; just the clock bit
2077 ;; org-clock-string-limit 25 ; gives enough information
2091 org-clock-persist t 2078 org-clock-persist t
2092 org-confirm-babel-evaluate nil 2079 org-confirm-babel-evaluate nil
2093 org-cycle-separator-lines 0 2080 org-cycle-separator-lines 0
@@ -2333,7 +2320,13 @@ the default is \"/\"."
2333 (:global "M-`" #'popper-toggle-latest 2320 (:global "M-`" #'popper-toggle-latest
2334 "C-`" #'popper-cycle) 2321 "C-`" #'popper-cycle)
2335 (popper-mode +1) 2322 (popper-mode +1)
2336 (popper-echo-mode +1)) 2323 (when (fboundp 'popper-echo-mode)
2324 (popper-echo-mode +1)))
2325
2326(setup (:straight-when (powershell
2327 :host github
2328 :repo "jschaf/powershell.el")
2329 (acdw/system :work)))
2337 2330
2338;; (setup (:straight persistent-scratch) 2331;; (setup (:straight persistent-scratch)
2339;; (:option persistent-scratch-backup-directory (acdw/dir "scratch" t) 2332;; (:option persistent-scratch-backup-directory (acdw/dir "scratch" t)
@@ -2468,7 +2461,8 @@ the default is \"/\"."
2468 2461
2469(setup (:straight super-save) 2462(setup (:straight super-save)
2470 (:option auto-save-default nil 2463 (:option auto-save-default nil
2471 super-save-auto-save-when-idle nil 2464 super-save-auto-save-when-idle t
2465 super-save-idle-duration 60
2472 super-save-exclude '(".gpg") 2466 super-save-exclude '(".gpg")
2473 super-save-remote-files nil) 2467 super-save-remote-files nil)
2474 (auto-save-visited-mode -1) 2468 (auto-save-visited-mode -1)
diff --git a/lisp/acdw-modeline.el b/lisp/acdw-modeline.el index a9020c5..adfcb44 100644 --- a/lisp/acdw-modeline.el +++ b/lisp/acdw-modeline.el
@@ -33,9 +33,7 @@ Otherwise, cdr should be a function that takes two points (see `count-words')."
33 33
34(defun acdw-modeline/buffer-name () ; gonsie 34(defun acdw-modeline/buffer-name () ; gonsie
35 "Display the buffer name in a face reflecting its modified status." 35 "Display the buffer name in a face reflecting its modified status."
36 (propertize (concat " " 36 (propertize (concat (format " %-20s" (truncate-string 20 (buffer-name) "~")))
37 (truncate-string (/ (window-total-width) 2)
38 (buffer-name) "~"))
39 'face 'bold 37 'face 'bold
40 ;; (if (buffer-modified-p) 38 ;; (if (buffer-modified-p)
41 ;; 'font-lock-warning-face 39 ;; 'font-lock-warning-face