Merge branch 'main' of https://tildegit.org/acdw/emacs

3 files changed, 58 insertions, 6 deletions

@@ -25,12 +25,15 @@
                 (nnimap-server-port 993)
                 (nnimap-stream ssl)
                 (nnir-search-engine imap))
-        (nntp "news.tilde.club")))
+        (nntp "news.tilde.club")
+        (nntp "news.gwene.org")))
 
 ;;; Gnus cloud
 (setq gnus-cloud-method "nnimap:fastmail.com"
       gnus-cloud-storage-method 'base64 ; Don't always have GPG or gzip
       )
+(add-hook 'gnus-started-hook #'gnus-cloud-download-all-data)
+(add-hook 'gnus-exit-gnus-hook #'gnus-cloud-upload-all-data)
 
 ;;; Gnus subscriptions
 (setq gnus-options-subscribe (rx (or ;; all alternatives go under this
@@ -83,7 +86,8 @@
       message-signature (or (file-exists-p message-signature-file)
                             "~ acdw")
       gnus-save-newsrc-file nil
-      gnus-read-newsrc-file nil)
+      gnus-read-newsrc-file nil
+      gnus-interactive-exit nil)
 
 ;;; Other parameters
 (setq gnus-parameters
@@ -129,6 +133,11 @@
 (setq mm-discouraged-alternatives '("text/html"
                                     "text/richtext"))
 
+;;; Composing mail
+(hook-defun setup-message-mode message-mode-hook
+  (flyspell-mode +1)
+  (local-set-key (kbd "TAB") #'bbdb-complete-mail))
+
 ;;; Sending mail
 (setq send-mail-function #'smtpmail-send-it
       message-send-mail-function #'smtpmail-send-it
@@ -53,6 +53,10 @@
            no-littering-var-directory (acdw/dir))
   (require 'no-littering))
 
+;;;; `idle-require'
+(setup (:straight idle-require)
+  (idle-require-mode +1))
+
 ;;;; My packages
 (when-let ((default-directory
              (expand-file-name-exists-p "pkg/" user-emacs-directory)))
@@ -263,6 +267,8 @@
   (:option eshell-directory-name (acdw/dir "eshell/" t)
            eshell-aliases-file (acdw/dir "eshell/aliases" t))
 
+  (idle-require 'eshell)
+
   (defun eshell-quit-or-delete-char (arg)
     "Delete the character to the right, or quit eshell on an empty line."
     (interactive "p")
@@ -337,8 +343,12 @@
   (:option gnus-home-directory (expand-file-name "gnus" user-emacs-directory)
            gnus-directory (expand-file-name "gnus/News" user-emacs-directory)
            gnus-init-file (expand-file-name "gnus.el" user-emacs-directory))
+  
   (when (not (file-exists-p gnus-directory))
     (make-directory gnus-directory :parents))
+
+  (idle-require 'gnus)
+  
   (:leader "m" gnus))
 
 (setup imenu
@@ -740,7 +750,9 @@ if ripgrep is installed, otherwise `consult-grep'."
      (require 'gemini-write))))
 
 (setup (:straight expand-region)
-  (:global "C-=" er/expand-region))
+  (:global "C-=" er/expand-region)
+
+  (idle-require 'expand-region))
 
 (setup (:straight fennel-mode)
   (:needs "fennel")
@@ -812,6 +824,9 @@ if ripgrep is installed, otherwise `consult-grep'."
            "<help> o" helpful-symbol
            "C-c C-d" helpful-at-point))
 
+(setup (:straight ledger-mode)
+  (:needs "ledger"))
+
 (setup (:straight lua-mode)
   (:file-match "\\.lua\\'"))
 
@@ -897,6 +912,8 @@ if ripgrep is installed, otherwise `consult-grep'."
            org-startup-truncated nil
            org-tags-column (- 0 fill-column -3)
            org-directory "~/org")
+
+  (idle-require 'org)
   
   (:bind "RET" acdw-org/return-dwim
          "<S-return>" acdw-org/org-table-copy-down)
@@ -928,10 +945,11 @@ if ripgrep is installed, otherwise `consult-grep'."
     (add-hook (intern (concat (symbol-name mode) "-hook")) #'paren-face-mode)))
 
 (setup (:straight restart-emacs)
-  (defun emacs-upgrade ()
+  (defun emacs-upgrade (&optional update-packages)
     "Pull config, upgrade packages, restart Emacs."
-    (interactive)
-    (straight-pull-all)
+    (interactive "P")
+    (when update-packages
+      (straight-pull-all))
     (emacs-git-pull-config)
     (restart-emacs)))
 
@@ -944,6 +962,7 @@ if ripgrep is installed, otherwise `consult-grep'."
               simple-modeline-segment-position
               simple-modeline-segment-word-count)
              (simple-modeline-segment-misc-info
+              acdw-modeline/winum
               acdw-modeline/text-scale
               simple-modeline-segment-process
               acdw-modeline/god-mode-indicator
@@ -1005,6 +1024,25 @@ if ripgrep is installed, otherwise `consult-grep'."
   (which-key-setup-minibuffer)
   (which-key-mode +1))
 
+(setup (:straight winum)
+  (:option winum-auto-setup-mode-line nil
+           winum-ignored-buffers '(" *which-key*"))
+
+  (when (display-graphic-p)
+    (:with-map winum-keymap
+      (:bind "M-0" winum-select-window-0-or-10
+             "M-1" winum-select-window-1
+             "M-2" winum-select-window-2
+             "M-3" winum-select-window-3
+             "M-4" winum-select-window-4
+             "M-5" winum-select-window-5
+             "M-6" winum-select-window-6
+             "M-7" winum-select-window-7
+             "M-8" winum-select-window-8
+             "M-9" winum-select-window-9)))
+
+  (winum-mode +1))
+
 (setup (:straight zzz-to-char)
   (defun acdw/zzz-up-to-char (prefix)
     "Call `zzz-up-to-char', unless issued a PREFIX, in which case
@@ -88,4 +88,9 @@ indicator in the mode-line."
   (if-let ((backend (vc-backend buffer-file-name)))
       (substring vc-mode (+ (if (eq backend 'Hg) 2 3) 2))))
 
+(defun acdw-modeline/winum ()
+  (when (and (bound-and-true-p winum-mode)
+             (> winum--window-count 1))
+    (format winum-format (winum-get-number-string))))
+
 (provide 'acdw-modeline)