Skip to content

Commit

Permalink
remove keymaps now provided by evil keymaps package
Browse files Browse the repository at this point in the history
  • Loading branch information
@nathantypanski
nathantypanski committed Apr 26, 2022
1 parent 9945408 commit 5f65b0a
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 312 deletions.
6 changes: 5 additions & 1 deletion config/languages/my-go.el
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

(use-package go-mode
:commands go-mode godoc
:ensure go-mode
:mode "\\.go\\'"
:config
(progn
Expand Down Expand Up @@ -36,8 +37,11 @@ Doesn't jump to buffer automatically. Enters help mode on buffer."
(buffer-list))))
(pop-to-buffer (buffer-name helpdoc)))))

(add-hook 'go-mode-hook (lambda ()
(setq evil-shift-width 8)
(setq indent-tabs-mode t)

(evil-define-key 'normal go-mode-map (kbd "K") 'my-jump-to-go-docs)))
(evil-define-key 'normal go-mode-map (kbd "K") 'my-jump-to-go-docs)))))


(provide 'my-go)
151 changes: 1 addition & 150 deletions config/my-buffers.el
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,156 +60,7 @@ according to the values of `my-ibuffer-use-vc-groups' and

(use-package ibuffer-vc
:ensure ibuffer-vc
:config)

(after 'evil
(evil-set-initial-state 'ibuffer-mode 'normal)
(evil-define-key 'normal ibuffer-mode-map
[backtab] 'ibuffer-toggle-filter-group
[tab] 'ibuffer-toggle-filter-group
(kbd "0") 'digit-argument
(kbd "1") 'digit-argument
(kbd "2") 'digit-argument
(kbd "3") 'digit-argument
(kbd "4") 'digit-argument
(kbd "5") 'digit-argument
(kbd "6") 'digit-argument
(kbd "7") 'digit-argument
(kbd "8") 'digit-argument
(kbd "9") 'digit-argument

(kbd "m") 'ibuffer-mark-forward
(kbd "v") 'ibuffer-toggle-marks
(kbd "u") 'ibuffer-unmark-forward
(kbd "=") 'ibuffer-diff-with-file
(kbd "j") 'evil-next-line
(kbd "k") 'evil-previous-line
(kbd "l") 'ibuffer-visit-buffer
(kbd "J") 'ibuffer-jump-to-buffer
(kbd "M-g") 'ibuffer-jump-to-buffer
(kbd "M-s a C-s") 'ibuffer-do-isearch
(kbd "M-s a M-C-s") 'ibuffer-do-isearch-regexp
(kbd "M-s a C-o") 'ibuffer-do-occur
(kbd "DEL") 'ibuffer-unmark-backward
(kbd "M-DEL") 'ibuffer-unmark-all
(kbd "* *") 'ibuffer-unmark-all
(kbd "* M") 'ibuffer-mark-by-mode
(kbd "* m") 'ibuffer-mark-modified-buffers
(kbd "* u") 'ibuffer-mark-unsaved-buffers
(kbd "* s") 'ibuffer-mark-special-buffers
(kbd "* r") 'ibuffer-mark-read-only-buffers
(kbd "* /") 'ibuffer-mark-dired-buffers
(kbd "* e") 'ibuffer-mark-dissociated-buffers
(kbd "* h") 'ibuffer-mark-help-buffers
(kbd "* z") 'ibuffer-mark-compressed-file-buffers
(kbd ".") 'ibuffer-mark-old-buffers

(kbd "d") 'ibuffer-mark-for-delete
(kbd "C-d") 'ibuffer-mark-for-delete-backwards
(kbd "x") 'ibuffer-do-kill-on-deletion-marks

;; immediate operations
(kbd "n") 'ibuffer-forward-filter-group
(kbd "SPC") 'forward-line
(kbd "p") 'ibuffer-backward-filter-group
(kbd "M-}") 'ibuffer-forward-next-marked
(kbd "M-{") 'ibuffer-backwards-next-marked
(kbd "g") 'ibuffer-update
"`" 'ibuffer-switch-format
"-" 'ibuffer-add-to-tmp-hide
"+" 'ibuffer-add-to-tmp-show
"b" 'ibuffer-bury-buffer
(kbd ",") 'ibuffer-toggle-sorting-mode
(kbd "s i") 'ibuffer-invert-sorting
(kbd "s a") 'ibuffer-do-sort-by-alphabetic
(kbd "s v") 'ibuffer-do-sort-by-recency
(kbd "s s") 'ibuffer-do-sort-by-size
(kbd "s f") 'ibuffer-do-sort-by-filename/process
(kbd "s m") 'ibuffer-do-sort-by-major-mode

(kbd "/ m") 'ibuffer-filter-by-used-mode
(kbd "/ M") 'ibuffer-filter-by-derived-mode
(kbd "/ n") 'ibuffer-filter-by-name
(kbd "/ c") 'ibuffer-filter-by-content
(kbd "/ e") 'ibuffer-filter-by-predicate
(kbd "/ f") 'ibuffer-filter-by-filename
(kbd "/ >") 'ibuffer-filter-by-size-gt
(kbd "/ <") 'ibuffer-filter-by-size-lt
(kbd "/ r") 'ibuffer-switch-to-saved-filters
(kbd "/ a") 'ibuffer-add-saved-filters
(kbd "/ x") 'ibuffer-delete-saved-filters
(kbd "/ d") 'ibuffer-decompose-filter
(kbd "/ s") 'ibuffer-save-filters
(kbd "/ p") 'ibuffer-pop-filter
(kbd "/ !") 'ibuffer-negate-filter
(kbd "/ t") 'ibuffer-exchange-filters
(kbd "/ TAB") 'ibuffer-exchange-filters
(kbd "/ o") 'ibuffer-or-filter
(kbd "/ g") 'ibuffer-filters-to-filter-group
(kbd "/ P") 'ibuffer-pop-filter-group
(kbd "/ D") 'ibuffer-decompose-filter-group
(kbd "/ /") 'ibuffer-filter-disable

(kbd "M-n") 'ibuffer-forward-filter-group
"\t" 'ibuffer-forward-filter-group
(kbd "M-p") 'ibuffer-backward-filter-group
(kbd "M-j") 'ibuffer-jump-to-filter-group
(kbd "C-k") 'ibuffer-kill-line
(kbd "C-y") 'ibuffer-yank
(kbd "/ S") 'ibuffer-save-filter-groups
(kbd "/ R") 'ibuffer-switch-to-saved-filter-groups
(kbd "/ X") 'ibuffer-delete-saved-filter-groups
(kbd "/ \\") 'ibuffer-clear-filter-groups

(kbd "q") 'bury-buffer
(kbd "h") 'describe-mode
(kbd "?") 'describe-mode

(kbd "% n") 'ibuffer-mark-by-name-regexp
(kbd "% m") 'ibuffer-mark-by-mode-regexp
(kbd "% f") 'ibuffer-mark-by-file-name-regexp

(kbd "C-t") 'ibuffer-visit-tags-table

(kbd "|") 'ibuffer-do-shell-command-pipe
(kbd "!") 'ibuffer-do-shell-command-file
(kbd "~") 'ibuffer-do-toggle-modified
;; marked operation
(kbd "A") 'ibuffer-do-view
(kbd "D") 'ibuffer-do-delete
(kbd "E") 'ibuffer-do-eval
(kbd "F") 'ibuffer-do-shell-command-file
(kbd "I") 'ibuffer-do-query-replace-regexp
(kbd "H") 'ibuffer-do-view-other-frame
(kbd "P") 'ibuffer-do-shell-command-pipe-replace
(kbd "M") 'ibuffer-do-toggle-modified
(kbd "O") 'ibuffer-do-occur
;; (kbd "P") 'ibuffer-do-print
(kbd "Q") 'ibuffer-do-query-replace
(kbd "R") 'ibuffer-do-rename-uniquely
(kbd "S") 'ibuffer-do-save
(kbd "T") 'ibuffer-do-toggle-read-only
(kbd "U") 'ibuffer-do-replace-regexp
(kbd "V") 'ibuffer-do-revert
(kbd "W") 'ibuffer-do-view-and-eval
(kbd "X") 'ibuffer-do-shell-command-pipe

;; (kbd "k") 'ibuffer-do-kill-lines
(kbd "w") 'ibuffer-copy-filename-as-kill

(kbd "e") 'ibuffer-visit-buffer
(kbd "f") 'ibuffer-visit-buffer
(kbd "C-x C-f") 'ibuffer-find-file
(kbd "C-o") 'ibuffer-visit-buffer-other-window-noselect
(kbd "M-o") 'ibuffer-visit-buffer-1-window
(kbd "C-x v") 'ibuffer-do-view-horizontally
(kbd "C-c C-a") 'ibuffer-auto-mode
(kbd "C-x 4 RET") 'ibuffer-visit-buffer-other-window
(kbd "C-x 5 RET") 'ibuffer-visit-buffer-other-frame
)
)
)
)
:config)))


