1 files changed, 8 insertions, 11 deletions

@@ -4,8 +4,6 @@
 
 ;;; Initialization -- see also ~/.emacs.d/early-init.el
 
-(setq load-prefer-newer t)
-
 (setopt custom-file (locate-user-emacs-file "custom.el"))
 (load custom-file :no-error)
 (add-hook 'Custom-mode-hook
@@ -218,14 +216,6 @@
 (keymap-set minibuffer-local-map "M-DEL" #'minibuffer-delete-directory)
 (keymap-set completion-list-mode-map "C-g" #'quit-window) ; is this a good idea?
 
-;; Corfu --- tryin this out
-
-(package-ensure 'corfu t)
-(keymap-set corfu-map "TAB" #'corfu-next)
-(keymap-set corfu-map "<tab>" #'corfu-next)
-(keymap-set corfu-map "S-TAB" #'corfu-previous)
-(keymap-set corfu-map "<backtab>" #'corfu-previous)
-(global-corfu-mode)
 
 ;;; Minibuffer
 
@@ -577,6 +567,14 @@
             (setq indent-tabs-mode
                   (if (apply #'derived-mode-p space-indent-modes) nil t))))
 
+;; Corfu
+(package-ensure 'corfu t)
+(keymap-set corfu-map "TAB" #'corfu-next)
+(keymap-set corfu-map "<tab>" #'corfu-next)
+(keymap-set corfu-map "S-TAB" #'corfu-previous)
+(keymap-set corfu-map "<backtab>" #'corfu-previous)
+(global-corfu-mode)
+
 ;; Eldoc
 (setopt eldoc-documentation-strategy #'eldoc-documentation-compose-eagerly)
 
@@ -651,7 +649,6 @@
           (^turn-off 'display-fill-column-indicator-mode))
 (add-hook 'prog-mode-hook #'auto-fill-mode)
 (add-hook 'prog-mode-hook #'electric-pair-local-mode)
-(setopt warning-suppress-types '(comp))
 (context-menu-mode)
 (delete-selection-mode)
 (global-goto-address-mode)