emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

tools/eshell: major refactor & update

Browse source
This commit is contained in:
Henrik Lissner 2018-03-23 18:17:59 -04:00
parent 691c914a15
commit 38a5e73e2e
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
3 changed files with 69 additions and 95 deletions
Download patch file Download diff file Expand all files Collapse all files

57
modules/tools/eshell/config.el
View file

@ -12,65 +12,56 @@
:commands eshell-mode
:init
(setq eshell-directory-name (concat doom-etc-dir "/eshell")
eshell-rc-script "~/.eshellrc"
eshell-aliases-file "~/.eshell_aliases"
;;
eshell-scroll-to-bottom-on-input 'all
eshell-scroll-to-bottom-on-output 'all
eshell-buffer-shorthand t
eshell-kill-processes-on-exit t
eshell-error-if-no-glob t
eshell-hist-ignoredups t
;; em-prompt
eshell-prompt-regexp "^.* λ "
eshell-prompt-function #'+eshell-prompt
;; em-glob
eshell-glob-case-insensitive t
eshell-error-if-no-glob t
;; em-alias
eshell-aliases-file (concat doom-local-dir ".eshell-aliases"))
eshell-error-if-no-glob t)
:config
(set! :evil-state 'eshell-mode 'insert)
;; Keep track of open eshell buffers
(add-hook 'eshell-mode-hook #'+eshell|init)
(add-hook 'eshell-exit-hook #'+eshell|cleanup)
(after! em-alias
(setq eshell-command-aliases-list
(append eshell-command-aliases-list
'(("q" "exit")
("l" "ls -1")
("ll" "ls -l")
("la" "ls -la")
("g" "hub")
("gs" "hub status --short .")))))
(after! em-term
;; Visual commands require a proper terminal. Eshell can't handle that, so it
;; delegates these commands to a term buffer.
(nconc eshell-visual-commands '("tmux" "htop" "bash" "zsh" "fish" "vim" "nvim"))
(setq eshell-visual-subcommands '(("git" "log" "l" "diff" "show"))))
(setq eshell-visual-commands
(append eshell-visual-commands '("tmux" "htop" "bash" "zsh" "fish" "vim" "nvim"))
eshell-visual-subcommands '(("git" "log" "l" "diff" "show"))))
(defun +eshell|init-keymap ()
"Setup eshell keybindings. This must be done in a hook because eshell-mode
redefines its keys every time `eshell-mode' is enabled."
(map! :map eshell-mode-map
:n "i" #'+eshell/evil-prepend-maybe
:n "I" #'+eshell/evil-prepend
:n "a" #'+eshell/evil-append-maybe
:n "A" #'+eshell/evil-append
:n "r" #'+eshell/evil-replace-maybe
:n "R" #'+eshell/evil-replace-state-maybe
:n "c" #'+eshell/evil-change
:n "C" #'+eshell/evil-change-line
:i [tab] #'eshell-pcomplete
:i "SPC" #'self-insert-command
:i "C-u" #'eshell-kill-input
:i "C-a" #'eshell-bol
:i "C-d" #'+eshell/quit-or-delete-char
:i "C-k" #'kill-line
:i "C-p" #'eshell-previous-input
:i "<up>" #'eshell-previous-input
:i "C-n" #'eshell-next-input
:i "<down>" #'eshell-next-input
:m "<return>" #'+eshell/evil-append
:n [remap evil-record-macro] #'eshell-life-is-too-much
[remap kill-this-buffer] #'eshell-life-is-too-much))
(add-hook 'eshell-mode-hook #'+eshell|init-keymap)
;; Aliases
(setq eshell-command-aliases-list
'(("q" "exit")
("l" "ls -1")
("ll" "ls -l")
("la" "ls -la")
("g" "hub")
("gs" "hub status --short ."))))
[remap doom/backward-to-bol-or-indent] #'eshell-bol
[remap doom/backward-kill-to-bol-and-indent] #'eshell-kill-input
[remap evil-window-split] #'+eshell/split
[remap evil-window-vsplit] #'+eshell/vsplit))
(add-hook 'eshell-first-time-mode-hook #'+eshell|init-keymap))