actual final changes and get rid of junk in lisp dir

actually works fine

2 files changed, 0 insertions, 162 deletions

diff --git a/.config/emacs/lisp/evil-collection/modes/ivy/README.org b/.config/emacs/lisp/evil-collection/modes/ivy/README.org
deleted file mode 100644
index e6b0bea..0000000
--- a/.config/emacs/lisp/evil-collection/modes/ivy/README.org
+++ /dev/null
@@ -1,51 +0,0 @@
-* ivy
-
-  Evil bindings for [[https://github.com/abo-abo/swiper][ivy]].
-
-** Key bindings
-
-*** ivy-minibuffer-map
-
-    Minibuffer bindings only take effect when =evil-collection-setup-minibuffer=
-    is non-nil (the global =<escape>= → =minibuffer-keyboard-quit= always applies).
-
-    | Command                    | Original | Evil                         |
-    |----------------------------+----------+------------------------------|
-    | =minibuffer-keyboard-quit= | =C-g=    | =<escape>= (any)             |
-    | =abort-recursive-edit=     | n/a      | =<escape>= (normal)          |
-    | =exit-minibuffer=          | =RET=    | =RET= (normal)               |
-    | =ivy-done=                 | =RET=    | =C-m= (normal)               |
-    | =ivy-next-line=            | =C-n=    | =j= (normal), =C-n= (insert) |
-    | =ivy-previous-line=        | =C-p=    | =k= (normal), =C-p= (insert) |
-    | =ivy-backward-delete-char= | =DEL=    | =DEL= (insert)               |
-    | =ivy-reverse-i-search=     | =C-r=    | =C-r= (insert)               |
-
-*** ivy-occur-mode-map (normal state)
-
-    | Command                      | Original   | Evil      |
-    |------------------------------+------------+-----------|
-    | =ivy-occur-next-line=        | =n=        | =j=       |
-    | =ivy-occur-previous-line=    | =p=        | =k=       |
-    | =evil-backward-char=         | n/a        | =h=       |
-    | =evil-forward-char=          | n/a        | =l=       |
-    | =evil-goto-first-line=       | n/a        | =gg=      |
-    | =ivy-occur-press=            | =RET=, =f= | =gf=      |
-    | =ivy-occur-press-and-switch= | =o=        | =RET=     |
-    | =ivy-occur-read-action=      | =M-o=      | =ga=      |
-    | =ivy-occur-dispatch=         | =C-c C-o=  | =go=      |
-    | =ivy-occur-toggle-calling=   | =C-c C-p=  | =gc=      |
-    | =ivy-occur-revert-buffer=    | =g=        | =gr=      |
-    | =ivy-occur-click=            | =mouse-1=  | =mouse-1= |
-    | =quit-window=                | =q=        | =q=       |
-
-*** ivy-occur-grep-mode-map (normal state)
-
-    Inherits the above plus:
-
-    | Command                                    | Original  | Evil                                |
-    |--------------------------------------------+-----------+-------------------------------------|
-    | =ivy-occur-delete-candidate=               | =C-d=     | =d=, =gd=                           |
-    | =ivy-occur-delete-candidate=               | =C-d=     | =D= (when =evil-want-C-d-scroll=)   |
-    | =evil-scroll-down=                         | n/a       | =C-d= (when =evil-want-C-d-scroll=) |
-    | =ivy-wgrep-change-to-wgrep-mode=           | =C-x C-q= | =i=, =C-x C-q=                      |
-    | =evil-digit-argument-or-beginning-of-line= | n/a       | =0=                                 |
diff --git a/.config/emacs/lisp/evil-collection/modes/ivy/evil-collection-ivy.el b/.config/emacs/lisp/evil-collection/modes/ivy/evil-collection-ivy.el
deleted file mode 100644
index 95334ff..0000000
--- a/.config/emacs/lisp/evil-collection/modes/ivy/evil-collection-ivy.el
+++ /dev/null
@@ -1,111 +0,0 @@
-;;; evil-collection-ivy.el --- Evil bindings for ivy -*- lexical-binding: t -*-
-
-;; Copyright (C) 2017 James Nguyen
-
-;; Author: James Nguyen <james@jojojames.com>
-;; Maintainer: James Nguyen <james@jojojames.com>
-;; Pierre Neidhardt <mail@ambrevar.xyz>
-;; URL: https://github.com/emacs-evil/evil-collection
-;; Version: 0.0.1
-;; Package-Requires: ((emacs "26.3"))
-;; Keywords: evil, ivy, tools
-
-;; 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 <http://www.gnu.org/licenses/>.
-
-;;; Commentary:
-;; Evil bindings for `ivy-mode'.
-
-;;; Code:
-(require 'evil-collection)
-(require 'ivy nil t)
-
-(defconst evil-collection-ivy-maps '(ivy-occur-mode-map
-                                     ivy-occur-grep-mode-map
-                                     ivy-minibuffer-map))
-
-;;;###autoload
-(defun evil-collection-ivy-setup ()
-  "Set up `evil' bindings for `ivy-mode'."
-  (evil-collection-define-key nil 'ivy-minibuffer-map
-    (kbd "<escape>") 'minibuffer-keyboard-quit)
-  (evil-collection-define-key 'normal 'ivy-occur-mode-map
-    [mouse-1] 'ivy-occur-click
-    (kbd "RET") 'ivy-occur-press-and-switch
-    "j" 'ivy-occur-next-line
-    "k" 'ivy-occur-previous-line
-    "h" 'evil-backward-char
-    "l" 'evil-forward-char
-    "g" nil
-    "gg" 'evil-goto-first-line
-    "gf" 'ivy-occur-press
-    "ga" 'ivy-occur-read-action
-    "go" 'ivy-occur-dispatch
-    "gc" 'ivy-occur-toggle-calling
-
-    ;; refresh
-    "gr" 'ivy-occur-revert-buffer
-
-    ;; quit
-    "q" 'quit-window)
-
-  (when evil-want-C-d-scroll
-    (evil-collection-define-key 'normal 'ivy-occur-grep-mode-map
-      "D" 'ivy-occur-delete-candidate
-      (kbd "C-d") 'evil-scroll-down))
-
-  (evil-collection-define-key 'visual 'ivy-occur-grep-mode-map
-    "j" 'evil-next-line
-    "k" 'evil-previous-line)
-
-  (evil-collection-define-key 'normal 'ivy-occur-grep-mode-map
-    "d" 'ivy-occur-delete-candidate
-    (kbd "C-x C-q") 'ivy-wgrep-change-to-wgrep-mode
-    "i" 'ivy-wgrep-change-to-wgrep-mode
-    "gd" 'ivy-occur-delete-candidate
-    [mouse-1] 'ivy-occur-click
-    (kbd "RET") 'ivy-occur-press-and-switch
-    "j" 'ivy-occur-next-line
-    "k" 'ivy-occur-previous-line
-    "h" 'evil-backward-char
-    "l" 'evil-forward-char
-    "g" nil
-    "gg" 'evil-goto-first-line
-    "gf" 'ivy-occur-press
-    "gr" 'ivy-occur-revert-buffer
-    "ga" 'ivy-occur-read-action
-    "go" 'ivy-occur-dispatch
-    "gc" 'ivy-occur-toggle-calling
-
-    "0" 'evil-digit-argument-or-evil-beginning-of-line
-
-    ;; quit
-    "q" 'quit-window)
-
-  (defvar evil-collection-setup-minibuffer)
-  (when evil-collection-setup-minibuffer
-    (evil-collection-define-key 'normal 'ivy-minibuffer-map
-      (kbd "<escape>") 'abort-recursive-edit
-      (kbd "RET") 'exit-minibuffer
-      (kbd "C-m") 'ivy-done
-      "j" 'ivy-next-line
-      "k" 'ivy-previous-line)
-
-    (evil-collection-define-key 'insert 'ivy-minibuffer-map
-      (kbd "DEL") 'ivy-backward-delete-char
-      (kbd "C-r") 'ivy-reverse-i-search
-      (kbd "C-n") 'ivy-next-line
-      (kbd "C-p") 'ivy-previous-line)))
-
-(provide 'evil-collection-ivy)
-;;; evil-collection-ivy.el ends here