From 7127b4080e7b96b3cf835a39df8d03d6e714f5db Mon Sep 17 00:00:00 2001 From: eriedaberrie Date: Wed, 5 Feb 2025 15:50:09 +0000 Subject: [PATCH] Remove direct usages of dash.el from init.el Unnecessary, and also anaphora bad --- init.el | 86 +++++++++++++++++++++++++++------------------------------ 1 file changed, 40 insertions(+), 46 deletions(-) diff --git a/init.el b/init.el index 527340d..181fd0c 100644 --- a/init.el +++ b/init.el @@ -38,13 +38,6 @@ (use-package f :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 :demand t :config @@ -764,21 +757,21 @@ This function is called by `org-babel-execute-src-block'." (lui-fill-type nil) (lui-time-stamp-format "%T") :config - (--when-let (nth 0 (auth-source-search :max 1 - :require '(:user :secret) - :host "irc.libera.chat" - :port 6697)) - (let ((user (plist-get it :user)) - (secret (plist-get it :secret))) - (setq circe-network-options - `(("Libera Chat" - :tls t - :nick ,user - :sasl-username ,user - :sasl-password ,(if (functionp secret) - (funcall secret) - secret) - :channels ("#emacs" "#nixos" "#lisp" "#commonlisp")))))) + (when-let* ((auth-info (car (auth-source-search :max 1 + :require '(:user :secret) + :host "irc.libera.chat" + :port 6697))) + (user (plist-get auth-info :user)) + (secret (plist-get auth-info :secret))) + (setq circe-network-options + `(("Libera Chat" + :tls t + :nick ,user + :sasl-username ,user + :sasl-password ,(if (functionp secret) + (funcall secret) + secret) + :channels ("#emacs" "#nixos" "#lisp" "#commonlisp"))))) (add-hook 'lui-mode-hook (lambda () (visual-line-mode) @@ -914,30 +907,31 @@ This function is called by `org-babel-execute-src-block'." :config (when (boundp 'my--agenix-email-json-data) (setq mu4e-contexts - (--map (pcase-let ((`(,type (address . ,address) (name . ,name) ,_) it)) - (make-mu4e-context - :name (symbol-name type) - :enter-func (lambda () - (mu4e-message (format "Entering \"%s\" context" - type))) - :leave-func (lambda () - (mu4e-message (format "Leaving \"%s\" context" - type))) - :match-func (lambda (msg) - (when msg - (mu4e-message-contact-field-matches - msg - :to address))) - :vars (cl-labels ((folder-name (folder-type) - (format "/%s/[Gmail]/%s" type folder-type))) - `((user-mail-address . ,address) - (user-full-name . ,name) - (mu4e-drafts-folder . ,(folder-name "Drafts")) - (mu4e-sent-folder . ,(folder-name "Sent Mail")) - (mu4e-trash-folder . ,(folder-name "Trash")) - (smtpmail-smtp-server . "smtp.gmail.com") - (smtpmail-smtp-user . ,address))))) - my--agenix-email-json-data))) + (mapcar (lambda (profile) + (pcase-let ((`(,type (address . ,address) (name . ,name) ,_) profile)) + (make-mu4e-context + :name (symbol-name type) + :enter-func (lambda () + (mu4e-message (format "Entering \"%s\" context" + type))) + :leave-func (lambda () + (mu4e-message (format "Leaving \"%s\" context" + type))) + :match-func (lambda (msg) + (when msg + (mu4e-message-contact-field-matches + msg + :to address))) + :vars (cl-labels ((folder-name (folder-type) + (format "/%s/[Gmail]/%s" type folder-type))) + `((user-mail-address . ,address) + (user-full-name . ,name) + (mu4e-drafts-folder . ,(folder-name "Drafts")) + (mu4e-sent-folder . ,(folder-name "Sent Mail")) + (mu4e-trash-folder . ,(folder-name "Trash")) + (smtpmail-smtp-server . "smtp.gmail.com") + (smtpmail-smtp-user . ,address)))))) + my--agenix-email-json-data))) (when (fboundp 'imagemagick-register-types) (imagemagick-register-types)))