config

commit 01d0a0c35efe30bf76a1f3d371503ed78b62339d
parent efd8fa05a67b2605eaf7f637c493ee7ad713610a
Author: dwrz <dwrz@dwrz.net>
Date:   Fri, 26 Jan 2024 17:59:35 +0000

Update Emacs init

Diffstat:
M
emacs/init.el
 | 
34
+++++++++++++++++++++++++---------

1 file changed, 25 insertions(+), 9 deletions(-)
diff --git a/emacs/init.el b/emacs/init.el
@@ -191,16 +191,22 @@
 (use-package consult-notmuch :defer t :ensure t)
 
 (use-package corfu
-  :bind  (:map corfu-map ("RET" . nil)
-	       ("C-<tab>" . corfu-quit)
-	       ("<end>" . corfu-quit))
+  :bind  (:map corfu-map
+	       ("<tab>" . corfu-complete)
+	       ;; ("RET" . nil)
+	       ;; ("C-<tab>" . corfu-quit)
+	       ;; ("<end>" . corfu-quit)
+	       ;; ("<escape>" . corfu-quit)
+	       )
   :custom
   (corfu-auto t)
   (corfu-auto-delay 0.1)
   (corfu-auto-prefix 2)
   (corfu-cycle t)
+  (corfu-history-mode 1)
   (corfu-quit-no-match t)
   (corfu-scroll-margin 0)
+  (corfu-popupinfo-delay '(1.25 . 0.5))
   :ensure t
   :hook (corfu-mode . corfu-popupinfo-mode)
   :init (global-corfu-mode)
@@ -260,7 +266,10 @@
   :bind
   (("C-." . embark-act)
    ("C-," . embark-dwim)
-   ("C-'" . embark-bindings))
+   ("C-'" . embark-bindings)
+   :map minibuffer-local-map
+   ("C-<" . embark-collect)
+   ("C->" . embark-export))
   :config
   (setq prefix-help-command #'embark-prefix-help-command)
   :ensure t)
@@ -675,13 +684,17 @@
 		select-enable-clipboard t)
   :ensure nil)
 
-(use-package savehist :init (savehist-mode t) :ensure nil)
+(use-package savehist
+  :init (savehist-mode t)
+  :ensure nil)
 
 (use-package sendmail
+  :after corfu
   :config (setq mail-specify-envelope-from t
 		mail-envelope-from 'header
 		mail-specify-envelope-from t
 		send-mail-function 'sendmail-send-it)
+  (add-to-list 'savehist-additional-variables 'corfu-history)
   :defer t
   :ensure nil)
 
@@ -697,9 +710,11 @@
   (size-indication-mode t)
   :ensure nil)
 
-(use-package sql :hook (sql-mode . sqlind-minor-mode) :ensure nil)
+(use-package sql
+  :config (setq sql-linter-program "pg_format")
+  :hook (sql-mode . sqlind-minor-mode)
+  :ensure nil)
 
-;; TODO: see if this can be replaced with sql-linter-program.
 (use-package sql-indent :config (setq sqlind-basic-offset 4) :defer t :ensure t)
 
 (use-package subword :init (global-subword-mode t) :ensure nil)
@@ -710,6 +725,7 @@
 
 (use-package subr-x :init (defalias 'yes-or-no-p 'y-or-n-p) :ensure nil)
 
+;; TODO: investigate yasnippet or tempel.
 ;; https://github.com/minad/tempel
 ;; (use-package tempel
 ;;    :bind (("M-+" . tempel-complete)
@@ -769,8 +785,8 @@
 		web-mode-css-indent-offset 2
 		web-mode-engines-alist
 		'(("go"    . "\\.gohtml\\'"))
-		  web-mode-indent-style 2
-		  web-mode-markup-indent-offset 2)
+		web-mode-indent-style 2
+		web-mode-markup-indent-offset 2)
   :mode (("\\.html?\\'" . web-mode)
 	 ("\\.gohtml\\'" . web-mode))
   :ensure t)