emacs: switch to ivy again for the time being

i just love the little-known ivy-overlay for completion, and would
miss it too much if i were to not use it anymore

diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index b8d4ccb..3ce4a3d 100644 (file)
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -914,7 +914,7 @@ around if needed."
   :custom
   (magit-diff-refine-hunk t)
   (magit-display-buffer-function #'magit-display-buffer-fullframe-status-v1)
   :custom
   (magit-diff-refine-hunk t)
   (magit-display-buffer-function #'magit-display-buffer-fullframe-status-v1)

-  (magit-completing-read-function 'magit-ido-completing-read)
+  ;; (magit-completing-read-function 'magit-ido-completing-read)

   :custom-face (magit-diff-file-heading ((t (:weight normal)))))
 
 ;; recently opened files
   :custom-face (magit-diff-file-heading ((t (:weight normal)))))
 
 ;; recently opened files


@@ -936,59 +936,61 @@ around if needed."
  ("C-c f r" . recentf-open-files)
  ("C-c x"   . execute-extended-command))
 
  ("C-c f r" . recentf-open-files)
  ("C-c x"   . execute-extended-command))
 

-(use-feature ido
-  :demand
-  :bind
-  (:map ido-common-completion-map
-        ([escape] . minibuffer-keyboard-quit)
-        ("DEL"    . b/ido-backspace))
-  :config
-  (require 'delsel)
-  (defun b/ido-backspace ()
-    "Forward to `backward-delete-char'.  On error (read-only), quit."
-    (interactive)
-    (condition-case nil
-        (backward-delete-char 1)
-      (error
-       (minibuffer-keyboard-quit))))
-  (ido-mode 1)
-  (ido-everywhere 1)
-  :custom
-  (ido-enable-flex-matching t)
-  (ido-max-window-height 10)
-  (ido-use-virtual-buffers t))
+(comment
+  (use-feature ido
+    :demand
+    :bind
+    (:map ido-common-completion-map
+          ([escape] . minibuffer-keyboard-quit)
+          ("DEL"    . b/ido-backspace))
+    :config
+    (require 'delsel)
+    (defun b/ido-backspace ()
+      "Forward to `backward-delete-char'.  On error (read-only), quit."
+      (interactive)
+      (condition-case nil
+          (backward-delete-char 1)
+        (error
+         (minibuffer-keyboard-quit))))
+    (ido-mode 1)
+    (ido-everywhere 1)
+    :custom
+    (ido-enable-flex-matching t)
+    ;; (ido-enable-regexp t)
+    ;; (ido-enable-prefix t)
+    (ido-max-window-height 10)
+    (ido-use-virtual-buffers t))
+
+  (use-package ido-vertical-mode
+    :defer 0.3
+    :config
+    (ido-vertical-mode 1)
+    :custom
+    (ido-vertical-define-keys 'C-n-C-p-up-and-down)
+    (ido-vertical-show-count t))

 
 

-(use-package ido-vertical-mode
-  :defer 0.3
-  :config
-  (ido-vertical-mode 1)
-  :custom
-  (ido-vertical-define-keys 'C-n-C-p-up-and-down)
-  (ido-vertical-show-count t))
+  (use-package ido-completing-read+
+    :defer 0.3
+    :after ido
+    :config
+    (ido-ubiquitous-mode 1))

 
 

-(use-package ido-completing-read+
-  :defer 0.3
-  :after ido
-  :config
-  (ido-ubiquitous-mode 1))
+  (use-package crm-custom
+    :defer 0.3
+    :config
+    (crm-custom-mode 1))
+
+  (use-feature icomplete
+    :defer 0.3
+    :config
+    (icomplete-mode 1)))

 
 (use-package amx
   :defer 0.3
   :config
   (amx-mode))
 
 
 (use-package amx
   :defer 0.3
   :config
   (amx-mode))
 

-(use-package crm-custom
-  :defer 0.3
-  :config
-  (crm-custom-mode 1))
-
-(use-feature icomplete
-  :defer 0.3
-  :config
-  (icomplete-mode 1))
-

 (use-package ivy
 (use-package ivy

-  :disabled

   :defer 0.3
   :bind
   (:map ivy-minibuffer-map
   :defer 0.3
   :bind
   (:map ivy-minibuffer-map


@@ -998,7 +1000,7 @@ around if needed."
    ("DEL"    . ivy-backward-delete-char))
   :config
   (setq ivy-wrap t
    ("DEL"    . ivy-backward-delete-char))
   :config
   (setq ivy-wrap t

-        ivy-height 14
+        ;; ivy-height 14

         ivy-use-virtual-buffers t
         ivy-virtual-abbreviate 'abbreviate
         ivy-count-format "%d/%d ")
         ivy-use-virtual-buffers t
         ivy-virtual-abbreviate 'abbreviate
         ivy-count-format "%d/%d ")


@@ -1023,25 +1025,21 @@ This function is intended for use with `ivy-ignore-buffers'."
 )
 
 (use-package swiper
 )
 
 (use-package swiper

-  :commands (swiper swiper-isearch)
-  :bind (;; ("C-s"   . swiper-isearch)
-         ;; ("C-r"   . swiper)
+  :demand
+  :after ivy
+  :bind (("C-s"   . swiper-isearch)
+         ("C-r"   . swiper-isearch-backward)

          ("C-S-s" . swiper-isearch)))
 
 (use-package counsel
          ("C-S-s" . swiper-isearch)))
 
 (use-package counsel

-  :commands (counsel-linux-app))
-  ;; :bind (([remap execute-extended-command] . counsel-M-x)
-  ;;        ([remap find-file]                . counsel-find-file)
-  ;;        ("C-c f ."                        . counsel-find-file)
-  ;;        ("C-c f l"                        . counsel-find-library)
-  ;;        ("C-c f r"                        . counsel-recentf)
-  ;;        ("C-c x"                          . counsel-M-x)
-  ;;        :map minibuffer-local-map
-  ;;        ("C-r" . counsel-minibuffer-history))
-  ;; :config
-  ;; (counsel-mode 1)
-  ;; (defalias 'locate #'counsel-locate)
-  ;; )
+  :bind (;; ([remap execute-extended-command] . counsel-M-x)
+         ;; ([remap find-file]                . counsel-find-file)
+         ("C-c f r" . counsel-recentf)
+         :map minibuffer-local-map
+              ("C-r" . counsel-minibuffer-history))
+  :config
+  (counsel-mode 1)
+  (defalias 'locate #'counsel-locate))

 
 (comment
   (use-package helm
 
 (comment
   (use-package helm


@@ -2485,9 +2483,10 @@ https://csclub.uwaterloo.ca/~abandali")
   :init
   (add-hook 'dired-mode-hook 'gnus-dired-mode))
 
   :init
   (add-hook 'dired-mode-hook 'gnus-dired-mode))
 

-(use-feature gnus-utils
-  :custom
-  (gnus-completing-read-function 'gnus-ido-completing-read))
+(comment
+  (use-feature gnus-utils
+    :custom
+    (gnus-completing-read-function 'gnus-ido-completing-read)))

 
 (use-feature mm-decode
   :config
 
 (use-feature mm-decode
   :config

diff --git a/.emacs.d/straight/versions/default.el b/.emacs.d/straight/versions/default.el
index c9d51cd..034dccf 100644 (file)
--- a/.emacs.d/straight/versions/default.el
+++ b/.emacs.d/straight/versions/default.el
@@ -9,7 +9,6 @@
  ("cl-lib" . "e79686c4a26959c0ecba0951a7e335ed28035386")
  ("closql" . "4a0c5610570f24df8569717ab0808d368eb20894")
  ("company-mode" . "f3e0290f5b37e5f3495d86cf084d67742e8054cc")
  ("cl-lib" . "e79686c4a26959c0ecba0951a7e335ed28035386")
  ("closql" . "4a0c5610570f24df8569717ab0808d368eb20894")
  ("company-mode" . "f3e0290f5b37e5f3495d86cf084d67742e8054cc")

- ("crm-custom" . "f1aaccf64306a5f99d9bf7ba815d7ea41c15518d")

  ("crux" . "903db7b1a2052f4959d934cae26ec40a3f323ed4")
  ("dash.el" . "13e5366898df483a2bbd95a06c35e15b463ee2d1")
  ("debbugs" . "4d9c772236193ab716b622956c6ae73fceb1a8d9")
  ("crux" . "903db7b1a2052f4959d934cae26ec40a3f323ed4")
  ("dash.el" . "13e5366898df483a2bbd95a06c35e15b463ee2d1")
  ("debbugs" . "4d9c772236193ab716b622956c6ae73fceb1a8d9")


@@ -22,7 +21,6 @@
  ("emacs-async" . "35ab78afb9ec4929552f43c6bab09bbd7da3842a")
  ("emacs-doom-themes" . "45b583d949bee311b15d177bc27c7cfe4665b673")
  ("emacs-htmlize" . "7b63aa058c3dd0d9f8c07706cd8bb4e56aaa1fb3")
  ("emacs-async" . "35ab78afb9ec4929552f43c6bab09bbd7da3842a")
  ("emacs-doom-themes" . "45b583d949bee311b15d177bc27c7cfe4665b673")
  ("emacs-htmlize" . "7b63aa058c3dd0d9f8c07706cd8bb4e56aaa1fb3")

- ("emacs-memoize" . "b3129775a6d5c0d9cdacf5aede9683f5962c464e")

  ("emacs-which-key" . "42a25055163141165aa0269dbca69735e704825c")
  ("emacsmirror-mirror" . "eac41b41e76db637f14c1d18bdd36b1a58c32388")
  ("emacsql" . "a118b6c95af1306f0288a383d274b5dd93efbbda")
  ("emacs-which-key" . "42a25055163141165aa0269dbca69735e704825c")
  ("emacsmirror-mirror" . "eac41b41e76db637f14c1d18bdd36b1a58c32388")
  ("emacsql" . "a118b6c95af1306f0288a383d274b5dd93efbbda")


@@ -50,8 +48,6 @@
  ("helpful" . "e2609e4ae9e058bd8be6239681b2f22195628f28")
  ("hl-todo" . "6c79749236c8da28183092607f824727464079fd")
  ("hydra" . "49bef08465c1ef1d36ef1a3785404eae2e132b74")
  ("helpful" . "e2609e4ae9e058bd8be6239681b2f22195628f28")
  ("hl-todo" . "6c79749236c8da28183092607f824727464079fd")
  ("hydra" . "49bef08465c1ef1d36ef1a3785404eae2e132b74")

- ("ido-completing-read-plus" . "74861eabd0a2619be9efc4c91fe0c5e69db5f263")
- ("ido-vertical-mode.el" . "16c4c1a112796ee0bcf401ea39d3e2643a89feaf")

  ("key-chord" . "72443e9ff3c4f1c3ccaced3130236801efde3d83")
  ("lean-mode" . "b5ba739f68ef731c03247bf6db2708502c8ac46c")
  ("let-alist" . "57561d7d9267da48e8b7ab1f3bd45c9d05951289")
  ("key-chord" . "72443e9ff3c4f1c3ccaced3130236801efde3d83")
  ("lean-mode" . "b5ba739f68ef731c03247bf6db2708502c8ac46c")
  ("let-alist" . "57561d7d9267da48e8b7ab1f3bd45c9d05951289")


@@ -86,7 +82,7 @@
  ("shrink-path.el" . "c14882c8599aec79a6e8ef2d06454254bb3e1e41")
  ("smart-mode-line" . "999be065b195f2eddb4e1b629f99038d832d44b7")
  ("soap-client" . "9e77b71a551f68d7e02290cb81ff0ddd328c20c0")
  ("shrink-path.el" . "c14882c8599aec79a6e8ef2d06454254bb3e1e41")
  ("smart-mode-line" . "999be065b195f2eddb4e1b629f99038d832d44b7")
  ("soap-client" . "9e77b71a551f68d7e02290cb81ff0ddd328c20c0")

- ("straight.el" . "4f954b93f2b951bd7d66e3b8748da987d2877886")
+ ("straight.el" . "e1892d06190c0ec1e9b3cdc73996f8ac5bc5e278")

  ("swiper" . "5e393b0b3d47051c024e6d705516b17aacc5010d")
  ("switch-buffer-functions-el" . "b8d8e01e21ae8c8c84234dddeb3cc8250814f7ba")
  ("tablist" . "8079801527da1f596bc942162026328d7bdf6ad9")
  ("swiper" . "5e393b0b3d47051c024e6d705516b17aacc5010d")
  ("switch-buffer-functions-el" . "b8d8e01e21ae8c8c84234dddeb3cc8250814f7ba")
  ("tablist" . "8079801527da1f596bc942162026328d7bdf6ad9")