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

1 files changed, 79 insertions, 58 deletions

@@ -15,6 +15,10 @@
 ;; - Make good choices.
 
 ;;; Code:
+
+;; Let's use lexical binding by default, shall we?
+(setq-default lexical-binding t)
+
 
 ;;; Necessary packages
 
@@ -47,7 +51,7 @@
 
 (setup-define :mode
   (lambda (ext)
-    `(add-to-list 'auto-mode-alist '(,ext . setup-mode)))
+    `(add-to-list 'auto-mode-alist (cons ,ext setup-mode)))
   :documentation "Add SETUP-MODE to `auto-mode-alist' for EXTENSION."
   :repeatable t)
 
@@ -57,6 +61,10 @@
            no-littering-var-directory (acdw/dir))
   (require 'no-littering))
 
+;;; My packages
+(let ((default-directory (expand-file-name "pkg/" user-emacs-directory)))
+  (normal-top-level-add-subdirs-to-load-path))
+
 
 ;;; Good defaults
 
@@ -101,7 +109,7 @@
   (delete-selection-mode +1)
 
   ;; Encoding
-  (:option local-coding-system 'utf-8-unix
+  (:option locale-coding-system 'utf-8-unix
            coding-system-for-read 'utf-8-unix
            coding-system-for-write 'utf-8-unix
            buffer-file-coding-system 'utf-8-unix
@@ -117,8 +125,13 @@
   (set-default-coding-systems 'utf-8-unix)
   (set-terminal-coding-system 'utf-8-unix)
   (set-keyboard-coding-system 'utf-8-unix)
-  (set-selection-coding-system 'utf-8-unix)
 
+  (pcase acdw/system
+    (:work (set-clipboard-coding-system 'utf-16-le)
+           (set-selection-coding-system 'utf-16-le))
+    (_ (set-selection-coding-system 'utf-8)
+       (set-clipboard-coding-system 'utf-8)))
+  
   ;; Cursor
   (:option cursor-type 'bar
            cursor-in-non-selected-windows 'hollow
@@ -144,6 +157,7 @@
   
   (minibuffer-depth-indicate-mode +1)
   (file-name-shadow-mode +1)
+  (minibuffer-electric-default-mode +1)
   (fset 'yes-or-no-p #'y-or-n-p)
 
   ;; Completion
@@ -183,7 +197,7 @@
            tab-bar-show 1
            use-dialog-box nil
            use-file-dialog nil
-           echo-keystrokes 0.25
+           echo-keystrokes 0.01
            recenter-positions '(top middle bottom)
            attempt-stack-overflow-recovery nil
            attempt-orderly-shutdown-on-fatal-signal nil
@@ -356,28 +370,30 @@
 (setup (:straight (org :host nil
                        :repo "https://code.orgmode.org/bzg/org-mode.git"))
   (require 'acdw-org)
-  (:option org-directory "~/org"
-           org-hide-emphasis-markers t
-           org-fontify-whole-heading-line t
-           org-fontify-done-headline t
-           org-fontify-quote-and-verse-blocks t
-           org-src-fontify-natively t
-           org-pretty-entities t
-           org-tags-column (- 0 fill-column -3)
-           org-src-tab-acts-natively t
-           org-src-window-setup 'current-window
-           org-confirm-babel-evaluate nil
-           org-adapt-indentation nil
+  (:option org-adapt-indentation nil
            org-catch-invisible-edits 'smart
-           org-special-ctrl-a/e t
-           org-special-ctrl-k t
-           org-imenu-depth 3
+           org-confirm-babel-evaluate nil
+           org-export-coding-system 'utf-8-unix
            org-export-headline-levels 8
+           org-export-with-section-numbers nil
            org-export-with-smart-quotes t
            org-export-with-sub-superscripts t
-           org-export-coding-system 'utf-8-unix
+           org-export-with-toc nil
+           org-fontify-done-headline t
+           org-fontify-quote-and-verse-blocks t
+           org-fontify-whole-heading-line t
+           org-hide-emphasis-markers t
            org-html-coding-system  'utf-8-unix
-           org-startup-truncated nil)
+           org-imenu-depth 3
+           org-pretty-entities t
+           org-special-ctrl-a/e t
+           org-special-ctrl-k t
+           org-src-fontify-natively t
+           org-src-tab-acts-natively t
+           org-src-window-setup 'current-window
+           org-startup-truncated nil
+           org-tags-column (- 0 fill-column -3)
+           org-directory "~/org")
   (:bind "RET" unpackaged/org-return-dwim)
   (add-hook 'before-save-hook #'acdw/hook--org-mode-fix-blank-lines)
   (advice-add 'org-delete-backward-char :override #'acdw-org/delete-backward-char))
@@ -434,6 +450,7 @@
          "o" elpher-follow-current-link
          "G" elpher-go-current)
   (:hook acdw/reading-mode)
+  (autoload 'elpher-bookmarks "elpher" nil t)
   ;; Make `eww' gemini/gopher aware.  From Emacswiki.
   (advice-add 'eww-browse-url :around
               (defun elpher:eww-browse-url (original url &optional new-window)
@@ -480,21 +497,30 @@
 
 (setup (:straight magit)
   (:leader "g" magit-status)
-  (:option magit-display-buffer-function
-           (defun magit-display-buffer-same-window (buffer)
-             "Display BUFFER in the selected window like God intended."
-             (display-buffer buffer '(display-buffer-same-window)))
-           magit-popup-display-buffer-action '((display-buffer-same-window))))
+
+  (defun magit-display-buffer-same-window (buffer)
+    "Display BUFFER in the selected window like God intended."
+    (display-buffer buffer '(display-buffer-same-window)))
+  
+  (:option magit-display-buffer-function #'magit-display-buffer-same-window
+           magit-popup-display-buffer-action '((display-buffer-same-window))
+           magit-refresh-status-buffer nil))
 
 (setup (:straight nov)
   (:option nov-text-width fill-column)
   (:mode "\\.epub\\'"))
 
+(setup gnus
+  (: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)))
+
 (when (eq acdw/system :home)
   (setup (:straight pdf-tools)
-    (pdf-loader-install)))
+    (pdf-loader-install))
 
-(when (eq acdw/system :home)
   (setup (:straight vterm)))
 
 
@@ -568,28 +594,24 @@ call `zzz-to-char'."
   
   (global-undo-fu-session-mode +1))
 
-;; (setup (:straight icomplete-vertical)
-;;   (:with-map icomplete-minibuffer-map
-;;     (:bind "<down>" icomplete-forward-completions
-;;            "C-n" icomplete-forward-completions
-;;            "<up>" icomplete-backward-completions
-;;            "C-p" icomplete-backward-completions
-;;            "C-v" icomplete-vertical-toggle
-;;            "RET" icomplete-force-complete-and-exit
-;;            "C-RET" minibuffer-complete-and-exit))
-;;   (icomplete-vertical-mode +1))
-
-(setup (:straight vertico)
-  (if (bound-and-true-p comp-deferred-compilation-deny-list)
-      (add-to-list 'comp-deferred-compilation-deny-list 'vertico))
+(setup (:straight (vertico
+                   :host github
+                   :repo "minad/vertico"))
+  (setq resize-mini-windows t)
+  (if (boundp 'comp-deferred-compilation-deny-list)
+      (add-to-list 'comp-deferred-compilation-deny-list "vertico"))
   (icomplete-mode -1)
-  (icomplete-vertical-mode -1)
   (vertico-mode +1))
 
-(setup (:straight orderless)
+(setup (:straight (orderless
+                   :host github
+                   :repo "oantolin/orderless"))
+  (require 'orderless)
   (:option (prepend completion-styles) 'orderless))
 
-(setup (:straight consult)
+(setup (:straight (consult
+                   :host github
+                   :repo "minad/consult"))
 
   ;; "Sensible" functions
   (defun consult-sensible-grep ()
@@ -743,18 +765,17 @@ if ripgrep is installed, otherwise `consult-grep'."
                      (apheleia--get-formatter-command)))
       (indent-region (point-min) (point-max)))))
 
-(setup (:straight company)
-  (:hook-into prog-mode)
-  (:hook company-tng-mode)
-  
-  (if (eq acdw/system :home)
-      (setq company-idle-delay 0.25)
-    (setq company-idle-delay nil))
-
-  (:global "M-/" company-complete)
-  (:with-map company-active-map
-    (:bind "C-d" company-show-doc-buffer
-           "M-." company-show-location)))
+(setup (:straight (corfu
+                   :host github
+                   :repo "minad/corfu"))
+  (:option completion-cycle-threshold 3
+           tab-always-indent 'complete
+           corfu-cycle t)
+  (:with-map corfu-map
+    (:bind "TAB" corfu-next
+           "S-TAB" corfu-previous))
+  (:hook-into prog-mode
+              eshell-mode))
 
 ;;; Lisps
 (defvar lispy-modes '(emacs-lisp-mode
@@ -818,7 +839,7 @@ if ripgrep is installed, otherwise `consult-grep'."
     (with-eval-after-load 'company
       (setup (:straight slime-company)
         (:option slime-company-completion 'fuzzy
-                 slime-company-after-completion 'slime-company-just-one-space)
+                 slime-company-after-completion nil)
         (slime-setup '(slime-fancy slime-company))))))
 
 (when (executable-find "fennel")