From b3b03e46ea9626ad12a74d6ea7f90ceca1bf1d4f Mon Sep 17 00:00:00 2001 From: mattkae Date: Thu, 22 Jun 2023 12:34:12 -0400 Subject: Using vertico isntead of helm now; created a way to archive all tasks in an org buffer; created better capture templates --- lisp/general.el | 57 ++++++++++++++++++++++++++++++--------------------------- 1 file changed, 30 insertions(+), 27 deletions(-) (limited to 'lisp/general.el') diff --git a/lisp/general.el b/lisp/general.el index e2acec0..79a85b3 100644 --- a/lisp/general.el +++ b/lisp/general.el @@ -83,7 +83,6 @@ ;; Initialization screen (setq fancy-splash-image "~/.emacs.d/images/true.png") - ;; Highlight todos (use-package hl-todo :ensure t @@ -94,19 +93,36 @@ ;; Delete highlighted selection (delete-selection-mode 1) -;; I am using the helm package, of course -(use-package helm +(use-package vertico :ensure t - :config - (helm-mode 1) - (setq helm-mode-fuzzy-match t) + :init + (vertico-mode) + + ;; Different scroll margin + ;; (setq vertico-scroll-margin 0) + + ;; Show more candidates + ;; (setq vertico-count 20) + + ;; Grow and shrink the Vertico minibuffer + ;; (setq vertico-resize t) + + ;; Optionally enable cycling for `vertico-next' and `vertico-previous'. + ;; (setq vertico-cycle t) ) -(use-package helm-posframe - :ensure t - :config - (helm-posframe-enable) - (setq helm-posframe-poshandler 'posframe-poshandler-frame-top-center)) +(use-package orderless + :ensure t + :init + ;; Configure a custom style dispatcher (see the Consult wiki) + ;; (setq orderless-style-dispatchers '(+orderless-consult-dispatch orderless-affix-dispatch) + ;; orderless-component-separator #'orderless-escapable-split-on-space) + (setq completion-styles '(orderless basic) + completion-category-defaults nil + completion-category-overrides '((file (styles partial-completion))))) + +(use-package rg + :ensure t) ;; Projectile for project navigation (use-package projectile @@ -123,18 +139,10 @@ (add-to-list 'projectile-globally-ignored-directories "dist") (add-to-list 'projectile-project-root-files "package.json") (add-to-list 'projectile-globally-ignored-files "package-lock.json") - ) - -(use-package helm-projectile - :ensure t - :bind - :config - (setq projectile-completion-system 'helm) - (helm-projectile-on) (define-key projectile-mode-map (kbd "s-F") 'projectile-ripgrep) - (define-key projectile-mode-map [?\s-o] 'helm-projectile-switch-project) - (define-key projectile-mode-map [?\s-p] 'helm-projectile-find-file) - :after (projectile helm) + (define-key projectile-mode-map [?\s-o] 'projectile-switch-project) + (define-key projectile-mode-map [?\s-p] 'projectile-find-file) + ) ;; Don't ask to kill when we have an open line number @@ -191,13 +199,8 @@ :if (display-graphic-p)) ;; Global key binds - -(bind-key* (kbd "C-x C-f") 'helm-find-files) -;(bind-key* (kbd "C-s") 'helm-do-grep-ag) -(bind-key* (kbd "M-x") 'helm-M-x) (bind-key* (kbd "M-.") 'xref-find-definitions) (bind-key* (kbd "C-x k") 'kill-this-buffer) -(bind-key* (kbd "C-x b") 'electric-buffer-list) (bind-key* (kbd "C-;") 'treemacs) (defun my-create-file (filename) -- cgit v1.2.1