emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
doomemacs/modules/emacs/dired/config.el

119 lines
4.3 KiB
EmacsLisp
Raw Normal View History

Major optimization refactor, across the board + enable lexical-scope everywhere (lexical-binding = t): ~5-10% faster startup; ~5-20% general boost + reduce consing, function calls & garbage collection by preferring cl-loop & dolist over lambda closures (for mapc[ar], add-hook, and various cl-lib filter/map/reduce functions) -- where possible + prefer functions with dedicated opcodes, like assq (see byte-defop's in bytecomp.el for more) + prefer pcase & cond (faster) over cl-case + general refactor for code readability + ensure naming & style conventions are adhered to + appease byte-compiler by marking unused variables with underscore + defer minor mode activation to after-init, emacs-startup or window-setup hooks; a customization opportunity for users + ensures custom functionality won't interfere with startup.
2017-06-08 11:47:56 +02:00
;;; tools/dired/config.el -*- lexical-binding: t; -*-
Add modules/tools/{dired,eshell}
2017-02-19 18:53:38 -05:00
Refactor tools/dired; fix leader key in dired buffers
2018-01-27 20:49:46 -05:00
(def-package! dired
tools/dired: SPC o - => dired-jump; show symlink targets Inspired by #625
2018-06-01 13:46:52 +02:00
:commands dired-jump
Refactor tools/dired; fix leader key in dired buffers
2018-01-27 20:49:46 -05:00
:init
(setq ;; Always copy/delete recursively
dired-recursive-copies 'always
dired-recursive-deletes 'top
;; Auto refresh dired, but be quiet about it
tools/dired: SPC o - => dired-jump; show symlink targets Inspired by #625
2018-06-01 13:46:52 +02:00
dired-hide-details-hide-symlink-targets nil
Refactor tools/dired; fix leader key in dired buffers
2018-01-27 20:49:46 -05:00
;; files
image-dired-dir (concat doom-cache-dir "image-dired/")
tools/dired: fix redundancy in image-dired-db-file
2018-03-19 23:55:45 -04:00
image-dired-db-file (concat image-dired-dir "db.el")
Refactor tools/dired; fix leader key in dired buffers
2018-01-27 20:49:46 -05:00
image-dired-gallery-dir (concat image-dired-dir "gallery/")
image-dired-temp-image-file (concat image-dired-dir "temp-image")
image-dired-temp-rotate-image-file (concat image-dired-dir "temp-rotate-image"))
:config
Remove --group-directories-first arg for bsd ls
2019-03-02 13:49:39 -05:00
(let ((args (list "-aBhl" "--group-directories-first")))
(when IS-BSD
;; Use GNU ls as `gls' from `coreutils' if available. Add `(setq
;; dired-use-ls-dired nil)' to your config to suppress the Dired warning
:boom: Replace exec-path-from-shell w/ 'bin/doom env' IMPORTANT: This is a breaking update for Mac users, as your shell environment will no longer be inherited correctly (with the removal of exec-path-from-shell). The quick fix is: 'bin/doom env refresh'. Also, the set-env! autodef now does nothing (and is deprecated), be sure to remove calls to it in your config. Smaller changes: + This update also adds --no-* switches to doom quickstart + Includes general improvements to the documentation of several bin/doom commands. + Moves doom/reload* commands to core/autoload/config.el + doom/reload-project has been removed (it didn't actually do anything) The breaking change: This update adds an "envvar file" to Doom Emacs. This file is generated by `doom env refresh`, populated with variables scraped from your shell environment (from both non-interactive and interactive sessions). This file is then (inexpensively) loaded at startup, if it exists. + The file is manually generated with `doom env refresh`. + It can be regenerated automatically whenever `doom refresh` is run by running `doom env enable` (`doom env clear` will reverse this and delete the env file). + `doom quickstart` will ask if you want to auto-generate this envvar file. You won't need it if you're confident Emacs will always be started from the correct environment, however. + Your env file can be reloaded from a running Emacs session with `M-x doom/reload-env`. Note: this won't work if the Emacs session you're running it in doesn't have a correct SHELL set. i.e. don't use this to create your first env file! The idea isn't mine -- it's borrowed from Spacemacs -- and was introduced to me in #1053 by @yurimx. I was impressed with it. Prior to this, I was unhappy with exec-path-from-shell (no hate to the dev, I understand its necessity), and 'doom patch-macos' wasn't ideal for mac users (needed to be reapplied every time you update Emacs). What's more, many users (even Linux users) had to install exec-path-from-shell anyway. This solution suffers from none of their shortcomings. More reliable than patch-macos, more performant and complete than exec-path-from-shell, and easily handled by bin/doom.
2019-03-28 00:06:10 -04:00
;; when not using GNU ls.
Remove --group-directories-first arg for bsd ls
2019-03-02 13:49:39 -05:00
(if-let* ((gls (executable-find "gls")))
(setq insert-directory-program gls)
Remove redundant dired sort hook #1414 This still means dired will be unsorted for BSD ls users, but that's acceptable (for now).
2019-05-14 18:45:38 -04:00
;; BSD ls doesn't support --group-directories-first
(setq args (delete "--group-directories-first" args))))
Remove --group-directories-first arg for bsd ls
2019-03-02 13:49:39 -05:00
(setq dired-listing-switches (string-join args " ")))
emacs/dired: refactor #1038 + Removed ranger/dired-setup hook and performed its config globally + Lazy-loaded ranger + Removed unnecessary `:defer t`s (redundant with :commands and :hook) and `:commands` (redundant with :hook) + Set image-dired-dir before trying to create it, to give users an opportunity to modify it before it is created + Use sharp quotes consistently for keybind commands
2018-12-13 15:40:53 -05:00
emacs/dired: add diredfl & refactor - Adds C-c C-e for invoking wdired - Adds diredfl for more colors in dired (and disables dired-k's coloring based on mtime, which was confusing)
2019-05-20 16:04:01 -04:00
(define-key! dired-mode-map
;; Kill buffer when quitting dired buffers
[remap quit-window] (λ! (quit-window t))
;; To be consistent with ivy/helm+wgrep integration
"C-c C-e" #'wdired-change-to-wdired-mode))
emacs/dired: add dired-rsync And bind it to C-c C-r
2019-05-20 17:40:16 -04:00
(def-package! dired-rsync
:general (dired-mode-map "C-c C-r" #'dired-rsync))
emacs/dired: add diredfl & refactor - Adds C-c C-e for invoking wdired - Adds diredfl for more colors in dired (and disables dired-k's coloring based on mtime, which was confusing)
2019-05-20 16:04:01 -04:00
(def-package! diredfl
:hook (dired-mode . diredfl-mode))
Add modules/tools/{dired,eshell}
2017-02-19 18:53:38 -05:00
Revert macros to ...! name convention (elisp doesn't like @...)
2017-02-23 00:06:12 -05:00
(def-package! dired-k
emacs/dired: add-hook -> :hook
2018-07-21 01:29:38 +02:00
:hook (dired-initial-position . dired-k)
:hook (dired-after-readin . dired-k-no-revert)
Add modules/tools/{dired,eshell}
2017-02-19 18:53:38 -05:00
:config
emacs/dired: add diredfl & refactor - Adds C-c C-e for invoking wdired - Adds diredfl for more colors in dired (and disables dired-k's coloring based on mtime, which was confusing)
2019-05-20 16:04:01 -04:00
(setq dired-k-style 'git
dired-k-padding 1)
;; Don't highlight based on mtime, this interferes with diredfl and is more
;; confusing than helpful.
(advice-add #'dired-k--highlight-by-file-attribyte :override #'ignore)
tool/dired: don't kill git process to abruptly This would leave behind index.lock files. This may potentially fix #389.
2018-01-31 05:08:25 -05:00
(defun +dired*interrupt-process (orig-fn &rest args)
"Fixes dired-k killing git processes too abruptly, leaving behind disruptive
.git/index.lock files."
(cl-letf (((symbol-function #'kill-process)
(symbol-function #'interrupt-process)))
(apply orig-fn args)))
(advice-add #'dired-k--start-git-status :around #'+dired*interrupt-process)
tools/dired: faster dired in remote buffers
2017-04-16 11:56:37 -04:00
(defun +dired*dired-k-highlight (orig-fn &rest args)
"Butt out if the requested directory is remote (i.e. through tramp)."
(unless (file-remote-p default-directory)
(apply orig-fn args)))
Refactor tools/dired; fix leader key in dired buffers
2018-01-27 20:49:46 -05:00
(advice-add #'dired-k--highlight :around #'+dired*dired-k-highlight))
Merge evil-collection-dired into emacs/dired
2018-05-31 13:10:34 +02:00
emacs/dired: move ranger module to ranger feature in dired module
2018-12-07 22:27:03 -08:00
(def-package! ranger
:when (featurep! +ranger)
emacs/dired: refactor #1038 + Removed ranger/dired-setup hook and performed its config globally + Lazy-loaded ranger + Removed unnecessary `:defer t`s (redundant with :commands and :hook) and `:commands` (redundant with :hook) + Set image-dired-dir before trying to create it, to give users an opportunity to modify it before it is created + Use sharp quotes consistently for keybind commands
2018-12-13 15:40:53 -05:00
:after dired
emacs/dired: move ranger module to ranger feature in dired module
2018-12-07 22:27:03 -08:00
:init
;; set up image-dired to allow picture resize
emacs/dired: fix ranger oddities Added two hacks to fix two obnoxious issues Ranger has, having to do with it failing to clean up after itself. In particular: 1. A left over mouse-1 bind that traps focus in a particular window (easy to get around with keyboard-based window switch commands, but this renders the mouse useless), 2. And the lingering ranger header bar (i.e. it doesn't clean up header-line-format). This commit also ensures Deer overrides dired if +ranger is enabled.
2019-05-20 20:04:34 -04:00
(setq image-dired-dir (concat doom-cache-dir "image-dir")
ranger-override-dired t)
emacs/dired: refactor #1038 + Removed ranger/dired-setup hook and performed its config globally + Lazy-loaded ranger + Removed unnecessary `:defer t`s (redundant with :commands and :hook) and `:commands` (redundant with :hook) + Set image-dired-dir before trying to create it, to give users an opportunity to modify it before it is created + Use sharp quotes consistently for keybind commands
2018-12-13 15:40:53 -05:00
:config
emacs/dired: move ranger module to ranger feature in dired module
2018-12-07 22:27:03 -08:00
(unless (file-directory-p image-dired-dir)
(make-directory image-dired-dir))
emacs/dired: refactor #1038 + Removed ranger/dired-setup hook and performed its config globally + Lazy-loaded ranger + Removed unnecessary `:defer t`s (redundant with :commands and :hook) and `:commands` (redundant with :hook) + Set image-dired-dir before trying to create it, to give users an opportunity to modify it before it is created + Use sharp quotes consistently for keybind commands
2018-12-13 15:40:53 -05:00
(set-popup-rule! "^\\*ranger" :ignore t)
emacs/dired: fix ranger oddities Added two hacks to fix two obnoxious issues Ranger has, having to do with it failing to clean up after itself. In particular: 1. A left over mouse-1 bind that traps focus in a particular window (easy to get around with keyboard-based window switch commands, but this renders the mouse useless), 2. And the lingering ranger header bar (i.e. it doesn't clean up header-line-format). This commit also ensures Deer overrides dired if +ranger is enabled.
2019-05-20 20:04:34 -04:00
(defun +dired*cleanup-header-line ()
"Ranger fails to clean up `header-line-format' when it is closed, so..."
(dolist (buffer (buffer-list))
(when (buffer-live-p buffer)
(with-current-buffer buffer
(when (equal header-line-format '(:eval (ranger-header-line)))
(setq header-line-format nil))))))
(advice-add #'ranger-revert :before #'+dired*cleanup-header-line)
(defun +dired*cleanup-mouse1-bind ()
"Ranger binds an anonymous function to mouse-1 after previewing a buffer
that prevents the user from escaping the window with the mouse. This command is
never cleaned up if the buffer already existed before ranger was initialized, so
we have to clean it up ourselves."
(when (window-live-p ranger-preview-window)
(with-current-buffer (window-buffer ranger-preview-window)
(local-unset-key [mouse-1]))))
(advice-add #'ranger-setup-preview :after #'+dired*cleanup-mouse1-bind)
(setq ranger-cleanup-on-disable t
emacs/dired: move ranger module to ranger feature in dired module
2018-12-07 22:27:03 -08:00
ranger-excluded-extensions '("mkv" "iso" "mp4")
emacs/dired: fix ranger oddities Added two hacks to fix two obnoxious issues Ranger has, having to do with it failing to clean up after itself. In particular: 1. A left over mouse-1 bind that traps focus in a particular window (easy to get around with keyboard-based window switch commands, but this renders the mouse useless), 2. And the lingering ranger header bar (i.e. it doesn't clean up header-line-format). This commit also ensures Deer overrides dired if +ranger is enabled.
2019-05-20 20:04:34 -04:00
ranger-deer-show-details t
emacs/dired: refactor #1038 + Removed ranger/dired-setup hook and performed its config globally + Lazy-loaded ranger + Removed unnecessary `:defer t`s (redundant with :commands and :hook) and `:commands` (redundant with :hook) + Set image-dired-dir before trying to create it, to give users an opportunity to modify it before it is created + Use sharp quotes consistently for keybind commands
2018-12-13 15:40:53 -05:00
ranger-max-preview-size 10
emacs/dired: ranger-show-literal = nil
2019-03-09 16:54:54 -05:00
ranger-show-literal nil
emacs/dired: fix ranger oddities Added two hacks to fix two obnoxious issues Ranger has, having to do with it failing to clean up after itself. In particular: 1. A left over mouse-1 bind that traps focus in a particular window (easy to get around with keyboard-based window switch commands, but this renders the mouse useless), 2. And the lingering ranger header bar (i.e. it doesn't clean up header-line-format). This commit also ensures Deer overrides dired if +ranger is enabled.
2019-05-20 20:04:34 -04:00
ranger-hide-cursor nil))
emacs/dired: move ranger module to ranger feature in dired module
2018-12-07 22:27:03 -08:00
(def-package! all-the-icons-dired
:when (featurep! +icons)
emacs/dired: refactor #1038 + Removed ranger/dired-setup hook and performed its config globally + Lazy-loaded ranger + Removed unnecessary `:defer t`s (redundant with :commands and :hook) and `:commands` (redundant with :hook) + Set image-dired-dir before trying to create it, to give users an opportunity to modify it before it is created + Use sharp quotes consistently for keybind commands
2018-12-13 15:40:53 -05:00
:hook (dired-mode . all-the-icons-dired-mode))
emacs/dired: move ranger module to ranger feature in dired module
2018-12-07 22:27:03 -08:00
(def-package! dired-x
fix: disable verbose message for dired-omit To avoid endless spam in *Messages*, disable "Omitted 2 lines" every time a new dired buffer is opened.
2018-12-27 16:37:44 +13:00
:hook (dired-mode . dired-omit-mode)
:config
(setq dired-omit-verbose nil))
Reference in a new issue Copy permalink