b30c393b8d
The motivation is to clean redundent actions and bring more consistency between `SPC b` and `SPC w` by: - using capital letters for ace-window actions - reusing the same letters between window and buffer when possible - adding support for universal prefix argument to delete both window and buffer Details of changes: Buffer - `SPC b k` has been removed since the functionality is available directly in Helm by selecting the kill buffer action - `SPC b m` (buffer move) has been removed because the functionality is available via `SPC w` with `SPC w h/j/k/l`, `SPC w H/J/K/L` and `SPC w M` (see window section for the new `SPC w M`). - `SPC b K` (kill other buffers) is now `SPC b m` to map with `SPC w m` (kill other window or maximize). Using the universal prefix argument `SPC u SPC b m` will also kill the windows. - `SPC b C-k` (kill buffer matching regexp) is now simply on `SPC b k`. - `SPC b D` now kills a buffer using ace-window. - `SPC b d` and `SPC b D` now accept an universal prefix argument to also delete the window. So `SPC u SPC b d` and `SPC u SPC b D` delete the buffer and the window. Window - `SPC w M` now swap the window using ace-window. - old `SPC w M` (center window) is now on `SPC w c` and `SPC w C` uses ace-window. - `SPC w SPC` (select window) is now on `SPC w W` since it uses ace-window. - `SPC w d` and `SPC w D` now accepts an universal prefix argument to delete the window and the buffer.
496 lines
18 KiB
EmacsLisp
496 lines
18 KiB
EmacsLisp
;;; packages.el --- Spacemacs Base Layer packages File
|
|
;;
|
|
;; Copyright (c) 2012-2016 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 spacemacs-base-packages
|
|
'(
|
|
(abbrev :location built-in)
|
|
ace-window
|
|
(bookmark :location built-in)
|
|
(dired :location built-in)
|
|
(dired-x :location built-in)
|
|
(electric-indent-mode :location built-in)
|
|
(ediff :location built-in)
|
|
(eldoc :location built-in)
|
|
evil-escape
|
|
(evil-evilified-state :location local :step pre :protected t)
|
|
evil-visualstar
|
|
exec-path-from-shell
|
|
help-fns+
|
|
(hi-lock :location built-in)
|
|
(holy-mode :location local :step pre)
|
|
(hybrid-mode :location local :step pre)
|
|
(image-mode :location built-in)
|
|
(linum :location built-in)
|
|
(package-menu :location built-in)
|
|
;; page-break-lines is shipped with spacemacs core
|
|
(page-break-lines :location built-in)
|
|
pcre2el
|
|
(process-menu :location built-in)
|
|
projectile
|
|
(recentf :location built-in)
|
|
(savehist :location built-in)
|
|
(saveplace :location built-in)
|
|
spacemacs-theme
|
|
(subword :location built-in)
|
|
(tar-mode :location built-in)
|
|
(uniquify :location built-in)
|
|
(url :location built-in)
|
|
(visual-line-mode :location built-in)
|
|
(whitespace :location built-in)
|
|
(winner :location built-in)
|
|
))
|
|
|
|
;; Initialization of packages
|
|
|
|
(defun spacemacs-base/init-abbrev ()
|
|
(spacemacs|hide-lighter abbrev-mode))
|
|
|
|
(defun spacemacs-base/init-ace-window ()
|
|
(use-package ace-window
|
|
:defer t
|
|
:init
|
|
(progn
|
|
(spacemacs/set-leader-keys
|
|
"bD" 'spacemacs/ace-kill-this-buffer
|
|
"wC" 'spacemacs/ace-center-window
|
|
"wD" 'spacemacs/ace-delete-window
|
|
"wM" 'ace-swap-window
|
|
"wW" 'ace-window)
|
|
;; set ace-window keys to home-row
|
|
(setq aw-keys '(?a ?s ?d ?f ?g ?h ?j ?k ?l)))))
|
|
|
|
(defun spacemacs-base/init-bookmark ()
|
|
(use-package bookmark
|
|
:defer t
|
|
:init
|
|
(progn
|
|
(setq bookmark-default-file (concat spacemacs-cache-directory "bookmarks")
|
|
;; autosave each change
|
|
bookmark-save-flag 1)
|
|
(spacemacs/set-leader-keys "fb" 'bookmark-jump))))
|
|
|
|
(defun spacemacs-base/init-dired ()
|
|
(spacemacs/set-leader-keys
|
|
"ad" 'dired
|
|
"fj" 'dired-jump
|
|
"jd" 'dired-jump
|
|
"jD" 'dired-jump-other-window))
|
|
|
|
(defun spacemacs-base/init-dired-x ()
|
|
(use-package dired-x
|
|
:commands (dired-jump
|
|
dired-jump-other-window
|
|
dired-omit-mode)))
|
|
|
|
(defun spacemacs-base/init-electric-indent-mode ()
|
|
(electric-indent-mode))
|
|
|
|
(defun spacemacs-base/init-visual-line-mode ()
|
|
(spacemacs|diminish visual-line-mode " Ⓛ" " L"))
|
|
|
|
;; notes from mijoharas
|
|
;; We currently just set a few variables to make it look nicer.
|
|
;; Here is my first attempt at evilifying the buffer, does not work correctly, help is very much welcome.
|
|
|
|
;; ```
|
|
;; (defun ediff/setup-ediff-keymaps ()
|
|
;; "setup the evil ediff keymap"
|
|
;; (progn
|
|
;; (add-to-list 'evil-emacs-state-modes 'Ediff)
|
|
;; (evilified-state-evilify ediff-mode-map)
|
|
;; (spacemacs/activate-evil-leader-for-map 'ediff-mode-map)
|
|
;; )
|
|
;; )
|
|
|
|
;; ;; inside the use-package function
|
|
;; (add-hook 'ediff-keymap-setup-hook 'ediff/setup-ediff-keymaps)
|
|
;; ```
|
|
(defun spacemacs-base/init-ediff ()
|
|
(use-package ediff
|
|
:defer t
|
|
:init
|
|
(progn
|
|
;; first we set some sane defaults
|
|
(setq-default
|
|
ediff-window-setup-function 'ediff-setup-windows-plain
|
|
;; emacs is evil and decrees that vertical shall henceforth be horizontal
|
|
ediff-split-window-function 'split-window-horizontally
|
|
ediff-merge-split-window-function 'split-window-horizontally)
|
|
;; restore window layout when done
|
|
(add-hook 'ediff-quit-hook #'winner-undo))))
|
|
|
|
(defun spacemacs-base/init-eldoc ()
|
|
(use-package eldoc
|
|
:defer t
|
|
:config
|
|
(progn
|
|
;; enable eldoc in `eval-expression'
|
|
(add-hook 'eval-expression-minibuffer-setup-hook #'eldoc-mode)
|
|
;; enable eldoc in IELM
|
|
(add-hook 'ielm-mode-hook #'eldoc-mode)
|
|
;; don't display eldoc on modeline
|
|
(spacemacs|hide-lighter eldoc-mode))))
|
|
|
|
(defun spacemacs-base/init-evil-escape ()
|
|
(use-package evil-escape
|
|
:init (evil-escape-mode)
|
|
:config (spacemacs|hide-lighter evil-escape-mode)))
|
|
|
|
(defun spacemacs-base/init-evil-evilified-state ()
|
|
(use-package evil-evilified-state)
|
|
(define-key evil-evilified-state-map (kbd dotspacemacs-leader-key)
|
|
spacemacs-default-map))
|
|
|
|
(defun spacemacs-base/init-evil-visualstar ()
|
|
(use-package evil-visualstar
|
|
:commands (evil-visualstar/begin-search-forward
|
|
evil-visualstar/begin-search-backward)
|
|
:init
|
|
(progn
|
|
(define-key evil-visual-state-map (kbd "*")
|
|
'evil-visualstar/begin-search-forward)
|
|
(define-key evil-visual-state-map (kbd "#")
|
|
'evil-visualstar/begin-search-backward))))
|
|
|
|
(defun spacemacs-base/init-exec-path-from-shell ()
|
|
(use-package exec-path-from-shell
|
|
:init (when (memq window-system '(mac ns x))
|
|
(exec-path-from-shell-initialize))))
|
|
|
|
(defun spacemacs-base/init-help-fns+ ()
|
|
(use-package help-fns+
|
|
:commands (describe-keymap)
|
|
:init (spacemacs/set-leader-keys "hdK" 'describe-keymap)))
|
|
|
|
(defun spacemacs-base/init-hi-lock ()
|
|
(with-eval-after-load 'hi-lock
|
|
(spacemacs|hide-lighter hi-lock-mode)))
|
|
|
|
(defun spacemacs-base/init-holy-mode ()
|
|
(use-package holy-mode
|
|
:commands holy-mode
|
|
:init
|
|
(progn
|
|
(when (eq 'emacs dotspacemacs-editing-style)
|
|
(holy-mode))
|
|
(spacemacs|add-toggle holy-mode
|
|
:status holy-mode
|
|
:on (progn (when (bound-and-true-p hybrid-mode)
|
|
(hybrid-mode -1))
|
|
(holy-mode))
|
|
:off (holy-mode -1)
|
|
:documentation "Globally toggle holy mode."
|
|
:evil-leader "tEe")
|
|
(spacemacs|diminish holy-mode " Ⓔe" " Ee"))))
|
|
|
|
(defun spacemacs-base/init-hybrid-mode ()
|
|
(use-package hybrid-mode
|
|
:config
|
|
(progn
|
|
(when (eq 'hybrid dotspacemacs-editing-style) (hybrid-mode))
|
|
(spacemacs|add-toggle hybrid-mode
|
|
:status hybrid-mode
|
|
:on (progn (when (bound-and-true-p holy-mode)
|
|
(holy-mode -1))
|
|
(hybrid-mode))
|
|
:off (hybrid-mode -1)
|
|
:documentation "Globally toggle hybrid mode."
|
|
:evil-leader "tEh")
|
|
(spacemacs|diminish hybrid-mode " Ⓔh" " Eh"))))
|
|
|
|
(defun spacemacs-base/init-image-mode ()
|
|
(use-package image-mode
|
|
:config (evilified-state-evilify-map image-mode-map
|
|
:mode image-mode)))
|
|
|
|
(defun spacemacs-base/init-linum ()
|
|
(when dotspacemacs-line-numbers
|
|
(add-hook 'prog-mode-hook 'linum-mode)
|
|
(add-hook 'text-mode-hook 'linum-mode))
|
|
(setq linum-format "%4d")
|
|
(spacemacs|add-toggle line-numbers
|
|
:mode linum-mode
|
|
:documentation "Show the line numbers."
|
|
:evil-leader "tn"))
|
|
|
|
(defun spacemacs-base/init-package-menu ()
|
|
(evilified-state-evilify-map package-menu-mode-map
|
|
:mode package-menu-mode))
|
|
|
|
(defun spacemacs-base/init-page-break-lines ()
|
|
(require 'page-break-lines)
|
|
(global-page-break-lines-mode t)
|
|
(spacemacs|hide-lighter page-break-lines-mode))
|
|
|
|
(defun spacemacs-base/init-pcre2el ()
|
|
(use-package pcre2el
|
|
:defer t
|
|
:init
|
|
(progn
|
|
(spacemacs/declare-prefix "xr" "regular expressions")
|
|
(spacemacs/declare-prefix "xre" "elisp")
|
|
(spacemacs/declare-prefix "xrp" "pcre")
|
|
(spacemacs/set-leader-keys
|
|
"xr/" 'rxt-explain
|
|
"xr'" 'rxt-convert-to-strings
|
|
"xrt" 'rxt-toggle-elisp-rx
|
|
"xrx" 'rxt-convert-to-rx
|
|
"xrc" 'rxt-convert-syntax
|
|
"xre/" 'rxt-explain-elisp
|
|
"xre'" 'rxt-elisp-to-strings
|
|
"xrep" 'rxt-elisp-to-pcre
|
|
"xret" 'rxt-toggle-elisp-rx
|
|
"xrex" 'rxt-elisp-to-rx
|
|
"xrp/" 'rxt-explain-pcre
|
|
"xrp'" 'rxt-pcre-to-strings
|
|
"xrpe" 'rxt-pcre-to-elisp
|
|
"xrpx" 'rxt-pcre-to-rx))))
|
|
|
|
(defun spacemacs-base/init-process-menu ()
|
|
(evilified-state-evilify process-menu-mode process-menu-mode-map))
|
|
|
|
(defun spacemacs-base/init-projectile ()
|
|
(use-package projectile
|
|
:commands (projectile-ack
|
|
projectile-ag
|
|
projectile-compile-project
|
|
projectile-dired
|
|
projectile-find-dir
|
|
projectile-find-file
|
|
projectile-find-tag
|
|
projectile-test-project
|
|
projectile-grep
|
|
projectile-invalidate-cache
|
|
projectile-kill-buffers
|
|
projectile-multi-occur
|
|
projectile-project-p
|
|
projectile-project-root
|
|
projectile-recentf
|
|
projectile-regenerate-tags
|
|
projectile-replace
|
|
projectile-replace-regexp
|
|
projectile-run-async-shell-command-in-root
|
|
projectile-run-shell-command-in-root
|
|
projectile-switch-project
|
|
projectile-switch-to-buffer
|
|
projectile-vc)
|
|
:init
|
|
(progn
|
|
;; note for Windows: GNU find or Cygwin find must be in path to enable
|
|
;; fast indexing
|
|
(when (and (spacemacs/system-is-mswindows) (executable-find "find"))
|
|
(setq projectile-indexing-method 'alien
|
|
projectile-generic-command "find . -type f"))
|
|
(setq projectile-sort-order 'recentf
|
|
projectile-cache-file (concat spacemacs-cache-directory
|
|
"projectile.cache")
|
|
projectile-known-projects-file (concat spacemacs-cache-directory
|
|
"projectile-bookmarks.eld"))
|
|
(spacemacs/set-leader-keys
|
|
"pb" 'projectile-switch-to-buffer
|
|
"pd" 'projectile-find-dir
|
|
"pf" 'projectile-find-file
|
|
"pF" 'projectile-find-file-dwim
|
|
"ph" 'helm-projectile
|
|
"pr" 'projectile-recentf
|
|
"pp" 'projectile-switch-project
|
|
"pv" 'projectile-vc)
|
|
(spacemacs/set-leader-keys
|
|
"p!" 'projectile-run-shell-command-in-root
|
|
"p&" 'projectile-run-async-shell-command-in-root
|
|
"p%" 'projectile-replace-regexp
|
|
"pa" 'projectile-toggle-between-implementation-and-test
|
|
"pc" 'projectile-compile-project
|
|
"pD" 'projectile-dired
|
|
"pG" 'projectile-regenerate-tags
|
|
"pI" 'projectile-invalidate-cache
|
|
"pk" 'projectile-kill-buffers
|
|
"po" 'projectile-multi-occur
|
|
"pR" 'projectile-replace
|
|
"pT" 'projectile-test-project
|
|
"py" 'projectile-find-tag))
|
|
:config
|
|
(progn
|
|
(projectile-global-mode)
|
|
(spacemacs|hide-lighter projectile-mode))))
|
|
|
|
(defun spacemacs-base/init-recentf ()
|
|
(use-package recentf
|
|
:defer t
|
|
:init
|
|
(progn
|
|
;; lazy load recentf
|
|
(add-hook 'find-file-hook (lambda () (unless recentf-mode
|
|
(recentf-mode)
|
|
(recentf-track-opened-file))))
|
|
(setq recentf-save-file (concat spacemacs-cache-directory "recentf")
|
|
recentf-max-saved-items 1000
|
|
recentf-auto-cleanup 'never
|
|
recentf-auto-save-timer (run-with-idle-timer 600 t
|
|
'recentf-save-list)))
|
|
:config
|
|
(progn
|
|
(add-to-list 'recentf-exclude
|
|
(expand-file-name spacemacs-cache-directory))
|
|
(add-to-list 'recentf-exclude (expand-file-name package-user-dir))
|
|
(add-to-list 'recentf-exclude "COMMIT_EDITMSG\\'"))))
|
|
|
|
(defun spacemacs-base/init-savehist ()
|
|
(use-package savehist
|
|
:init
|
|
(progn
|
|
;; Minibuffer history
|
|
(setq savehist-file (concat spacemacs-cache-directory "savehist")
|
|
enable-recursive-minibuffers t ; Allow commands in minibuffers
|
|
history-length 1000
|
|
savehist-additional-variables '(mark-ring
|
|
global-mark-ring
|
|
search-ring
|
|
regexp-search-ring
|
|
extended-command-history)
|
|
savehist-autosave-interval 60)
|
|
(savehist-mode t))))
|
|
|
|
(defun spacemacs-base/init-saveplace ()
|
|
(use-package saveplace
|
|
:init
|
|
(progn
|
|
(if (fboundp 'save-place-mode)
|
|
;; Emacs 25 has a proper mode for `save-place'
|
|
(save-place-mode)
|
|
(setq save-place t))
|
|
;; Save point position between sessions
|
|
(setq save-place-file (concat spacemacs-cache-directory "places")))))
|
|
|
|
(defun spacemacs-base/init-spacemacs-theme ()
|
|
(use-package spacemacs-theme
|
|
:defer t
|
|
:init
|
|
(progn
|
|
(setq spacemacs-theme-comment-bg t)
|
|
(setq spacemacs-theme-org-height t))))
|
|
|
|
(defun spacemacs-base/init-subword ()
|
|
(use-package subword
|
|
:defer t
|
|
:init
|
|
(progn
|
|
(unless (category-docstring ?U)
|
|
(define-category ?U "Uppercase")
|
|
(define-category ?u "Lowercase"))
|
|
(modify-category-entry (cons ?A ?Z) ?U)
|
|
(modify-category-entry (cons ?a ?z) ?u)
|
|
(make-variable-buffer-local 'evil-cjk-word-separating-categories)
|
|
(defun spacemacs//subword-enable-camel-case ()
|
|
"Add support for camel case to subword."
|
|
(if subword-mode
|
|
(push '(?u . ?U) evil-cjk-word-separating-categories)
|
|
(setq evil-cjk-word-separating-categories
|
|
(default-value 'evil-cjk-word-separating-categories))))
|
|
(add-hook 'subword-mode-hook 'spacemacs//subword-enable-camel-case)
|
|
(spacemacs|add-toggle camel-case-motion
|
|
:mode subword-mode
|
|
:documentation "Toggle CamelCase motions."
|
|
:evil-leader "tc")
|
|
(spacemacs|add-toggle camel-case-motion-globally
|
|
:mode global-subword-mode
|
|
:documentation "Globally toggle CamelCase motions."
|
|
:evil-leader "t C-c"))
|
|
:config
|
|
(spacemacs|diminish subword-mode " ⓒ" " c")))
|
|
|
|
(defun spacemacs-base/init-tar-mode ()
|
|
(evilified-state-evilify-map tar-mode-map
|
|
:mode tar-mode
|
|
:eval-after-load tar-mode))
|
|
|
|
(defun spacemacs-base/init-uniquify ()
|
|
(require 'uniquify)
|
|
;; When having windows with repeated filenames, uniquify them
|
|
;; by the folder they are in rather those annoying <2>,<3>,.. etc
|
|
(setq uniquify-buffer-name-style 'post-forward-angle-brackets
|
|
;; don't screw special buffers
|
|
uniquify-ignore-buffers-re "^\\*"))
|
|
|
|
(defun spacemacs-base/init-url ()
|
|
;; gravatars from magit use this to store their cache
|
|
(setq url-configuration-directory (concat spacemacs-cache-directory "url/")))
|
|
|
|
(defun spacemacs-base/init-whitespace ()
|
|
(use-package whitespace
|
|
:defer t
|
|
:init
|
|
(progn
|
|
(setq spacemacs-show-trailing-whitespace t)
|
|
(defun spacemacs//show-trailing-whitespace ()
|
|
(when spacemacs-show-trailing-whitespace
|
|
(set-face-attribute 'trailing-whitespace nil
|
|
:background
|
|
(face-attribute 'font-lock-comment-face
|
|
:foreground))
|
|
(setq show-trailing-whitespace 1)))
|
|
(add-hook 'prog-mode-hook 'spacemacs//show-trailing-whitespace)
|
|
|
|
(spacemacs|add-toggle whitespace
|
|
:mode whitespace-mode
|
|
:documentation "Display whitespace."
|
|
:evil-leader "tw")
|
|
(spacemacs|add-toggle whitespace-globally
|
|
:mode global-whitespace-mode
|
|
:documentation "Display whitespace globally."
|
|
:evil-leader "t C-w")
|
|
|
|
(defun spacemacs//set-whitespace-style-for-diff ()
|
|
"Whitespace configuration for `diff-mode'"
|
|
(setq-local whitespace-style '(face
|
|
tabs
|
|
tab-mark
|
|
spaces
|
|
space-mark
|
|
trailing
|
|
indentation::space
|
|
indentation::tab
|
|
newline
|
|
newline-mark)))
|
|
(add-hook 'diff-mode-hook 'whitespace-mode)
|
|
(add-hook 'diff-mode-hook 'spacemacs//set-whitespace-style-for-diff))
|
|
:config
|
|
(progn
|
|
(set-face-attribute 'whitespace-space nil
|
|
:background nil
|
|
:foreground (face-attribute 'font-lock-warning-face
|
|
:foreground))
|
|
(set-face-attribute 'whitespace-tab nil
|
|
:background nil)
|
|
(set-face-attribute 'whitespace-indentation nil
|
|
:background nil)
|
|
(spacemacs|diminish whitespace-mode " ⓦ" " w")
|
|
(spacemacs|diminish global-whitespace-mode " ⓦ" " w"))))
|
|
|
|
(defun spacemacs-base/init-winner ()
|
|
(use-package winner
|
|
:init
|
|
(progn
|
|
(winner-mode t)
|
|
(setq spacemacs/winner-boring-buffers '("*Completions*"
|
|
"*Compile-Log*"
|
|
"*inferior-lisp*"
|
|
"*Fuzzy Completions*"
|
|
"*Apropos*"
|
|
"*Help*"
|
|
"*cvs*"
|
|
"*Buffer List*"
|
|
"*Ibuffer*"
|
|
"*esh command on file*"
|
|
))
|
|
(setq winner-boring-buffers
|
|
(append winner-boring-buffers spacemacs/winner-boring-buffers))
|
|
(winner-mode t))))
|