Remove direct usages of dash.el from init.el

Unnecessary, and also anaphora bad
This commit is contained in:
eriedaberrie 2025-02-05 15:50:09 +00:00
parent 0de7841345
commit 7127b4080e

86
init.el
View file

@ -38,13 +38,6 @@
(use-package f (use-package f
:demand t) :demand t)
(use-package dash
:demand t
:hook (emacs-lisp-mode . dash-fontify-mode)
:init
(with-eval-after-load 'info-look
(dash-register-info-lookup)))
(use-package undo-fu (use-package undo-fu
:demand t :demand t
:config :config
@ -764,21 +757,21 @@ This function is called by `org-babel-execute-src-block'."
(lui-fill-type nil) (lui-fill-type nil)
(lui-time-stamp-format "%T") (lui-time-stamp-format "%T")
:config :config
(--when-let (nth 0 (auth-source-search :max 1 (when-let* ((auth-info (car (auth-source-search :max 1
:require '(:user :secret) :require '(:user :secret)
:host "irc.libera.chat" :host "irc.libera.chat"
:port 6697)) :port 6697)))
(let ((user (plist-get it :user)) (user (plist-get auth-info :user))
(secret (plist-get it :secret))) (secret (plist-get auth-info :secret)))
(setq circe-network-options (setq circe-network-options
`(("Libera Chat" `(("Libera Chat"
:tls t :tls t
:nick ,user :nick ,user
:sasl-username ,user :sasl-username ,user
:sasl-password ,(if (functionp secret) :sasl-password ,(if (functionp secret)
(funcall secret) (funcall secret)
secret) secret)
:channels ("#emacs" "#nixos" "#lisp" "#commonlisp")))))) :channels ("#emacs" "#nixos" "#lisp" "#commonlisp")))))
(add-hook 'lui-mode-hook (add-hook 'lui-mode-hook
(lambda () (lambda ()
(visual-line-mode) (visual-line-mode)
@ -914,30 +907,31 @@ This function is called by `org-babel-execute-src-block'."
:config :config
(when (boundp 'my--agenix-email-json-data) (when (boundp 'my--agenix-email-json-data)
(setq mu4e-contexts (setq mu4e-contexts
(--map (pcase-let ((`(,type (address . ,address) (name . ,name) ,_) it)) (mapcar (lambda (profile)
(make-mu4e-context (pcase-let ((`(,type (address . ,address) (name . ,name) ,_) profile))
:name (symbol-name type) (make-mu4e-context
:enter-func (lambda () :name (symbol-name type)
(mu4e-message (format "Entering \"%s\" context" :enter-func (lambda ()
type))) (mu4e-message (format "Entering \"%s\" context"
:leave-func (lambda () type)))
(mu4e-message (format "Leaving \"%s\" context" :leave-func (lambda ()
type))) (mu4e-message (format "Leaving \"%s\" context"
:match-func (lambda (msg) type)))
(when msg :match-func (lambda (msg)
(mu4e-message-contact-field-matches (when msg
msg (mu4e-message-contact-field-matches
:to address))) msg
:vars (cl-labels ((folder-name (folder-type) :to address)))
(format "/%s/[Gmail]/%s" type folder-type))) :vars (cl-labels ((folder-name (folder-type)
`((user-mail-address . ,address) (format "/%s/[Gmail]/%s" type folder-type)))
(user-full-name . ,name) `((user-mail-address . ,address)
(mu4e-drafts-folder . ,(folder-name "Drafts")) (user-full-name . ,name)
(mu4e-sent-folder . ,(folder-name "Sent Mail")) (mu4e-drafts-folder . ,(folder-name "Drafts"))
(mu4e-trash-folder . ,(folder-name "Trash")) (mu4e-sent-folder . ,(folder-name "Sent Mail"))
(smtpmail-smtp-server . "smtp.gmail.com") (mu4e-trash-folder . ,(folder-name "Trash"))
(smtpmail-smtp-user . ,address))))) (smtpmail-smtp-server . "smtp.gmail.com")
my--agenix-email-json-data))) (smtpmail-smtp-user . ,address))))))
my--agenix-email-json-data)))
(when (fboundp 'imagemagick-register-types) (when (fboundp 'imagemagick-register-types)
(imagemagick-register-types))) (imagemagick-register-types)))