diff --git a/emacs/config.el b/emacs/config.el index fee7010..3437d47 100644 --- a/emacs/config.el +++ b/emacs/config.el @@ -39,148 +39,27 @@ (org-capture-mode . nano-modeline-org-capture-mode) (org-agenda-mode . nano-modeline-org-agenda-mode))) -(use-package vertico +(use-package helm :ensure t - :init - (vertico-mode) - :custom - (vertico-scroll-margin 0) - (vertico-count 8) - (vertico-resize nil) - (vertico-cycle t)) - -(use-package orderless - :ensure t - :custom - (completion-styles '(orderless basic)) - (completion-category-defaults nil) - (completion-category-overrides '((file (styles partial-completion))))) - -(use-package corfu - :ensure t - :custom - (corfu-cycle t) - (corfu-auto t) - (corfu-scroll-margin 4) - :hook (prog-mode . corfu-mode) - :init - (global-corfu-mode)) - -(use-package consult - :ensure t - :bind (("C-c M-x" . consult-mode-command) - ("C-c h" . consult-history) - ("C-c k" . consult-kmacro) - ("C-c m" . consult-man) - ("C-c i" . consult-info) - ("C-x M-:" . consult-complex-command) - ("C-x b" . consult-buffer) - ("C-x 4 b" . consult-buffer-other-window) - ("C-x 5 b" . consult-buffer-other-frame) - ("C-x t b" . consult-buffer-other-tab) - ("C-x r b" . consult-bookmark) - ("C-x p b" . consult-project-buffer) - ("M-#" . consult-register-load) - ("M-'" . consult-register-store) - ("C-M-#" . consult-register) - ("M-y" . consult-yank-pop) - ("M-g e" . consult-compile-error) - ("M-g f" . consult-flymake) - ("M-g g" . consult-goto-line) - ("M-g M-g" . consult-goto-line) - ("M-g o" . consult-outline) - ("M-g m" . consult-mark) - ("M-g k" . consult-global-mark) - ("M-g i" . consult-imenu) - ("M-g I" . consult-imenu-multi) - ("M-s d" . consult-find) - ("M-s c" . consult-locate) - ("M-s g" . consult-grep) - ("M-s G" . consult-git-grep) - ("M-s r" . consult-ripgrep) - ("M-s l" . consult-line) - ("M-s L" . consult-line-multi) - ("M-s k" . consult-keep-lines) - ("M-s u" . consult-focus-lines) - ("M-s e" . consult-isearch-history) - :map isearch-mode-map - ("M-e" . consult-isearch-history) - ("M-s e" . consult-isearch-history) - ("M-s l" . consult-line) - ("M-s L" . consult-line-multi) - :map minibuffer-local-map - ("M-s" . consult-history) - ("M-r" . consult-history)) - :hook (completion-list-mode . consult-preview-at-point-mode) - :init - (setq register-preview-delay 0.5 - register-preview-function #'consult-register-format) - (advice-add #'register-preview :override #'consult-register-window) - (setq xref-show-xrefs-function #'consult-xref - xref-show-definitions-function #'consult-xref) + :bind (("C-x C-f" . helm-find-files) + ("M-x" . helm-M-x) + ("M-s o" . helm-occur) + ("C-h a" . helm-apropos)) :config - (consult-customize - consult-theme :preview-key '(:debounce 0.2 any) - consult-ripgrep consult-git-grep consult-grep - consult-bookmark consult-recent-file consult-xref - consult--source-bookmark consult--source-file-register - consult--source-recent-file consult--source-project-recent-file - :preview-key '(:debounce 0.4 any)) - :custom - (consult-narrow-key "C-+")) - -(use-package marginalia - :ensure t - :bind (:map minibuffer-local-map - ("M-A" . marginalia-cycle)) - :init - (marginalia-mode)) + (helm-mode 1)) (use-package savehist :init (savehist-mode)) -(use-package embark - :ensure t - :bind - (("C-." . embark-act) - ("C-;" . embark-dwim) - ("C-h B" . embark-bindings)) - :init - (setq prefix-help-command #'embark-prefix-help-command) - (add-hook 'eldoc-documentation-functions #'embark-eldoc-first-target) - (setq eldoc-documentation-strategy #'eldoc-documentation-compose-eagerly) - :config - (add-to-list 'display-buffer-alist - '("\\`\\*Embark Collect \\(Live\\|Completions\\)\\*" - nil - (window-parameters (mode-line-format . none)))) - :custom - (embark-indicators - '(embark-minimal-indicator - embark-highlight-indicator - embark-isearch-highlight-indicator))) - (use-package which-key :ensure t :init (which-key-mode)) -(use-package embark-consult - :ensure t - :hook - (embark-collect-mode . consult-preview-at-point-mode)) - -(use-package consult-dir - :ensure t - :bind (("C-x C-d" . consult-dir) - :map minibuffer-local-completion-map - ("C-x C-d" . consult-dir) - ("C-x C-j" . consult-dir-jump-file))) - (use-package base16-theme :ensure t :config - (load-theme 'base16-rose-pine t)) + (load-theme 'base16-oxocarbon-dark t)) (use-package nix-mode :ensure t diff --git a/emacs/mkEmacs.nix b/emacs/mkEmacs.nix index 664c2d1..57308c0 100644 --- a/emacs/mkEmacs.nix +++ b/emacs/mkEmacs.nix @@ -31,14 +31,8 @@ in inherit (epkgs) spacious-padding nano-modeline - orderless - corfu which-key - marginalia - vertico - consult - embark - embark-consult + helm base16-theme nix-mode rust-mode