diff --git a/.emacs.d/include/misc.el b/.emacs.d/include/misc.el index 6ef06ea..bd36107 100644 --- a/.emacs.d/include/misc.el +++ b/.emacs.d/include/misc.el @@ -239,13 +239,6 @@ (add-hook 'neotree-mode-hook (lambda () (text-scale-set -0.5))) ;(add-hook 'neotree-mode-hook (lambda () (buffer-face-set :background "#ffffff"))) -;; Orderless -(setq completion-styles '(orderless basic)) -(setq completion-category-overrides '((file (styles basic partial-completion)))) - -;; embark -(keymap-global-set "C-." #'embark-act) - ;; hledger (setq hledger-currency-string "$") (add-to-list 'auto-mode-alist '("\\.journal\\'" . hledger-mode)) diff --git a/.emacs.d/init.el b/.emacs.d/init.el index e9bc647..e056052 100644 --- a/.emacs.d/init.el +++ b/.emacs.d/init.el @@ -19,19 +19,19 @@ (load bootstrap-file nil 'nomessage)) ;; Elisp -(use-package s :straight t) -(use-package f :straight t) +(use-package s :straight t) +(use-package f :straight t) (use-package dash :straight t) ;; Completion -(use-package company :straight t +(use-package corfu :straight t :custom - (completion-styles '(basic orderless)) - :bind - ("M-SPC" . #'company-complete) + (completion-styles '(orderless basic)) + (completion-category-overrides '((file (styles partial-completion)))) + (corfu-auto t) :init - (add-hook 'after-init-hook 'global-company-mode)) + (global-corfu-mode)) (use-package company-box :straight t :after (company) :hook (company-mode . company-box-mode)) @@ -75,7 +75,9 @@ ("C-x b" . bufler-switch-buffer)) :init (bufler-mode 1)) -(use-package embark :straight t) +(use-package embark :straight t + :bind + (("C-." . embark-act))) (use-package embark-consult :straight t) (use-package wgrep :straight t) (use-package perspective :straight t