1 files changed, 21 insertions, 44 deletions
diff --git a/.emacs.d/modules/thanos-aesthetics.el b/.emacs.d/modules/thanos-aesthetics.el
index a5db351..4144d0e 100644
--- a/.emacs.d/modules/thanos-aesthetics.el
+++ b/.emacs.d/modules/thanos-aesthetics.el
@@ -40,7 +40,6 @@
   (scroll-bar-mode -1)
   (set-fringe-mode 10))
 
-(beacon-mode 1)
 (tool-bar-mode -1)
 (tooltip-mode -1)
 (menu-bar-mode -1)
@@ -90,53 +89,31 @@
     (display-battery-mode 0)
   (display-battery-mode 1))
 
-(require 'ivy)
-
-(ivy-mode 1)
-(setf ivy-use-virtual-buffers t)
-(setf enable-recursive-minibuffers t)
-(global-set-key (kbd "C-s") 'swiper)
-(define-key ivy-minibuffer-map (kbd "TAB") 'ivy-alt-done)
-(global-set-key "\C-s" 'swiper)
-(global-set-key (kbd "C-c C-r") 'ivy-resume)
-(global-set-key (kbd "<f6>") 'ivy-resume)
-(global-set-key (kbd "M-x") 'counsel-M-x)
-(global-set-key (kbd "C-x C-f") 'counsel-find-file)
-(global-set-key (kbd "<f1> f") 'counsel-describe-function)
-(global-set-key (kbd "<f1> v") 'counsel-describe-variable)
-(global-set-key (kbd "<f1> o") 'counsel-describe-symbol)
-(global-set-key (kbd "<f1> l") 'counsel-find-library)
-(global-set-key (kbd "<f2> i") 'counsel-info-lookup-symbol)
-(global-set-key (kbd "<f2> u") 'counsel-unicode-char)
-(global-set-key (kbd "C-c g") 'counsel-git)
-(global-set-key (kbd "C-c j") 'counsel-git-grep)
-(global-set-key (kbd "C-c k") 'counsel-ag)
-(global-set-key (kbd "C-x l") 'counsel-locate)
-(global-set-key (kbd "C-S-o") 'counsel-rhythmbox)
-(define-key minibuffer-local-map (kbd "C-r") 'counsel-minibuffer-history)
-
-(ivy-rich-mode 1)
-(nerd-icons-ivy-rich-mode 1)
-
-(setf ivy-use-selectable-prompt t)
-
-(global-set-key (kbd "C-c m") 'consult-imenu)
-(define-key thanos/applications-map (kbd "t") 'counsel-load-theme)
+;; UI -- Vertico, consult, marginalia
+(vertico-mode)
+(define-key global-map (kbd "C-x C-f") 'find-file)
+(define-key global-map (kbd "C-s") 'consult-line)
+(define-key global-map (kbd "C-x b") 'consult-buffer)
+(define-key global-map (kbd "C-c m") 'consult-imenu)
 
-(require 'helpful)
-(global-set-key (kbd "C-h f") #'helpful-callable)
-(global-set-key (kbd "C-h v") #'helpful-variable)
-(global-set-key (kbd "C-h k") #'helpful-key)
-(global-set-key (kbd "C-h x") #'helpful-command)
+(setf register-preview-delay 0.5
+      register-preview-function #'consult-register-format)
+
+(setf xref-show-xrefs-function #'consult-xref
+      xref-show-definitions-function #'consult-xref)
 
-(global-set-key (kbd "C-c C-d") #'helpful-at-point)
-(global-set-key (kbd "C-h F") #'helpful-function)
+(require 'marginalia)
+(marginalia-mode)
 
-(setf counsel-describe-function-function #'helpful-callable)
-(setf counsel-describe-variable-function #'helpful-variable)
+;; Helpful
+(require 'helpful)
+(define-key global-map (kbd "C-h f") #'helpful-callable)
+(define-key global-map (kbd "C-h v") #'helpful-variable)
+(define-key global-map (kbd "C-h k") #'helpful-key)
+(define-key global-map (kbd "C-h x") #'helpful-command)
 
-(global-set-key (kbd "C-x r d") 'bookmark-delete)
-(global-set-key (kbd "C-x r C-r") 'bookmark-rename)
+(define-key global-map (kbd "C-c C-d") #'helpful-at-point)
+(define-key global-map (kbd "C-h F") #'helpful-function)
 
 ;; ibuffer
 (global-set-key (kbd "C-x C-b") 'ibuffer)