|
710 | 710 | (defun dired-first-file ()
|
711 | 711 | (interactive)
|
712 | 712 | (goto-char (point-min))
|
713 |
| - (dired-next-line 4)) |
| 713 | + (dired-next-line 3)) |
714 | 714 |
|
715 | 715 | (defun dired-last-file ()
|
716 | 716 | (interactive)
|
717 | 717 | (goto-char (point-max))
|
718 | 718 | (dired-next-line -1))
|
719 | 719 |
|
720 |
| - (defun dired-up-directory () |
| 720 | + (defun dired-really-do-delete (&optional arg) |
| 721 | + (interactive "P") |
| 722 | + (let ((delete-by-moving-to-trash nil)) |
| 723 | + (dired-do-delete arg))) |
| 724 | + |
| 725 | + (defun quark/dired-up-directory () |
721 | 726 | "Take dired up one directory, but behave like dired-find-alternate-file"
|
722 | 727 | (interactive)
|
723 | 728 | (let ((old (current-buffer)))
|
724 | 729 | (dired-up-directory)
|
725 | 730 | (kill-buffer old)))
|
726 | 731 |
|
727 |
| - (defun dired-enable-wdired () |
728 |
| - (interactive) |
729 |
| - (unless (evil-insert-state-p) |
730 |
| - (evil-insert-state)) |
731 |
| - (wdired-change-to-wdired-mode)) |
732 |
| - |
733 | 732 | (with-eval-after-load 'evil
|
734 |
| - (evil-define-key 'normal dired-mode-map "h" #'dired-up-directory) |
| 733 | + (with-eval-after-load 'wdired |
| 734 | + (remove-hook 'wdired-mode-hook #'evil-change-to-initial-state)) |
| 735 | + |
| 736 | + (evil-define-key 'normal dired-mode-map "h" #'quark/dired-up-directory) |
735 | 737 | (evil-define-key 'normal dired-mode-map "l" #'dired-find-alternate-file)
|
736 | 738 | (evil-define-key 'normal dired-mode-map "j" #'dired-next-line)
|
737 | 739 | (evil-define-key 'normal dired-mode-map "k" #'dired-previous-line)
|
738 | 740 |
|
739 |
| - (evil-define-key 'normal dired-mode-map "I" #'dired-enable-wdired) |
| 741 | + (evil-define-key 'normal dired-mode-map "I" #'wdired-change-to-wdired-mode) |
740 | 742 |
|
741 | 743 | (evil-define-key 'normal dired-mode-map "o" #'dired-sort-toggle-or-edit)
|
742 | 744 | (evil-define-key 'normal dired-mode-map "m" #'dired-toggle-marks)
|
|
749 | 751 | (evil-define-key 'normal dired-mode-map "n" #'evil-search-next)
|
750 | 752 | (evil-define-key 'normal dired-mode-map "N" #'evil-search-previous)
|
751 | 753 | (evil-define-key 'normal dired-mode-map "q" #'kill-this-buffer)
|
| 754 | + (evil-define-key 'normal dired-mode-map "gg" #'dired-first-file) |
752 | 755 |
|
753 |
| - (defun my/dired-avy-navigate-down () |
| 756 | + (defun quark/dired-avy-navigate-down () |
754 | 757 | (interactive)
|
755 | 758 | (evilem--jump (evilem--collect #'dired-next-line)))
|
756 | 759 |
|
757 |
| - (defun my/dired-avy-navigate-up () |
| 760 | + (defun quark/dired-avy-navigate-up () |
758 | 761 | (interactive)
|
759 | 762 | (evilem--jump (evilem--collect #'dired-previous-line)))
|
760 | 763 |
|
761 |
| - (defun my/dired-avy-find-file-down () |
| 764 | + (defun quark/dired-avy-find-file-down () |
762 | 765 | (interactive)
|
763 |
| - (my/dired-avy-navigate-down) |
| 766 | + (quark/dired-avy-navigate-down) |
764 | 767 | (dired-find-file))
|
765 | 768 |
|
766 |
| - (defun my/dired-avy-find-file-up () |
| 769 | + (defun quark/dired-avy-find-file-up () |
767 | 770 | (interactive)
|
768 |
| - (my/dired-avy-navigate-up) |
| 771 | + (quark/dired-avy-navigate-up) |
769 | 772 | (dired-find-file))
|
770 | 773 |
|
771 |
| - (evil-define-key 'normal dired-mode-map (kbd "SPC J") #'my/dired-avy-navigate-down) |
772 |
| - |
773 |
| - (evil-define-key 'normal dired-mode-map (kbd "SPC K") #'my/dired-avy-navigate-up) |
774 |
| - |
775 |
| - (evil-define-key 'normal dired-mode-map (kbd "SPC j") #'my/dired-avy-find-file-down) |
776 |
| - |
777 |
| - (evil-define-key 'normal dired-mode-map (kbd "SPC k") #'my/dired-avy-find-file-up)) |
| 774 | + (evil-define-key 'normal dired-mode-map (kbd "SPC J") #'quark/dired-avy-navigate-down) |
| 775 | + (evil-define-key 'normal dired-mode-map (kbd "SPC K") #'quark/dired-avy-navigate-up) |
| 776 | + (evil-define-key 'normal dired-mode-map (kbd "SPC j") #'quark/dired-avy-find-file-down) |
| 777 | + (evil-define-key 'normal dired-mode-map (kbd "SPC k") #'quark/dired-avy-find-file-up)) |
778 | 778 |
|
779 | 779 | (define-key dired-mode-map (kbd "<remap> <beginning-of-buffer>")
|
780 | 780 | #'dired-first-file)
|
|
0 commit comments