emacs: updates for 31.1, cleanup

1 files changed, 29 insertions, 48 deletions

diff --git a/emacs/init.el b/emacs/init.el
index 61b15d0..f1f836d 100644
--- a/emacs/init.el
+++ b/emacs/init.el
@@ -16,7 +16,6 @@
 
 (use-package benchmark-init
   :config
-  ;; To disable collection of benchmark data after init is done.
   (add-hook 'after-init-hook 'benchmark-init/deactivate))
 
 (defvar surround-keys '("(" "{" "[" "$" "\"" "'"))
@@ -269,6 +268,7 @@ current layout."
   (keymap-set my/keys-mode-map "M-Q" 'auto-fill-mode)
   (keymap-set my/keys-mode-map "M-A" 'beginning-of-line-text)
   (keymap-set my/keys-mode-map "M-R" 'my/layout-swap)
+  (keymap-set my/keys-mode-map "M-W" 'switch-to-buffer)
   (keymap-set my/keys-mode-map "C-c R" 'raise-sexp)
   (keymap-set my/keys-mode-map "C-c r" 'delete-pair)
   (keymap-set my/keys-mode-map "M-S" 'surround-prefix)
@@ -287,8 +287,6 @@ current layout."
   (setq-default proced-auto-update-flag t)
   (setq-default proced-auto-update-interval 1))
 
-(use-package posframe)
-
 (use-package orderless ; ordering (minibuffer) completions
   :demand t
   :custom
@@ -305,11 +303,13 @@ current layout."
   ;; (vertico-flat-mode)
   (vertico-mode 1))
 
+(use-package posframe)
 (use-package vertico-posframe
   :after vertico
   :demand t
   :custom
-  (vertico-posframe-poshandler #'posframe-poshandler-frame-bottom-left-corner)
+  (vertico-posframe-poshandler
+   #'posframe-poshandler-frame-bottom-center)
   (vertico-posframe-size-function
    (lambda (buffer)
      (let ((w (frame-width)))
@@ -346,8 +346,6 @@ current layout."
                  nil
                  (window-parameters (mode-line-format . none)))))
 
-(use-package embark-consult)
-
 (use-package corfu ; in buffer completion
   :demand t
   :custom
@@ -364,13 +362,6 @@ current layout."
   :config
   (global-corfu-mode 1))
 
-(use-package corfu-terminal ; make corfu work on terminals
-  :demand t
-  :custom
-  (corfu-terminal-disable-on-gui t)
-  :config
-  (corfu-terminal-mode 1))
-
 (use-package tempel
   :demand t
   :custom
@@ -450,9 +441,9 @@ current layout."
   :config
   (winum-mode 1))
 
-(use-package recentf
-  :config
-  (recentf-mode))
+(use-package savehist
+  :init
+  (savehist-mode))
 
 (progn ; basic isearch
   ;; swap basic and regex binds
@@ -461,25 +452,25 @@ current layout."
   (keymap-set global-map "C-M-s" 'isearch-forward)
   (keymap-set global-map "C-M-r" 'isearch-backward))
 
-(use-package consult ; more encompassing buffer switch and searching
-  :demand t
-  :custom
-  (consult-preview-excluded-buffers t)
-  (consult-narrow-key ",")
-  :bind
-  ("C-x b" . consult-buffer)
-  ("M-W" . consult-buffer)
-  ("C-S-y" . consult-yank-from-kill-ring)
-  ("M-g M-g" . consult-goto-line)
-  ("C-S-s" . consult-line-multi)
-  ("M-s g" . consult-grep)
-  ("M-s G" . grep)
-  ("M-s f" . consult-find)
-  ;; move some standard binds
-  ("M-s s" . consult-line))
-
-(use-package embark-consult
-  :after embark consult)
+;; (use-package consult ; more encompassing buffer switch and searching
+;;   :demand t
+;;   :custom
+;;   (consult-preview-excluded-buffers t)
+;;   (consult-narrow-key ",")
+;;   :bind
+;;   ("C-x b" . consult-buffer)
+;;   ("M-W" . consult-buffer)
+;;   ("C-S-y" . consult-yank-from-kill-ring)
+;;   ("M-g M-g" . consult-goto-line)
+;;   ("C-S-s" . consult-line-multi)
+;;   ("M-s g" . consult-grep)
+;;   ("M-s G" . grep)
+;;   ("M-s f" . consult-find)
+;;   ;; move some standard binds
+;;   ("M-s s" . consult-line))
+
+;; (use-package embark-consult
+;;   :after embark consult)
 
 (use-package hl-todo ; highlight certain keywords
   :hook
@@ -628,8 +619,8 @@ current layout."
 (progn ; better commenting binds
   (global-set-key (kbd "C-x C-;") 'comment-or-uncomment-region)
   (global-set-key (kbd "C-x ;") 'comment-line)
-  (global-set-key (kbd "C-x :") 'comment-set-column)
-  ;; ^ never gonna use but whatever
+  (global-set-key (kbd "C-x :") 'comment-or-uncomment-region)
+  ;; ^ duped for terminal w/o C-;
   )
 
 (use-package imenu ; jump to items in the current buffer
@@ -817,7 +808,6 @@ current layout."
   (setq kill-buffer-query-functions
         (delq 'process-kill-buffer-query-function kill-buffer-query-functions))
   (setq confirm-kill-processes nil)
-  ;; start additional async shell commands in new buffers without asking
   (setq async-shell-command-buffer 'new-buffer)
   (setq vc-follow-symlinks t))
 
@@ -853,7 +843,6 @@ current layout."
   (setq-default viper-ex-style-motion nil)
   (setq-default viper-auto-indent t)
   (setq-default viper-buffer-search-char ?g)
-  ;; (setq viper-mode t)
   (setq viper-mode nil)
   (require 'viper)
   (define-key viper-vi-global-user-map (kbd "C-y") 'yank)
@@ -1039,15 +1028,7 @@ current layout."
  '(gdb-non-stop-setting nil)
  '(helm-minibuffer-history-key "M-p")
  '(menu-bar-mode nil)
- '(package-selected-packages
-   '(avy balanced-windows bash-completion benchmark-init cape
-         corfu-terminal eat ednc eglot eglot-tempel embark-consult
-         esh-help exwm-modeline fold-this free-keys haskell-mode
-         hl-todo ibuffer-vc marginalia merlin minions ocp-indent
-         opam-switch-mode orderless pass pinentry posframe pyvenv
-         racket-mode rustic sdcv sideline-flycheck sideline-flymake
-         tempel-collection tuareg vertico vertico-posframe
-         visible-mark vterm winum))
+ '(package-selected-packages nil)
  '(pyim-assistant-scheme 'cangjie)
  '(safe-local-variable-values '((LEXICAL-binding . t)))
  '(scroll-bar-mode nil)