use consult for searching

lisp/completion.el

@@ -103,13 +103,14 @@ If prefix ARG is set, include ignored/hidden files."
 
 (use-package consult
   :defer t
+  :after (projectile vertico)
   :preface
-  (define-key!
+  (general-def
     [remap apropos]                       #'consult-apropos
     [remap bookmark-jump]                 #'consult-bookmark
     [remap evil-show-marks]               #'consult-mark
     [remap evil-show-registers]           #'consult-register
-    [remap evil-show-jumps]               #'consult-xref
+    ;; [remap evil-show-jumps]               #'consult-xref
     [remap goto-line]                     #'consult-goto-line
     [remap imenu]                         #'consult-imenu
     [remap locate]                        #'consult-locate
@@ -119,6 +120,7 @@ If prefix ARG is set, include ignored/hidden files."
     [remap switch-to-buffer]              #'consult-buffer
     [remap switch-to-buffer-other-window] #'consult-buffer-other-window
     [remap switch-to-buffer-other-frame]  #'consult-buffer-other-frame
+    [remap projectile-switch-to-buffer]   #'consult-project-buffer
     [remap yank-pop]                      #'consult-yank-pop)
   (advice-add #'multi-occur :override #'consult-multi-occur)
   :config

lisp/editor.el

@@ -290,9 +290,7 @@
 ;;; General - for keybindings
 (use-package general
   :ensure t
-  :init
-  (defalias 'define-key! #'general-def)
-  (defalias 'undefine-key! #'general-unbind))
+  :init)
 
 (use-package restart-emacs
   :ensure t)

lisp/keybinds.el

@@ -115,15 +115,9 @@
   "pb" 'projectile-switch-to-buffer
   "pp" 'projectile-switch-project
   ;; Searching
-  "si" 'imenu
+  "si" #'imenu
   "sp" #'consult-ripgrep
-  "sP" 'keybinds/counsel-search-project-at-point
-  "sd" 'keybinds/counsel-search-dir
-  "sD" 'keybinds/counsel-search-dir-at-point
-  "ss" 'swiper
-  "sS" 'swiper-thing-at-point
-  "sb" 'swiper-all
-  "sB" 'swiper-all-thing-at-point
+  "ss" #'consult-line
   ;; Flycheck
   "en" 'flycheck-next-error
   "ep" 'flycheck-previous-error
@@ -133,7 +127,7 @@
   "es" 'flycheck-select-checker
   "ex" 'flycheck-explain-error-at-point
   ;; Magit
-  "gs" 'magit-status
+  "gg" 'magit-status
   "gd" 'magit-diff-range
   ;; Aweshell
   "'" 'aweshell-dedicated-toggle
@@ -141,7 +135,7 @@
   ;; Notes
   "nrf" 'org-roam-node-find
   ;; Operations
-  "oy" 'youdao-dictionary-search-at-point+);; global keybindings
+  "oy" 'youdao-dictionary-search-at-point+)
 
 (keybinds/set-leader-key* nil lsp-mode-map
   ;; format