(provide 'my-buffers)
161 changes: 0 additions & 161 deletions config/my-dired.el
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,165 +108,4 @@ Otherwise, returns nil."
(if (my-dired-at-title)
(dired-kill-subdir)))

(after 'evil
;;
;; These are plain ol' dired bindings, kept here for reference and future
;; modification.
;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

(evil-define-key 'normal dired-mode-map "#" 'dired-flag-auto-save-files)
(evil-define-key 'normal dired-mode-map "." 'dired-clean-directory)
(evil-define-key 'normal dired-mode-map "~" 'dired-flag-backup-files)
;; Upper case keys (except !) for operating on the marked files
(evil-define-key 'normal dired-mode-map "A" 'dired-do-search)
(evil-define-key 'normal dired-mode-map "C" 'dired-do-copy)
(evil-define-key 'normal dired-mode-map "B" 'dired-do-byte-compile)
(evil-define-key 'normal dired-mode-map "D" 'dired-do-delete)
(evil-define-key 'normal dired-mode-map "G" 'dired-do-chgrp)
(evil-define-key 'normal dired-mode-map "H" 'dired-do-hardlink)
(evil-define-key 'normal dired-mode-map "L" 'dired-do-load)
(evil-define-key 'normal dired-mode-map "M" 'dired-do-chmod)
(evil-define-key 'normal dired-mode-map "O" 'dired-do-chown)
(evil-define-key 'normal dired-mode-map "P" 'dired-do-print)
(evil-define-key 'normal dired-mode-map "Q" 'dired-do-query-replace-regexp)
(evil-define-key 'normal dired-mode-map "R" 'dired-do-rename)
(evil-define-key 'normal dired-mode-map "S" 'dired-do-symlink)
(evil-define-key 'normal dired-mode-map "T" 'dired-do-touch)
(evil-define-key 'normal dired-mode-map "X" 'dired-do-shell-command)
(evil-define-key 'normal dired-mode-map "Z" 'dired-do-compress)
(evil-define-key 'normal dired-mode-map "!" 'dired-do-shell-command)
(evil-define-key 'normal dired-mode-map "&" 'dired-do-async-shell-command)
;; Comparison commands
(evil-define-key 'normal dired-mode-map "=" 'dired-diff)
;; Tree Dired commands
(evil-define-key 'normal dired-mode-map "\M-\C-?" 'dired-unmark-all-files)
(evil-define-key 'normal dired-mode-map "\M-\C-d" 'dired-tree-down)
(evil-define-key 'normal dired-mode-map "\M-\C-u" 'dired-tree-up)
(evil-define-key 'normal dired-mode-map "\M-\C-n" 'dired-next-subdir)
(evil-define-key 'normal dired-mode-map "\M-\C-p" 'dired-prev-subdir)
;; move to marked files
(evil-define-key 'normal dired-mode-map "\M-{" 'dired-prev-marked-file)
(evil-define-key 'normal dired-mode-map "\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.
(evil-define-key 'normal dired-mode-map "%" nil)
(evil-define-key 'normal dired-mode-map "%u" 'dired-upcase)
(evil-define-key 'normal dired-mode-map "%l" 'dired-downcase)
(evil-define-key 'normal dired-mode-map "%d" 'dired-flag-files-regexp)
(evil-define-key 'normal dired-mode-map "%g" 'dired-mark-files-containing-regexp)
(evil-define-key 'normal dired-mode-map "%m" 'dired-mark-files-regexp)
(evil-define-key 'normal dired-mode-map "%r" 'dired-do-rename-regexp)
(evil-define-key 'normal dired-mode-map "%C" 'dired-do-copy-regexp)
(evil-define-key 'normal dired-mode-map "%H" 'dired-do-hardlink-regexp)
(evil-define-key 'normal dired-mode-map "%R" 'dired-do-rename-regexp)
(evil-define-key 'normal dired-mode-map "%S" 'dired-do-symlink-regexp)
(evil-define-key 'normal dired-mode-map "%&" 'dired-flag-garbage-files)
;; Commands for marking and unmarking.
(evil-define-key 'normal dired-mode-map "*" nil)
(evil-define-key 'normal dired-mode-map "**" 'dired-mark-executables)
(evil-define-key 'normal dired-mode-map "*/" 'dired-mark-directories)
(evil-define-key 'normal dired-mode-map "*@" 'dired-mark-symlinks)
(evil-define-key 'normal dired-mode-map "*%" 'dired-mark-files-regexp)
(evil-define-key 'normal dired-mode-map "*c" 'dired-change-marks)
(evil-define-key 'normal dired-mode-map "*s" 'dired-mark-subdir-files)
(evil-define-key 'normal dired-mode-map "*m" 'dired-mark)
(evil-define-key 'normal dired-mode-map "*u" 'dired-unmark)
(evil-define-key 'normal dired-mode-map "*?" 'dired-unmark-all-files)
(evil-define-key 'normal dired-mode-map "*!" 'dired-unmark-all-marks)
(evil-define-key 'normal dired-mode-map "U" 'dired-unmark-all-marks)
(evil-define-key 'normal dired-mode-map "*\177" 'dired-unmark-backward)
(evil-define-key 'normal dired-mode-map "*\C-n" 'dired-next-marked-file)
(evil-define-key 'normal dired-mode-map "*\C-p" 'dired-prev-marked-file)
(evil-define-key 'normal dired-mode-map "*t" 'dired-toggle-marks)
;; Lower keys for commands not operating on all the marked files
(evil-define-key 'normal dired-mode-map "a" 'dired-find-alternate-file)
(evil-define-key 'normal dired-mode-map "d" 'dired-flag-file-deletion)
(evil-define-key 'normal dired-mode-map "e" 'dired-find-file)
(evil-define-key 'normal dired-mode-map "f" 'dired-find-file)
(evil-define-key 'normal dired-mode-map "\C-m" 'dired-find-file)
(put 'dired-find-file :advertised-binding "\C-m")
(evil-define-key 'normal dired-mode-map "g" 'revert-buffer)
(evil-define-key 'normal dired-mode-map "i" 'dired-maybe-insert-subdir)
(evil-define-key 'normal dired-mode-map "j" 'dired-goto-file)
(evil-define-key 'normal dired-mode-map "k" 'dired-do-kill-lines)
(evil-define-key 'normal dired-mode-map "l" 'dired-do-redisplay)
(evil-define-key 'normal dired-mode-map "m" 'dired-mark)
(evil-define-key 'normal dired-mode-map "n" 'dired-next-line)
(evil-define-key 'normal dired-mode-map "o" 'dired-find-file-other-window)
(evil-define-key 'normal dired-mode-map "\C-o" 'dired-display-file)
(evil-define-key 'normal dired-mode-map "p" 'dired-previous-line)
(evil-define-key 'normal dired-mode-map "s" 'dired-sort-toggle-or-edit)
(evil-define-key 'normal dired-mode-map "t" 'dired-toggle-marks)
(evil-define-key 'normal dired-mode-map "u" 'dired-unmark)
(evil-define-key 'normal dired-mode-map "v" 'dired-view-file)
(evil-define-key 'normal dired-mode-map "w" 'dired-copy-filename-as-kill)
(evil-define-key 'normal dired-mode-map "x" 'dired-do-flagged-delete)
(evil-define-key 'normal dired-mode-map "y" 'dired-show-file-type)
(evil-define-key 'normal dired-mode-map "+" 'dired-create-directory)
;; moving
(evil-define-key 'normal dired-mode-map "<" 'dired-prev-dirline)
(evil-define-key 'normal dired-mode-map ">" 'dired-next-dirline)
(evil-define-key 'normal dired-mode-map "^" 'dired-up-directory)
(evil-define-key 'normal dired-mode-map " " 'dired-next-line)
(evil-define-key 'normal dired-mode-map [remap next-line] 'dired-next-line)
(evil-define-key 'normal dired-mode-map [remap previous-line] 'dired-previous-line)
;; hiding
(evil-define-key 'normal dired-mode-map "\M-$" 'dired-hide-all)
(evil-define-key 'normal dired-mode-map "(" 'dired-hide-details-mode)
;; isearch
(evil-define-key 'normal dired-mode-map (kbd "M-s a C-s") 'dired-do-isearch)
(evil-define-key 'normal dired-mode-map (kbd "M-s a M-C-s") 'dired-do-isearch-regexp)
(evil-define-key 'normal dired-mode-map (kbd "M-s f C-s") 'dired-isearch-filenames)
(evil-define-key 'normal dired-mode-map (kbd "M-s f M-C-s") 'dired-isearch-filenames-regexp)
;; misc
;; `toggle-read-only' is an obsolete alias for `read-only-mode'
(evil-define-key 'normal dired-mode-map "?" 'dired-summary)
(evil-define-key 'normal dired-mode-map "\177" 'dired-unmark-backward)
(evil-define-key 'normal dired-mode-map [remap undo] 'dired-undo)
(evil-define-key 'normal dired-mode-map [remap advertised-undo] 'dired-undo)
;; thumbnail manipulation (image-dired)
(evil-define-key 'normal dired-mode-map "\C-td" 'image-dired-display-thumbs)
(evil-define-key 'normal dired-mode-map "\C-tt" 'image-dired-tag-files)
(evil-define-key 'normal dired-mode-map "\C-tr" 'image-dired-delete-tag)
(evil-define-key 'normal dired-mode-map "\C-tj" 'image-dired-jump-thumbnail-buffer)
(evil-define-key 'normal dired-mode-map "\C-ti" 'image-dired-dired-display-image)
(evil-define-key 'normal dired-mode-map "\C-tx" 'image-dired-dired-display-external)
(evil-define-key 'normal dired-mode-map "\C-ta" 'image-dired-display-thumbs-append)
(evil-define-key 'normal dired-mode-map "\C-t." 'image-dired-display-thumb)
(evil-define-key 'normal dired-mode-map "\C-tc" 'image-dired-dired-comment-files)
(evil-define-key 'normal dired-mode-map "\C-tf" 'image-dired-mark-tagged-files)
(evil-define-key 'normal dired-mode-map "\C-t\C-t" 'image-dired-dired-toggle-marked-thumbs)
(evil-define-key 'normal dired-mode-map "\C-te" 'image-dired-dired-edit-comment-and-tags)
;; encryption and decryption (epa-dired)

;;
;; My bindings.
;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

(evil-define-key 'normal dired-mode-map (kbd "C-j") 'dired-next-subdir)
(evil-define-key 'normal dired-mode-map (kbd "C-k") 'dired-prev-subdir)
(evil-define-key 'normal dired-mode-map "h" 'my-dired-up-directory)
(evil-define-key 'normal dired-mode-map "L" 'my-dired-interact-with-file)
(evil-define-key 'normal dired-mode-map "l" 'dired-find-alternate-file)
(evil-define-key 'normal dired-mode-map "a" 'ag-dired)
(evil-define-key 'normal dired-mode-map "o" 'dired-sort-toggle-or-edit)
(evil-define-key 'normal dired-mode-map "v" 'dired-toggle-marks)
(evil-define-key 'normal dired-mode-map "m" 'dired-mark)
(evil-define-key 'normal dired-mode-map "u" 'dired-unmark)
(evil-define-key 'normal dired-mode-map "U" 'dired-unmark-all-marks)
(evil-define-key 'normal dired-mode-map "c" 'dired-create-directory)
(evil-define-key 'normal dired-mode-map "q" 'kill-this-buffer)
(evil-define-key 'normal dired-mode-map "/" 'evil-search-forward)
(evil-define-key 'normal dired-mode-map "n" 'evil-search-next)
(evil-define-key 'normal dired-mode-map "N" 'evil-search-previous)
(evil-define-key 'normal dired-mode-map "j" 'my-dired-next-line)
(evil-define-key 'normal dired-mode-map "k" 'my-dired-previous-line)
(evil-define-key 'normal dired-mode-map (kbd "TAB") 'dired-hide-subdir)
(evil-define-key 'normal dired-mode-map (kbd "<backspace>") 'my-dired-remove-from-buffer)
)

(provide 'my-dired)
2 changes: 2 additions & 0 deletions config/my-evil.el
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
;; Settings for ostracizing me from both the Emacs and Vim communities.
;; a.k.a. evil-mode

;; https://github.com/emacs-evil/evil-collection/issues/60
(setq evil-want-keybinding nil)

;; In order to work properly, we need to load evil-leader-mode before we load
;; evil-mode.
Expand Down

0 comments on commit 5f65b0a

Please sign in to comment.