diff options
| -rw-r--r-- | users/tazjin/emacs/config/bindings.el | 3 | ||||
| -rw-r--r-- | users/tazjin/emacs/config/desktop.el | 3 | ||||
| -rw-r--r-- | users/tazjin/emacs/config/functions.el | 8 | ||||
| -rw-r--r-- | users/tazjin/emacs/config/init.el | 32 | ||||
| -rw-r--r-- | users/tazjin/emacs/config/mail-setup.el | 2 | ||||
| -rw-r--r-- | users/tazjin/emacs/default.nix | 7 |
6 files changed, 14 insertions, 41 deletions
diff --git a/users/tazjin/emacs/config/bindings.el b/users/tazjin/emacs/config/bindings.el index 100fb92223d3..17740b1950a7 100644 --- a/users/tazjin/emacs/config/bindings.el +++ b/users/tazjin/emacs/config/bindings.el @@ -36,9 +36,6 @@ ;; Open a file in project: (global-set-key (kbd "C-c f") 'project-find-file) -;; Search in a project -(global-set-key (kbd "C-c r g") 'rg-in-project) - ;; Open a file via magit: (global-set-key (kbd "C-c C-f") #'magit-find-file-worktree) diff --git a/users/tazjin/emacs/config/desktop.el b/users/tazjin/emacs/config/desktop.el index dc009a507405..810521db185a 100644 --- a/users/tazjin/emacs/config/desktop.el +++ b/users/tazjin/emacs/config/desktop.el @@ -220,7 +220,7 @@ in-progress." (exwm-input-set-key (kbd "C-c j") #'exwm-jump-to-buffer) ;; Launch applications / any command with completion (dmenu style!) -(exwm-input-set-key (kbd "s-d") #'counsel-linux-app) +;; (exwm-input-set-key (kbd "s-d") #'counsel-linux-app) ;; TODO(tazjin): completing-read version (exwm-input-set-key (kbd "s-x") #'run-external-command) (exwm-input-set-key (kbd "s-p") #'password-store-lookup) @@ -376,7 +376,6 @@ in-progress." ;; Notmuch shortcuts as EXWM globals ;; (g m => gmail) (exwm-input-set-key (kbd "s-g m") #'notmuch) -(exwm-input-set-key (kbd "s-g M") #'counsel-notmuch) (exwm-randr-enable) diff --git a/users/tazjin/emacs/config/functions.el b/users/tazjin/emacs/config/functions.el index ddb67f1bfd29..02ccab87d1c8 100644 --- a/users/tazjin/emacs/config/functions.el +++ b/users/tazjin/emacs/config/functions.el @@ -281,14 +281,6 @@ by looking for a `Cargo.toml' file." (magit-read-file-from-rev "HEAD" "Find file") #'pop-to-buffer-same-window)) -(defun rg-in-project (&optional prefix) - "Interactively call ripgrep in the current project, or fall - back to ripgrep default behaviour if prefix is set." - (interactive "P") - (counsel-rg nil (unless prefix - (if-let ((pr (project-current))) - (project-root pr))))) - (defun zoxide-open-project () "Query Zoxide for paths, and open the result as appropriate (magit or dired)." (interactive) diff --git a/users/tazjin/emacs/config/init.el b/users/tazjin/emacs/config/init.el index b16635df86af..7333a0b5df35 100644 --- a/users/tazjin/emacs/config/init.el +++ b/users/tazjin/emacs/config/init.el @@ -33,9 +33,10 @@ :hook ((prog-mode . company-mode)) :config (setq company-tooltip-align-annotations t)) -(use-package counsel - :after (ivy) - :config (counsel-mode 1)) +(use-package consult + :bind + ("C-c r g" . consult-ripgrep) + ("C-s" . consult-line)) (use-package dash) (use-package gruber-darker-theme) @@ -50,18 +51,6 @@ (use-package hydra) (use-package idle-highlight-mode :hook ((prog-mode . idle-highlight-mode))) -(use-package ivy - :config - (ivy-mode 1)) - -(use-package ivy-prescient - :after (ivy prescient) - :config - (ivy-prescient-mode) - ;; Fixes an issue with how regexes are passed to ripgrep from counsel, - ;; see raxod502/prescient.el#43 - (setf (alist-get 'counsel-rg ivy-re-builders-alist) #'ivy--regex-plus)) - (use-package multiple-cursors) (use-package notmuch @@ -79,18 +68,15 @@ (pinentry-start)) (use-package prescient - :after (ivy counsel) - :config (prescient-persist-mode)) + :config + (prescient-persist-mode) + (setq completion-styles '(basic prescient))) (use-package rainbow-delimiters :hook (prog-mode . rainbow-delimiters-mode)) (use-package rainbow-mode) (use-package s) (use-package string-edit-at-point) -(use-package swiper - :after (counsel ivy) - :bind (("C-s" . swiper))) - (use-package telephone-line) ;; configuration happens outside of use-package (use-package term-switcher) @@ -205,6 +191,10 @@ (use-package tvl) +(use-package vertico + :config + (vertico-mode)) + (use-package web-mode) (use-package yaml-mode) (use-package zoxide) diff --git a/users/tazjin/emacs/config/mail-setup.el b/users/tazjin/emacs/config/mail-setup.el index 7fbece1b102a..1d7ab6d0b018 100644 --- a/users/tazjin/emacs/config/mail-setup.el +++ b/users/tazjin/emacs/config/mail-setup.el @@ -1,8 +1,6 @@ (require 'notmuch) -(require 'counsel-notmuch) ;; (global-set-key (kbd "C-c m") 'notmuch-hello) -;; (global-set-key (kbd "C-c C-m") 'counsel-notmuch) ;; (global-set-key (kbd "C-c C-e n") 'notmuch-mua-new-mail) (setq notmuch-cache-dir (format "%s/.cache/notmuch" (getenv "HOME"))) diff --git a/users/tazjin/emacs/default.nix b/users/tazjin/emacs/default.nix index 4744226fc72d..5b6257478485 100644 --- a/users/tazjin/emacs/default.nix +++ b/users/tazjin/emacs/default.nix @@ -29,8 +29,7 @@ pkgs.makeOverridable clojure-mode cmake-mode company - counsel - counsel-notmuch + consult d-mode deft direnv @@ -48,8 +47,6 @@ pkgs.makeOverridable ht hydra idle-highlight-mode - ivy - ivy-prescient jq-mode kotlin-mode kubernetes @@ -76,7 +73,6 @@ pkgs.makeOverridable rust-mode sly string-edit-at-point - swiper telephone-line terraform-mode toml-mode @@ -84,6 +80,7 @@ pkgs.makeOverridable undo-tree use-package uuidgen + vertico vterm web-mode websocket |