Remove ivy, related packages, and my configs for it

diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index 26259eb..f290909 100644 (file)
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -145,9 +145,6 @@ This sets each user option VAR's value to the corresponding VALUE.
        ("org" . "https://orgmode.org/elpa/"))
      package-load-list
      '(;; GNU ELPA
-       (ivy "0.13.1")
-       (counsel "0.13.1")
-       (swiper "0.13.1")
        (debbugs "0.26")
        (delight "1.7")
        (ebdb "0.6.19")
@@ -581,15 +578,7 @@ Make N (default: 1) copies of the current line or region."
   ;; (add-to-list 'recentf-keep #'file-remote-p)
   (recentf-mode))
 
-;; needed for history for counsel
-(csetq amx-save-file (b/var "amx-save.el"))
-(add-to-list 'load-path (b/lisp "s"))
-(add-to-list 'load-path (b/lisp "amx"))
-(run-with-idle-timer 0.3 nil #'require 'amx)
-(with-eval-after-load 'amx
-  (amx-mode))
-
-(require 'bandali-ivy)
+(fido-mode 1)
 
 (require 'bandali-eshell)
 
@@ -1009,8 +998,6 @@ Make N (default: 1) copies of the current line or region."
   (delight 'auto-fill-function " f" "simple")
   (delight 'abbrev-mode "" "abbrev")
   (delight 'page-break-lines-mode "" "page-break-lines")
-  (delight 'ivy-mode "" "ivy")
-  (delight 'counsel-mode "" "counsel")
   (delight 'mml-mode " mml" "mml")
   (delight 'yas-minor-mode "" "yasnippet"))
 

diff --git a/.emacs.d/lisp/amx b/.emacs.d/lisp/amx
deleted file mode 160000 (submodule)
index ccfc92c..0000000
--- a/.emacs.d/lisp/amx
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit ccfc92c600df681df5e8b5fecec328c462ceb71e

diff --git a/.emacs.d/lisp/bandali-ivy.el b/.emacs.d/lisp/bandali-ivy.el
deleted file mode 100644 (file)
index 4d67838..0000000
--- a/.emacs.d/lisp/bandali-ivy.el
+++ /dev/null
@@ -1,75 +0,0 @@
-;;; bandali-ivy.el --- bandali's Ivy setup           -*- lexical-binding: t; -*-
-
-;; Copyright (C) 2018-2020  Amin Bandali
-
-;; Author: Amin Bandali <bandali@gnu.org>
-;; Keywords: matching
-
-;; This program is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-;;; Commentary:
-
-;; My configuration for Ivy and family.
-
-;;; Code:
-
-(run-with-idle-timer 0.3 nil #'require 'ivy)
-(with-eval-after-load 'ivy
-  ;; ivy
-  (csetq ivy-wrap t
-         ;; ivy-height 14
-         ivy-use-virtual-buffers t
-         ivy-virtual-abbreviate 'abbreviate
-         ivy-count-format "%d/%d ")
-
-  (defvar b/ivy-ignore-buffer-modes
-    '(;; dired-mode
-      ;; magit-mode
-      erc-mode))
-  (defun b/ivy-ignore-buffer-p (str)
-    "Return non-nil if str names a buffer with a major mode
-derived from one of `b/ivy-ignore-buffer-modes'.
-
-This function is intended for use with `ivy-ignore-buffers'."
-    (let* ((buf (get-buffer str))
-           (mode (and buf (buffer-local-value 'major-mode buf))))
-      (and mode
-           (apply #'provided-mode-derived-p mode b/ivy-ignore-buffer-modes))))
-  (add-to-list 'ivy-ignore-buffers #'b/ivy-ignore-buffer-p)
-
-  (define-key ivy-minibuffer-map [escape] #'keyboard-escape-quit)
-  (define-key ivy-minibuffer-map [S-up]
-    #'ivy-previous-history-element)
-  (define-key ivy-minibuffer-map [S-down]
-    #'ivy-next-history-element)
-  (define-key ivy-minibuffer-map (kbd "DEL")
-    #'ivy-backward-delete-char)
-
-  (ido-mode -1)
-  (ivy-mode 1)
-
-  ;; swiper
-  (require 'swiper)
-  (global-set-key (kbd "C-S-s") #'swiper-isearch)
-
-  ;; counsel
-  (require 'counsel)
-  (counsel-mode 1)
-  (defalias 'locate #'counsel-locate)
-  (global-set-key (kbd "C-c f r") #'counsel-recentf)
-  (define-key minibuffer-local-map
-    (kbd "C-r") #'counsel-minibuffer-history))
-
-(provide 'bandali-ivy)
-;;; bandali-ivy.el ends here

diff --git a/.emacs.d/lisp/exwm-edit b/.emacs.d/lisp/exwm-edit
index 2fd9426..0368127 160000 (submodule)
--- a/.emacs.d/lisp/exwm-edit
+++ b/.emacs.d/lisp/exwm-edit
@@ -1 +1 @@
-Subproject commit 2fd9426922c8394ec8d21c50dcc20b7d03af21e4
+Subproject commit 0368127976bda29d35eed788edfe74644ecd3845

diff --git a/.emacs.d/lisp/s b/.emacs.d/lisp/s
deleted file mode 160000 (submodule)
index 43ba8b5..0000000
--- a/.emacs.d/lisp/s
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 43ba8b563bee3426cead0e6d4ddc09398e1a349d

diff --git a/.gitmodules b/.gitmodules
index b689be6..b8a9ee5 100644 (file)
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,9 +1,6 @@
 [submodule "alloy-mode"]
        path = .emacs.d/lisp/alloy-mode
        url = https://github.com/dwwmmn/alloy-mode.git
-[submodule "amx"]
-       path = .emacs.d/lisp/amx
-       url = https://github.com/DarwinAwardWinner/amx.git
 [submodule "boxquote"]
        path = .emacs.d/lisp/boxquote
        url = https://github.com/davep/boxquote.el.git
@@ -13,9 +10,6 @@
 [submodule "page-break-lines"]
        path = .emacs.d/lisp/page-break-lines
        url = https://github.com/purcell/page-break-lines.git
-[submodule "s"]
-       path = .emacs.d/lisp/s
-       url = https://github.com/magnars/s.el.git
 [submodule "scpaste"]
        path = .emacs.d/lisp/scpaste
        url = https://git.sr.ht/~technomancy/scpaste