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

2 files changed, 14 insertions, 6 deletions

@@ -152,6 +152,9 @@
       (eval-print-last-sexp)))
   (load bootstrap-file nil 'nomessage))
 
+;; Helper package, good commands here.
+(require 'straight-x)
+
 ;; Appendix.  Get rid of a dumb alias.
 ;; straight-ಠ_ಠ-mode really slows down all minibuffer completion functions.
 ;; Since it's a (rarely-used, even) alias anyway, I just define it back to nil.
@@ -324,6 +324,8 @@
    erc-nick-truncate (- erc-fill-static-center 1)
    erc-prompt (lambda () (acdw-erc/prompt))
    erc-prompt-for-password nil          ; use ~/.authinfo
+   erc-rename-buffers t
+   erc-server erc-default-server
    erc/servers
    (when (boundp 'erc-autojoin-channels-alist)
      (mapcar #'car erc-autojoin-channels-alist))
@@ -346,7 +348,9 @@
              erc-track-mode
              erc-truncate-mode)
 
-  (:bind "C-c C-b" acdw-erc/erc-switch-to-buffer)
+  (:bind "C-c C-b" acdw-erc/erc-switch-to-buffer
+         "C-c C-c" nil                  ; def: `erc-toggle-interpret-controls'
+         )
 
   (with-eval-after-load 'erc
     (setup (:straight erc-hl-nicks)
@@ -1125,14 +1129,13 @@ if ripgrep is installed, otherwise `consult-grep'."
   (require 'orderless)
   (:option (prepend completion-styles) 'orderless))
 
-(setup (:straight (org :host nil
-                       :repo "https://code.orgmode.org/bzg/org-mode.git"))
-  (:straight (org-contrib :host nil
-                          :repo "https://git.sr.ht/~bzg/org-contrib"))
+(setup (:straight org)
+  (:straight org-contrib)
   (require 'acdw-org)                   ; so I don't clutter up init.el
   (:option org-adapt-indentation nil
            org-catch-invisible-edits 'smart
            org-clock-clocked-in-display 'mode-line
+           org-clock-string-limit 7     ; gives time and not title
            org-confirm-babel-evaluate nil
            org-ellipsis " …"
            org-export-coding-system 'utf-8-unix
@@ -1280,7 +1283,9 @@ if ripgrep is installed, otherwise `consult-grep'."
 (setup (:straight (vertico
                    :host github
                    :repo "minad/vertico"))
-  (setq resize-mini-windows 'grow-only)
+  (:option resize-mini-windows 'grow-only
+           vertico-count-format nil
+           vertico-cycle t)
   (if (boundp 'comp-deferred-compilation-deny-list)
       (add-to-list 'comp-deferred-compilation-deny-list "vertico"))
   (vertico-mode +1))