emacs: ivy is no more

5 files changed, 10 insertions, 43 deletions

diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index 743df0a..5d5c0c4 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -172,7 +172,6 @@
 (load-file "~/.emacs.d/rul-init.d/hydra.el")
 (load-file "~/.emacs.d/rul-init.d/ibuffer.el")
 (load-file "~/.emacs.d/rul-init.d/imenu.el")
-;(load-file "~/.emacs.d/rul-init.d/ivy.el")
 (load-file "~/.emacs.d/rul-init.d/latex.el")
 (load-file "~/.emacs.d/rul-init.d/logos.el")
 (load-file "~/.emacs.d/rul-init.d/mail-mode.el")
diff --git a/.emacs.d/rul-init.d/ivy.el b/.emacs.d/rul-init.d/ivy.el
deleted file mode 100644
index fcf69ca..0000000
--- a/.emacs.d/rul-init.d/ivy.el
+++ /dev/null
@@ -1,38 +0,0 @@
-(use-package ivy
-  :diminish (ivy-mode . "")
-  :init (ivy-mode 1) ; globally at startup
-
-  :bind (:map ivy-minibuffer-map
-              ("TAB" . ivy-alt-done))
-  :config
-  (setq ivy-use-virtual-buffers t)
-  (setq ivy-height 20)
-  (setq ivy-count-format "%d/%d ")
-  (setq ivy-re-builders-alist
-        '((swiper . ivy--regex-plus)
-          (t      . ivy--regex-fuzzy)))
-)
-
-;; Override the basic Emacs commands
-(use-package counsel
-  :bind* ; load when pressed
-  (("M-x"     . counsel-M-x)
-   ("C-s"     . swiper)
-   ("C-x C-f" . counsel-find-file)
-   ("C-x C-r" . counsel-recentf)  ; search for recently edited
-   ("C-c g"   . counsel-git)      ; search for files in git repo
-   ("C-c /"   . counsel-ag)       ; Use ag for regexp
-   ("C-x l"   . counsel-locate)
-   ("C-x C-f" . counsel-find-file)
-   ("<f1> f"  . counsel-describe-function)
-   ("<f1> v"  . counsel-describe-variable)
-   ("<f1> l"  . counsel-find-library)
-   ("<f2> i"  . counsel-info-lookup-symbol)
-   ("<f2> u"  . counsel-unicode-char)
-   ("C-c C-r" . ivy-resume)))     ; Resume last Ivy-based completion
-
-(use-package ivy-hydra
-  :defer t
-  :after hydra)
-
-(provide 'init-ivy)
diff --git a/.emacs.d/rul-init.d/projectile.el b/.emacs.d/rul-init.d/projectile.el
index ed95775..a3c5dd5 100644
--- a/.emacs.d/rul-init.d/projectile.el
+++ b/.emacs.d/rul-init.d/projectile.el
@@ -4,5 +4,5 @@
   :hook
   (after-init . projectile-global-mode)
   :config
-  (setq projectile-completion-system 'ivy)
+  (setq projectile-completion-system 'auto)
 )
diff --git a/.emacs.d/rul-init.d/staging.el b/.emacs.d/rul-init.d/staging.el
index 01fd079..06433cf 100644
--- a/.emacs.d/rul-init.d/staging.el
+++ b/.emacs.d/rul-init.d/staging.el
@@ -118,6 +118,3 @@
   ;; (setq consult-project-function nil)
 )
 
-(setq completion-styles '(flex basic)
-      completion-category-defaults nil
-      completion-category-overrides nil)
diff --git a/.emacs.d/rul-lisp/packages/rul-completion.el b/.emacs.d/rul-lisp/packages/rul-completion.el
index d1bb8a6..190632e 100644
--- a/.emacs.d/rul-lisp/packages/rul-completion.el
+++ b/.emacs.d/rul-lisp/packages/rul-completion.el
@@ -35,4 +35,13 @@
   ;; package.
   (marginalia-mode))
 
+(setq completion-styles '(basic partial-completion))
+(setq completion-category-overrides
+      '(
+        (file (styles . (basic partial-completion orderless)))
+        (project-file (styles . (flex basic substring partial-completion orderless)))
+        ))
+
+(setq completion-ignore-case t)
+
 (provide 'rul-completion)