about summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--gnus.el5
-rw-r--r--init.el51
-rw-r--r--lisp/acdw.el8
3 files changed, 43 insertions, 21 deletions
diff --git a/gnus.el b/gnus.el index 5b9df7d..846966d 100644 --- a/gnus.el +++ b/gnus.el
@@ -27,6 +27,11 @@
27 (nnir-search-engine imap)) 27 (nnir-search-engine imap))
28 (nntp "news.tilde.club"))) 28 (nntp "news.tilde.club")))
29 29
30;;; Gnus cloud
31(setq gnus-cloud-method "nnimap:fastmail.com"
32 gnus-cloud-storage-method 'base64 ; Don't always have GPG or gzip
33 )
34
30;;; Gnus subscriptions 35;;; Gnus subscriptions
31(setq gnus-options-subscribe (rx (or ;; all alternatives go under this 36(setq gnus-options-subscribe (rx (or ;; all alternatives go under this
32 (seq string-start 37 (seq string-start
diff --git a/init.el b/init.el index 61fbdc4..b3b6396 100644 --- a/init.el +++ b/init.el
@@ -752,26 +752,35 @@ if ripgrep is installed, otherwise `consult-grep'."
752 752
753(setup (:straight geiser)) 753(setup (:straight geiser))
754 754
755(setup (:straight slime) 755(setup common-lisp-ide
756 (defvar acdw/cl-ide :sly)
756 (defvar acdw/lisp-bin (or (executable-find "sbcl") 757 (defvar acdw/lisp-bin (or (executable-find "sbcl")
757 (executable-find "clisp"))) 758 (executable-find "clisp")))
758 (:needs acdw/lisp-bin) 759 (:needs acdw/lisp-bin)
759
760 (:also-load slime-autoloads)
761
762 (:option inferior-lisp-program acdw/lisp-bin) 760 (:option inferior-lisp-program acdw/lisp-bin)
763 761
764 (when-let ((slime-helper (or (expand-file-name-exists-p 762 (pcase acdw/cl-ide
765 "~/quicklisp/slime-helper.el") 763 (:slime
766 (expand-file-name-exists-p 764 (setup (:straight slime)
767 "~/var/quicklisp/slime-helper.el")))) 765 (:also-load slime-autoloads)
768 (load slime-helper)) 766
769 767 (when-let ((slime-helper (or (expand-file-name-exists-p
770 (with-eval-after-load 'company 768 "~/quicklisp/slime-helper.el")
771 (setup (:straight slime-company) 769 (expand-file-name-exists-p
772 (:option slime-company-completion 'fuzzy 770 "~/var/quicklisp/slime-helper.el"))))
773 slime-company-after-completion nil) 771 (load slime-helper))
774 (slime-setup '(slime-fancy slime-company))))) 772
773 (with-eval-after-load 'company
774 (setup (:straight slime-company)
775 (:option slime-company-completion 'fuzzy
776 slime-company-after-completion nil)
777 (slime-setup '(slime-fancy slime-company))))))
778
779 (:sly
780 (setup (:straight sly)
781 (:option sly-kill-without-query-p t)
782
783 (:also-load sly-autoloads)))))
775 784
776(setup (:straight (gemini-mode 785(setup (:straight (gemini-mode
777 :host nil 786 :host nil
@@ -971,8 +980,8 @@ if ripgrep is installed, otherwise `consult-grep'."
971 980
972(setup (:straight which-key) 981(setup (:straight which-key)
973 (:option which-key-show-early-on-C-h t 982 (:option which-key-show-early-on-C-h t
974 which-key-idle-delay 0.05 983 which-key-idle-delay 1
975 which-key-idle-secondary-delay 0.05 984 which-key-idle-secondary-delay 0.5
976 which-key-delay-functions '(acdw/which-key-delay-all-but)) 985 which-key-delay-functions '(acdw/which-key-delay-all-but))
977 986
978 (defun acdw/which-key-delay-all-but (seq len) 987 (defun acdw/which-key-delay-all-but (seq len)
@@ -981,9 +990,9 @@ if ripgrep is installed, otherwise `consult-grep'."
981 ;; With C-z binds (`acdw/leader'), pop up right away 990 ;; With C-z binds (`acdw/leader'), pop up right away
982 ((string-prefix-p "C-z" seq :ignore-case) 0) 991 ((string-prefix-p "C-z" seq :ignore-case) 0)
983 ;; Also pop up right away if we're already entering keys 992 ;; Also pop up right away if we're already entering keys
984 ((> len 1) 0) 993 ((> len 1) which-key-idle-secondary-delay)
985 ;; Otherwise, wait 1.25 seconds 994 ;; Otherwise, wait
986 (t 1.25))) 995 (t which-key-idle-delay)))
987 996
988 (which-key-setup-minibuffer) 997 (which-key-setup-minibuffer)
989 (which-key-mode +1)) 998 (which-key-mode +1))
diff --git a/lisp/acdw.el b/lisp/acdw.el index ab02a9e..f297691 100644 --- a/lisp/acdw.el +++ b/lisp/acdw.el
@@ -30,6 +30,14 @@
30 30
31;;; Utility functions 31;;; Utility functions
32 32
33(defun dos2unix (buffer)
34 "Replace \r\n with \n in BUFFER."
35 (interactive "*b")
36 (save-excursion
37 (goto-char (point-min))
38 (while (search-forward (string ?\C-m ?\C-j) nil t)
39 (replace-match (string ?\C-j) nil t))))
40
33(defun expand-file-name-exists-p (&rest expand-file-name-args) 41(defun expand-file-name-exists-p (&rest expand-file-name-args)
34 "Call `expand-file-name' on EXPAND-FILE-NAME-ARGS, returning 42 "Call `expand-file-name' on EXPAND-FILE-NAME-ARGS, returning
35 its name if it exists, or NIL otherwise." 43 its name if it exists, or NIL otherwise."