ebe4c60264
This reverts commit 29c78ce841 and all other fixes
that have been made afterwards.
The motivation is that use-package is seen by many as a replacement for
`require`. Is use-package always defer the loading of packages then is breaks
this use case, this does not respect POLA so even if it was making Spacemacs
loading faster (up to 3s faster on some startup on my machine) we just cannot
use it, it would be irresponsible. Spacemacs should be easy to use, loading
performance will come with time but it is not a priority.
270 lines
9.1 KiB
EmacsLisp
270 lines
9.1 KiB
EmacsLisp
;;; packages.el --- shell packages File for Spacemacs
|
|
;;
|
|
;; Copyright (c) 2012-2018 Sylvain Benner & Contributors
|
|
;;
|
|
;; Author: Sylvain Benner <sylvain.benner@gmail.com>
|
|
;; URL: https://github.com/syl20bnr/spacemacs
|
|
;;
|
|
;; This file is not part of GNU Emacs.
|
|
;;
|
|
;;; License: GPLv3
|
|
|
|
(setq shell-packages
|
|
'(
|
|
(comint :location built-in)
|
|
company
|
|
esh-help
|
|
(eshell :location built-in)
|
|
eshell-prompt-extras
|
|
eshell-z
|
|
helm
|
|
magit
|
|
multi-term
|
|
org
|
|
projectile
|
|
(shell :location built-in)
|
|
shell-pop
|
|
(term :location built-in)
|
|
xterm-color
|
|
vi-tilde-fringe
|
|
))
|
|
|
|
(defun shell/init-comint ()
|
|
(setq comint-prompt-read-only t)
|
|
(add-hook 'comint-mode-hook 'spacemacs/disable-hl-line-mode))
|
|
|
|
(defun shell/pre-init-company ()
|
|
;; support in eshell
|
|
(spacemacs|use-package-add-hook eshell
|
|
:post-init
|
|
(progn
|
|
(spacemacs|add-company-backends :backends company-capf :modes eshell-mode)
|
|
(add-hook 'eshell-directory-change-hook
|
|
'spacemacs//toggle-shell-auto-completion-based-on-path)
|
|
;; The default frontend screws everything up in short windows like
|
|
;; terminal often are
|
|
(add-hook 'eshell-mode-hook
|
|
'spacemacs//eshell-switch-company-frontend))))
|
|
|
|
(defun shell/init-esh-help ()
|
|
(use-package esh-help
|
|
:defer t
|
|
:init (add-hook 'eshell-mode-hook 'eldoc-mode)
|
|
:config (setup-esh-help-eldoc)))
|
|
|
|
(defun shell/init-eshell ()
|
|
(use-package eshell
|
|
:defer t
|
|
:init
|
|
(progn
|
|
(spacemacs/register-repl 'eshell 'eshell)
|
|
(setq eshell-cmpl-cycle-completions nil
|
|
;; auto truncate after 20k lines
|
|
eshell-buffer-maximum-lines 20000
|
|
;; history size
|
|
eshell-history-size 350
|
|
;; no duplicates in history
|
|
eshell-hist-ignoredups t
|
|
;; buffer shorthand -> echo foo > #'buffer
|
|
eshell-buffer-shorthand t
|
|
;; my prompt is easy enough to see
|
|
eshell-highlight-prompt nil
|
|
;; treat 'echo' like shell echo
|
|
eshell-plain-echo-behavior t
|
|
;; cache directory
|
|
eshell-directory-name (concat spacemacs-cache-directory "eshell/"))
|
|
|
|
(when shell-protect-eshell-prompt
|
|
(add-hook 'eshell-after-prompt-hook 'spacemacs//protect-eshell-prompt))
|
|
|
|
(autoload 'eshell-delchar-or-maybe-eof "em-rebind")
|
|
|
|
(add-hook 'eshell-mode-hook 'spacemacs//init-eshell)
|
|
(add-hook 'eshell-mode-hook 'spacemacs/disable-hl-line-mode))
|
|
:config
|
|
(progn
|
|
|
|
;; Work around bug in eshell's preoutput-filter code.
|
|
;; Eshell doesn't call preoutput-filter functions in the context of the eshell
|
|
;; buffer. This breaks the xterm color filtering when the eshell buffer is updated
|
|
;; when it's not currently focused.
|
|
;; To remove if/when fixed upstream.
|
|
(defun eshell-output-filter@spacemacs-with-buffer (fn process string)
|
|
(let ((proc-buf (if process (process-buffer process)
|
|
(current-buffer))))
|
|
(when proc-buf
|
|
(with-current-buffer proc-buf
|
|
(funcall fn process string)))))
|
|
(advice-add
|
|
#'eshell-output-filter
|
|
:around
|
|
#'eshell-output-filter@spacemacs-with-buffer)
|
|
|
|
(require 'esh-opt)
|
|
|
|
;; quick commands
|
|
(defalias 'eshell/e 'find-file-other-window)
|
|
(defalias 'eshell/d 'dired)
|
|
(setenv "PAGER" "cat")
|
|
|
|
;; support `em-smart'
|
|
(when shell-enable-smart-eshell
|
|
(require 'em-smart)
|
|
(setq eshell-where-to-jump 'begin
|
|
eshell-review-quick-commands nil
|
|
eshell-smart-space-goes-to-end t)
|
|
(add-hook 'eshell-mode-hook 'eshell-smart-initialize))
|
|
|
|
;; Visual commands
|
|
(require 'em-term)
|
|
(mapc (lambda (x) (push x eshell-visual-commands))
|
|
'("el" "elinks" "htop" "less" "ssh" "tmux" "top"))
|
|
|
|
;; automatically truncate buffer after output
|
|
(when (boundp 'eshell-output-filter-functions)
|
|
(push 'eshell-truncate-buffer eshell-output-filter-functions)))))
|
|
|
|
(defun shell/init-eshell-prompt-extras ()
|
|
(use-package eshell-prompt-extras
|
|
:commands epe-theme-lambda
|
|
:init
|
|
(setq eshell-highlight-prompt nil
|
|
eshell-prompt-function 'epe-theme-lambda)))
|
|
|
|
(defun shell/init-eshell-z ()
|
|
(use-package eshell-z
|
|
:defer t
|
|
:init
|
|
(with-eval-after-load 'eshell
|
|
(require 'eshell-z))))
|
|
|
|
(defun shell/pre-init-helm ()
|
|
(spacemacs|use-package-add-hook helm
|
|
:post-init
|
|
(progn
|
|
;; eshell
|
|
(add-hook 'eshell-mode-hook 'spacemacs/init-helm-eshell)
|
|
;;shell
|
|
(spacemacs/set-leader-keys-for-major-mode 'shell-mode
|
|
"H" 'spacemacs/helm-shell-history))))
|
|
|
|
(defun shell/pre-init-magit ()
|
|
(spacemacs|use-package-add-hook magit
|
|
:post-init
|
|
(defalias 's 'magit-status)))
|
|
|
|
(defun shell/init-multi-term ()
|
|
(use-package multi-term
|
|
:defer t
|
|
:init
|
|
(progn
|
|
(spacemacs/register-repl 'multi-term 'multi-term))
|
|
:config
|
|
(progn
|
|
(add-to-list 'term-bind-key-alist '("<tab>" . term-send-tab))
|
|
;; multi-term commands to create terminals and move through them.
|
|
(spacemacs/set-leader-keys-for-major-mode 'term-mode
|
|
"c" 'multi-term
|
|
"p" 'multi-term-prev
|
|
"n" 'multi-term-next))))
|
|
|
|
(defun shell/pre-init-org ()
|
|
(spacemacs|use-package-add-hook org
|
|
:post-config (add-to-list 'org-babel-load-languages '(shell . t))))
|
|
|
|
(defun shell/post-init-projectile ()
|
|
(spacemacs/set-leader-keys
|
|
"p'" 'spacemacs/projectile-shell-pop
|
|
"p$t" 'projectile-multi-term-in-root))
|
|
|
|
(defun shell/init-shell ()
|
|
(spacemacs/register-repl 'shell 'shell)
|
|
(defun shell-comint-input-sender-hook ()
|
|
"Check certain shell commands.
|
|
Executes the appropriate behavior for certain commands."
|
|
(setq comint-input-sender
|
|
(lambda (proc command)
|
|
(cond
|
|
;; Check for clear command and execute it.
|
|
((string-match "^[ \t]*clear[ \t]*$" command)
|
|
(comint-send-string proc "\n")
|
|
(erase-buffer))
|
|
;; Check for man command and execute it.
|
|
((string-match "^[ \t]*man[ \t]*" command)
|
|
(comint-send-string proc "\n")
|
|
(setq command (replace-regexp-in-string
|
|
"^[ \t]*man[ \t]*" "" command))
|
|
(setq command (replace-regexp-in-string
|
|
"[ \t]+$" "" command))
|
|
(funcall 'man command))
|
|
;; Send other commands to the default handler.
|
|
(t (comint-simple-send proc command))))))
|
|
(add-hook 'shell-mode-hook 'shell-comint-input-sender-hook)
|
|
(add-hook 'shell-mode-hook 'spacemacs/disable-hl-line-mode))
|
|
|
|
(defun shell/init-shell-pop ()
|
|
(use-package shell-pop
|
|
:defer t
|
|
:init
|
|
(progn
|
|
(setq shell-pop-window-position shell-default-position
|
|
shell-pop-window-size shell-default-height
|
|
shell-pop-term-shell shell-default-term-shell
|
|
shell-pop-full-span shell-default-full-span)
|
|
(make-shell-pop-command eshell)
|
|
(make-shell-pop-command shell)
|
|
(make-shell-pop-command term shell-pop-term-shell)
|
|
(make-shell-pop-command multiterm)
|
|
(make-shell-pop-command ansi-term shell-pop-term-shell)
|
|
|
|
(add-hook 'term-mode-hook 'ansi-term-handle-close)
|
|
(add-hook 'term-mode-hook (lambda () (linum-mode -1)))
|
|
|
|
(spacemacs/set-leader-keys
|
|
"'" 'spacemacs/default-pop-shell
|
|
"ase" 'spacemacs/shell-pop-eshell
|
|
"asi" 'spacemacs/shell-pop-shell
|
|
"asm" 'spacemacs/shell-pop-multiterm
|
|
"ast" 'spacemacs/shell-pop-ansi-term
|
|
"asT" 'spacemacs/shell-pop-term))))
|
|
|
|
(defun shell/init-term ()
|
|
(spacemacs/register-repl 'term 'term)
|
|
(spacemacs/register-repl 'term 'ansi-term)
|
|
(defun term-send-tab ()
|
|
"Send tab in term mode."
|
|
(interactive)
|
|
(term-send-raw-string "\t"))
|
|
;; hack to fix pasting issue, the paste transient-state won't
|
|
;; work in term
|
|
(evil-define-key 'normal term-raw-map "p" 'term-paste)
|
|
(evil-define-key 'insert term-raw-map (kbd "C-c C-d") 'term-send-eof)
|
|
(evil-define-key 'insert term-raw-map (kbd "C-c C-z") 'term-stop-subjob)
|
|
(evil-define-key 'insert term-raw-map (kbd "<tab>") 'term-send-tab)
|
|
|
|
(when (eq dotspacemacs-editing-style 'vim)
|
|
(evil-define-key 'insert term-raw-map
|
|
(kbd "C-k") 'term-send-up
|
|
(kbd "C-j") 'term-send-down))
|
|
(evil-define-key 'normal term-raw-map
|
|
(kbd "C-k") 'term-send-up
|
|
(kbd "C-j") 'term-send-down)
|
|
|
|
(add-hook 'term-mode-hook 'spacemacs/disable-hl-line-mode))
|
|
|
|
(defun shell/init-xterm-color ()
|
|
(use-package xterm-color
|
|
:init
|
|
(progn
|
|
;; Comint and Shell
|
|
(add-hook 'comint-preoutput-filter-functions 'xterm-color-filter)
|
|
(setq comint-output-filter-functions
|
|
(remove 'ansi-color-process-output comint-output-filter-functions))
|
|
(add-hook 'eshell-mode-hook 'spacemacs/init-eshell-xterm-color))))
|
|
|
|
(defun shell/post-init-vi-tilde-fringe ()
|
|
(spacemacs/add-to-hooks 'spacemacs/disable-vi-tilde-fringe
|
|
'(comint-mode-hook
|
|
eshell-mode-hook
|
|
shell-mode-hook
|
|
term-mode-hook)))
|