actual final changes and get rid of junk in lisp dir

actually works fine

2 files changed, 0 insertions, 264 deletions

diff --git a/.config/emacs/lisp/evil-collection/modes/dired/README.org b/.config/emacs/lisp/evil-collection/modes/dired/README.org
deleted file mode 100644
index 4068799..0000000
--- a/.config/emacs/lisp/evil-collection/modes/dired/README.org
+++ /dev/null
@@ -1,40 +0,0 @@
-* dired
-
-  Evil bindings for [[https://www.gnu.org/software/emacs/manual/html_node/emacs/Dired.html][Dired]].
-
-** Key bindings
-
-   | Command                        | Original        | Evil            |
-   |--------------------------------+-----------------+-----------------|
-   | =dired-next-line=              | =n=, =SPC=      | =j=, =SPC=      |
-   | =dired-previous-line=          | =p=, =S-SPC=    | =k=, =S-SPC=    |
-   | =dired-find-file=              | =f=, =RET=, =e= | =gf=, =RET=     |
-   | =dired-find-file-other-window= | =o=             | =gO=            |
-   | =dired-view-file=              | =v=             | =go=            |
-   | =revert-buffer=                | =g=             | =gr=            |
-   | =dired-summary=                | =?=, =h=        | =g?=            |
-   | =dired-show-file-type=         | =y=             | =gy=            |
-   | =dired-copy-filename-as-kill=  | =w=             | =Y=             |
-   | =dired-do-kill-lines=          | =k=             | =K=             |
-   | =dired-do-chgrp=               | =G=             | =gG=            |
-   | =dired-hide-subdir=            | =$=             | =g$=            |
-   | =dired-next-dirline=           | =>=             | =gj=, =]]=, =>= |
-   | =dired-prev-dirline=           | =<=             | =gk=, =[[=, =<= |
-   | =dired-up-directory=           | =^=             | =^=, =-=        |
-   | =dired-sort-toggle-or-edit=    | =s=             | =o=             |
-   | =dired-do-redisplay=           | =l=             | =r=             |
-   | =dired-find-alternate-file=    | =a=             | =a=             |
-   | =quit-window=                  | =q=             | =q=             |
-
-   Uppercase operator keys (=A=, =B=, =C=, =D=, =H=, =L=, =M=, =O=, =P=, =Q=,
-   =R=, =S=, =T=, =U=, =W=, =X=, =Z=) and marking/flagging keys (=+=, =&=,
-   =!=, =%=, =*=, =~=, =#=, =.=, ===) keep their default dired bindings.
-
-   On Emacs 30+: =E= → =dired-do-open=.
-
-** Integrations
-
-   - [[https://github.com/Fuco1/dired-hacks][dired-narrow]]: =s= → =dired-narrow-regexp=.
-   - [[https://github.com/Fuco1/dired-hacks][dired-subtree]]: =TAB= toggle, =gh= / =gl= up/down, =M-j= / =M-k= sibling navigation.
-   - [[https://github.com/Fuco1/dired-hacks][dired-filter]]: =*= → =dired-filter-mark-map=, =g/= → =dired-filter-map=.
-   - dired-x: =*(=, =*.=, =*O= for sexp / extension / omitted marking.
diff --git a/.config/emacs/lisp/evil-collection/modes/dired/evil-collection-dired.el b/.config/emacs/lisp/evil-collection/modes/dired/evil-collection-dired.el
deleted file mode 100644
index 7898c1a..0000000
--- a/.config/emacs/lisp/evil-collection/modes/dired/evil-collection-dired.el
+++ /dev/null
@@ -1,224 +0,0 @@
-;;; evil-collection-dired.el --- Evil bindings for Dired -*- 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, dired, 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 Dired.
-
-;;; Code:
-(require 'dired)
-(require 'evil-collection)
-
-(defvar dired-filter-mark-map)
-(defvar dired-filter-map)
-
-(defconst evil-collection-dired-maps '(dired-mode-map
-                                       dired-filter-mark-map
-                                       dired-filter-map))
-
-;;;###autoload
-(defun evil-collection-dired-setup ()
-  "Set up `evil' bindings for `dired'."
-  (evil-collection-define-key 'normal 'dired-mode-map
-    "q" 'quit-window
-    "j" 'dired-next-line
-    "k" 'dired-previous-line
-    [mouse-2] 'dired-mouse-find-file-other-window
-    [follow-link] 'mouse-face
-    ;; Commands to mark or flag certain categories of files
-    "#" 'dired-flag-auto-save-files
-    "." 'dired-clean-directory
-    "~" 'dired-flag-backup-files
-    ;; Upper case keys (except !) for operating on the marked files
-    "A" 'dired-do-find-regexp
-    "C" 'dired-do-copy
-    "B" 'dired-do-byte-compile
-    "D" 'dired-do-delete
-    "gG" 'dired-do-chgrp ;; FIXME: This can probably live on a better binding.
-    "H" 'dired-do-hardlink
-    "L" 'dired-do-load
-    "M" 'dired-do-chmod
-    "O" 'dired-do-chown
-    "P" 'dired-do-print
-    "Q" 'dired-do-find-regexp-and-replace
-    "R" 'dired-do-rename
-    "S" 'dired-do-symlink
-    "T" 'dired-do-touch
-    "X" 'dired-do-shell-command
-    "Z" 'dired-do-compress
-    "c" 'dired-do-compress-to
-    "!" 'dired-do-shell-command
-    "&" 'dired-do-async-shell-command
-    ;; Comparison commands
-    "=" 'dired-diff
-    ;; Tree Dired commands
-    (kbd "M-C-?") 'dired-unmark-all-files
-    (kbd "M-C-d") 'dired-tree-down
-    (kbd "M-C-u") 'dired-tree-up
-    (kbd "M-C-n") 'dired-next-subdir
-    (kbd "M-C-p") 'dired-prev-subdir
-    ;; move to marked files
-    (kbd "M-{") 'dired-prev-marked-file
-    (kbd "M-}") 'dired-next-marked-file
-    ;; Make all regexp commands share a `%' prefix:
-    ;; We used to get to the submap via a symbol dired-regexp-prefix,
-    ;; but that seems to serve little purpose, and copy-keymap
-    ;; does a better job without it.
-    "%" nil
-    "%u" 'dired-upcase
-    "%l" 'dired-downcase
-    "%d" 'dired-flag-files-regexp
-    "%g" 'dired-mark-files-containing-regexp
-    "%m" 'dired-mark-files-regexp
-    "%r" 'dired-do-rename-regexp
-    "%C" 'dired-do-copy-regexp
-    "%H" 'dired-do-hardlink-regexp
-    "%R" 'dired-do-rename-regexp
-    "%S" 'dired-do-symlink-regexp
-    "%&" 'dired-flag-garbage-files
-    ;; mark
-    "*" nil
-    "**" 'dired-mark-executables
-    "*/" 'dired-mark-directories
-    "*@" 'dired-mark-symlinks
-    "*%" 'dired-mark-files-regexp
-    "*c" 'dired-change-marks
-    "*s" 'dired-mark-subdir-files
-    "*m" 'dired-mark
-    "*u" 'dired-unmark
-    "*?" 'dired-unmark-all-files
-    "*!" 'dired-unmark-all-marks
-    "U" 'dired-unmark-all-marks
-    (kbd "* <delete>") 'dired-unmark-backward
-    (kbd "* C-n") 'dired-next-marked-file
-    (kbd "* C-p") 'dired-prev-marked-file
-    "*t" 'dired-toggle-marks
-    ;; Lower keys for commands not operating on all the marked files
-    "a" 'dired-find-alternate-file
-    "d" 'dired-flag-file-deletion
-    "gf" 'dired-find-file
-    (kbd "C-m") 'dired-find-file
-    "gr" 'revert-buffer
-    "i" 'dired-toggle-read-only
-    "I" 'dired-maybe-insert-subdir
-    "J" 'dired-goto-file
-    "K" 'dired-do-kill-lines
-    "r" 'dired-do-redisplay
-    "m" 'dired-mark
-    "t" 'dired-toggle-marks
-    "u" 'dired-unmark                   ; also "*u"
-    "W" 'browse-url-of-dired-file
-    "x" 'dired-do-flagged-delete
-    "gy" 'dired-show-file-type ;; FIXME: This could probably go on a better key.
-    "Y" 'dired-copy-filename-as-kill
-    "+" 'dired-create-directory
-    ;; open
-    (kbd "RET") 'dired-find-file
-    (kbd "S-<return>") 'dired-find-file-other-window
-    (kbd "M-RET") 'dired-display-file
-    "gO" 'dired-find-file-other-window
-    "go" 'dired-view-file
-    ;; sort
-    "o" 'dired-sort-toggle-or-edit
-    ;; moving
-    "gj" 'dired-next-dirline
-    "gk" 'dired-prev-dirline
-    "[[" 'dired-prev-dirline
-    "]]" 'dired-next-dirline
-    "<" 'dired-prev-dirline
-    ">" 'dired-next-dirline
-    "^" 'dired-up-directory
-    "-" 'dired-up-directory
-    " " 'dired-next-line
-    [?\S-\ ] 'dired-previous-line
-    [remap next-line] 'dired-next-line
-    [remap previous-line] 'dired-previous-line
-    ;; hiding
-    "g$" 'dired-hide-subdir ;; FIXME: This can probably live on a better binding.
-    (kbd "M-$") 'dired-hide-all
-    "(" 'dired-hide-details-mode
-    ;; isearch
-    (kbd "M-s a C-s")   'dired-do-isearch
-    (kbd "M-s a M-C-s") 'dired-do-isearch-regexp
-    (kbd "M-s f C-s")   'dired-isearch-filenames
-    (kbd "M-s f M-C-s") 'dired-isearch-filenames-regexp
-    ;; misc
-    [remap read-only-mode] 'dired-toggle-read-only
-    ;; `toggle-read-only' is an obsolete alias for `read-only-mode'
-    [remap toggle-read-only] 'dired-toggle-read-only
-    "g?" 'dired-summary
-    (kbd "<delete>") 'dired-unmark-backward
-    [remap undo] 'dired-undo
-    [remap advertised-undo] 'dired-undo
-    ;; thumbnail manipulation (image-dired)
-    (kbd "C-t d") 'image-dired-display-thumbs
-    (kbd "C-t t") 'image-dired-tag-files
-    (kbd "C-t r") 'image-dired-delete-tag
-    (kbd "C-t j") 'image-dired-jump-thumbnail-buffer
-    (kbd "C-t i") 'image-dired-dired-display-image
-    (kbd "C-t x") 'image-dired-dired-display-external
-    (kbd "C-t a") 'image-dired-display-thumbs-append
-    (kbd "C-t .") 'image-dired-display-thumb
-    (kbd "C-t c") 'image-dired-dired-comment-files
-    (kbd "C-t f") 'image-dired-mark-tagged-files
-    (kbd "C-t C-t") 'image-dired-dired-toggle-marked-thumbs
-    (kbd "C-t e") 'image-dired-dired-edit-comment-and-tags
-    ;; encryption and decryption (epa-dired)
-    ";d" 'epa-dired-do-decrypt
-    ";v" 'epa-dired-do-verify
-    ";s" 'epa-dired-do-sign
-    ";e" 'epa-dired-do-encrypt)
-
-  (when (>= emacs-major-version 30)
-    (evil-collection-define-key 'normal 'dired-mode-map
-      "E" 'dired-do-open))
-
-  ;; dired-x commands
-  (with-eval-after-load 'dired-x
-    (evil-collection-define-key 'normal 'dired-mode-map
-      "*(" 'dired-mark-sexp
-      "*." 'dired-mark-extension
-      "*O" 'dired-mark-omitted))
-
-  ;; dired-narrow commands
-  (with-eval-after-load 'dired-narrow
-    (evil-collection-define-key 'normal 'dired-mode-map
-      "s" 'dired-narrow-regexp))
-
-  ;; dired-subtree commands
-  (with-eval-after-load 'dired-subtree
-    (evil-collection-define-key 'normal 'dired-mode-map
-      (kbd "TAB") 'dired-subtree-toggle
-      "gh" 'dired-subtree-up
-      "gl" 'dired-subtree-down
-      (kbd "M-j") 'dired-subtree-next-sibling
-      (kbd "M-k") 'dired-subtree-previous-sibling))
-
-  (with-eval-after-load 'dired-filter
-    (evil-collection-define-key 'normal 'dired-mode-map
-      "*"  dired-filter-mark-map
-      "g/" dired-filter-map)))
-
-(provide 'evil-collection-dired)
-;;; evil-collection-dired.el ends here