TakeV
/
spacemacs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

evilified-state: Make into local package

This commit is contained in:
justbur 2015-11-05 08:09:00 -05:00 committed by syl20bnr
parent 0b2efd4e4e
commit b294461957
29 changed files with 451 additions and 391 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/core-spacemacs.el
View File

@ -150,7 +150,6 @@ initialization."
;; Use C-u as scroll-up (must be set before actually loading evil)
(spacemacs/load-or-install-protected-package 'evil t)
(spacemacs/load-or-install-protected-package 'evil-leader t)
(require 'core-evilified-state)
;; check for new version
(if dotspacemacs-mode-line-unicode-symbols
(setq-default spacemacs-version-check-lighter "[⇪]"))

40
tests/core/core-evilified-state-ftest.el → layers/+distribution/spacemacs-base/local/evilified-state/evilified-state-ftest.el
View File

@ -30,7 +30,7 @@
evil-map))
(input-map (make-sparse-keymap)))
(define-key input-map "s" 'func)
(spacemacs|evilify-map input-map)
(evilified-state-evilify-map input-map)
(should (equal '((115 . func)
(evilified-state
keymap "Auxiliary keymap for Evilified state"
@ -45,7 +45,7 @@
evil-map))
(input-map (make-sparse-keymap)))
(define-key input-map "s" 'func)
(spacemacs|evilify-map input-map)
(evilified-state-evilify-map input-map)
(should (equal '((115 . func)
(evilified-state
keymap "Auxiliary keymap for Evilified state"
@ -61,7 +61,7 @@
(input-map (make-sparse-keymap)))
(define-key input-map "s" 'func1)
(define-key input-map "S" 'func2)
(spacemacs|evilify-map input-map)
(evilified-state-evilify-map input-map)
(should (equal '((115 . func1)
(83 . func2)
(evilified-state
@ -78,7 +78,7 @@
(input-map (make-sparse-keymap)))
(define-key input-map "S" 'func2)
(define-key input-map "s" 'func1)
(spacemacs|evilify-map input-map)
(evilified-state-evilify-map input-map)
(should (equal '((115 . func1)
(83 . func2)
(evilified-state
@ -96,7 +96,7 @@
(input-map (make-sparse-keymap)))
(define-key input-map "s" 'func1)
(define-key input-map "S" 'func2)
(spacemacs|evilify-map input-map)
(evilified-state-evilify-map input-map)
(should (equal '((115 . func1)
(83 . func2)
(evilified-state
@ -115,7 +115,7 @@
(input-map (make-sparse-keymap)))
(define-key input-map "S" 'func2)
(define-key input-map "s" 'func1)
(spacemacs|evilify-map input-map)
(evilified-state-evilify-map input-map)
(should (equal '((115 . func1)
(83 . func2)
(evilified-state
@ -134,7 +134,7 @@
(define-key input-map "s" 'func1)
(define-key input-map "S" 'func2)
(define-key input-map (kbd "C-s") 'func3)
(spacemacs|evilify-map input-map)
(evilified-state-evilify-map input-map)
(should (equal '((115 . func1)
(83 . func2)
(19 . func3)
@ -154,7 +154,7 @@
(define-key input-map "s" 'func1)
(define-key input-map (kbd "C-s") 'func3)
(define-key input-map "S" 'func2)
(spacemacs|evilify-map input-map)
(evilified-state-evilify-map input-map)
(should (equal '((115 . func1)
(83 . func2)
(19 . func3)
@ -179,7 +179,7 @@
((spacemacs-buffer/warning (msg &rest args)
((:record-cls 'mocker-stub-record
:output nil :occur 1))))
(spacemacs|evilify-map input-map)
(evilified-state-evilify-map input-map)
(should (equal '((115 . func1)
(83 . func2)
(19 . func3)
@ -204,7 +204,7 @@
((spacemacs-buffer/warning (msg &rest args)
((:record-cls 'mocker-stub-record
:output nil :occur 1))))
(spacemacs|evilify-map input-map)
(evilified-state-evilify-map input-map)
(should (equal '((115 . func1)
(83 . func2)
(19 . func3)
@ -226,7 +226,7 @@
(submap (make-sparse-keymap)))
(define-key input-map "s" submap)
(define-key submap "t" 'func)
(spacemacs|evilify-map input-map)
(evilified-state-evilify-map input-map)
(should (equal '((115 keymap (116 . func))
(evilified-state
keymap "Auxiliary keymap for Evilified state"
@ -243,7 +243,7 @@
(submap (make-sparse-keymap)))
(define-key input-map "s" submap)
(define-key submap "t" 'func)
(spacemacs|evilify-map input-map)
(evilified-state-evilify-map input-map)
(should (equal '((115 keymap (116 . func))
(evilified-state
keymap "Auxiliary keymap for Evilified state"
@ -261,7 +261,7 @@
(define-key input-map "s" submap)
(define-key input-map "S" submap)
(define-key submap "t" 'func)
(spacemacs|evilify-map input-map)
(evilified-state-evilify-map input-map)
(should (equal '((115 keymap (116 . func))
(83 keymap (116 . func))
(evilified-state
@ -281,7 +281,7 @@
(define-key input-map "s" submap)
(define-key input-map "S" submap)
(define-key submap "t" 'func)
(spacemacs|evilify-map input-map)
(evilified-state-evilify-map input-map)
(should (equal '((115 keymap (116 . func))
(83 keymap (116 . func))
(evilified-state
@ -302,7 +302,7 @@
(define-key input-map "S" submap)
(define-key input-map (kbd "C-s") submap)
(define-key submap "t" 'func)
(spacemacs|evilify-map input-map)
(evilified-state-evilify-map input-map)
(should (equal '((115 keymap (116 . func))
(83 keymap (116 . func))
(19 keymap (116 . func))
@ -329,7 +329,7 @@
((spacemacs-buffer/warning (msg &rest args)
((:record-cls 'mocker-stub-record
:output nil :occur 1))))
(spacemacs|evilify-map input-map)
(evilified-state-evilify-map input-map)
(should (equal '((115 keymap (116 . func))
(83 keymap (116 . func))
(19 keymap (116 . func))
@ -352,7 +352,7 @@
(define-key input-map "s" 'func)
(define-key input-map "S" submap)
(define-key submap "t" 'func)
(spacemacs|evilify-map input-map)
(evilified-state-evilify-map input-map)
(should (equal '((115 . func)
(83 keymap (116 . func))
(evilified-state
@ -376,7 +376,7 @@
(define-key input-map "S" submap)
(define-key submap "t" 'func)
(dotimes (_ 10)
(spacemacs|evilify-map input-map))
(evilified-state-evilify-map input-map))
(should (equal '((115 . func2)
(101 . func1)
(83 keymap (116 . func))
@ -397,7 +397,7 @@
(input-map (make-sparse-keymap)))
(define-key input-map "s" 'func)
;; pass a feature already loaded at the time of calling
(spacemacs|evilify-map input-map :eval-after-load core-funcs)
(evilified-state-evilify-map input-map :eval-after-load core-funcs)
(should (equal '((115 . func)
(evilified-state
keymap "Auxiliary keymap for Evilified state"
@ -411,7 +411,7 @@
evil-map))
(input-map (make-sparse-keymap)))
(define-key input-map "s" 'func)
(spacemacs|evilify-map input-map :eval-after-load dummy-feature)
(evilified-state-evilify-map input-map :eval-after-load dummy-feature)
;; unmodified keymap since `dummy-feature' is not loaded
(should (equal '((115 . func))
(spacemacs//evilify-sort-keymap input-map)))))

0
tests/core/core-evilified-state-utest.el → layers/+distribution/spacemacs-base/local/evilified-state/evilified-state-utest.el
View File

98
core/core-evilified-state.el → layers/+distribution/spacemacs-base/local/evilified-state/evilified-state.el
View File

@ -1,4 +1,4 @@
;;; core-evilified-state.el --- A minimalistic evil state
;;; evilified-state.el --- A minimalistic evil state
;; Copyright (C) 2014, 2015 syl20bnr
;;
@ -6,7 +6,7 @@
;; Keywords: convenience editing evil spacemacs
;; Created: 22 Mar 2015
;; Version: 1.0
;; Package-Requires: ((evil "1.0.9") (evil-leader "0.4.3"))
;; Package-Requires: ((evil "1.0.9"))
;; This file is not part of GNU Emacs.
@ -30,19 +30,17 @@
;;; Code:
(require 'core-dotspacemacs)
(require 'evil)
(require 'evil-leader)
(defvar spacemacs-core-evilified-state--modes nil
(defvar evilified-state--modes nil
"List of all evilified modes.")
(defvar spacemacs-core-evilified-state--visual-state-map evil-visual-state-map
(defvar evilified-state--visual-state-map evil-visual-state-map
"Evil visual state map backup.")
(defvar spacemacs-core-evilified-state--evil-surround nil
(defvar evilified-state--evil-surround nil
"Evil surround mode variable backup.")
(make-variable-buffer-local 'spacemacs-core-evilified-state--evil-surround)
(make-variable-buffer-local 'evilified-state--evil-surround)
(evil-define-state evilified
"Evilified state.
@ -53,13 +51,13 @@
:message "-- EVILIFIED BUFFER --"
:cursor box)
(add-hook 'evil-evilified-state-entry-hook 'spacemacs//evilified-state-on-entry)
(add-hook 'evil-evilified-state-exit-hook 'spacemacs//evilified-state-on-exit)
(add-hook 'evil-evilified-state-entry-hook 'evilified-state--evilified-state-on-entry)
(add-hook 'evil-evilified-state-exit-hook 'evilified-state--evilified-state-on-exit)
(add-hook 'evil-visual-state-entry-hook 'spacemacs//visual-state-on-entry)
(add-hook 'evil-visual-state-exit-hook 'spacemacs//visual-state-on-exit)
(add-hook 'evil-visual-state-entry-hook 'evilified-state--visual-state-on-entry)
(add-hook 'evil-visual-state-exit-hook 'evilified-state--visual-state-on-exit)
(defun spacemacs//evilify-pre-command-hook ()
(defun evilified-state--pre-command-hook ()
(let ((map (get-char-property (point) 'keymap)))
(when (and map (assq 'evilified-state map))
(let* ((submap (cdr (assq 'evilified-state map)))
@ -68,30 +66,28 @@
(when command
(setq this-command command))))))
(defun spacemacs//evilified-state-on-entry ()
(defun evilified-state--evilified-state-on-entry ()
"Setup evilified state."
(add-hook 'pre-command-hook 'spacemacs//evilify-pre-command-hook nil 'local)
(add-hook 'pre-command-hook 'evilified-state--pre-command-hook nil 'local)
(when (bound-and-true-p evil-surround-mode)
(make-local-variable 'evil-surround-mode)
(evil-surround-mode -1))
(setq-local evil-normal-state-map (cons 'keymap nil))
(setq-local evil-visual-state-map (cons 'keymap (list (cons ?y 'evil-yank)))))
(defun spacemacs//evilified-state-on-exit ()
(defun evilified-state--evilified-state-on-exit ()
"Clean evilified state"
(remove-hook 'pre-command-hook 'spacemacs//evilify-pre-command-hook 'local))
(remove-hook 'pre-command-hook 'evilified-state--pre-command-hook 'local))
(defun spacemacs//visual-state-on-entry ()
(defun evilified-state--visual-state-on-entry ()
"Setup visual state."
(add-hook 'pre-command-hook 'spacemacs//evilify-pre-command-hook nil 'local))
(add-hook 'pre-command-hook 'evilified-state--pre-command-hook nil 'local))
(defun spacemacs//visual-state-on-exit ()
(defun evilified-state--visual-state-on-exit ()
"Clean visual state"
(remove-hook 'pre-command-hook 'spacemacs//evilify-pre-command-hook 'local))
(remove-hook 'pre-command-hook 'evilified-state--pre-command-hook 'local))
;; default key bindings for all evilified buffers
(define-key evil-evilified-state-map (kbd dotspacemacs-leader-key)
evil-leader--default-map)
(define-key evil-evilified-state-map "/" 'evil-search-forward)
(define-key evil-evilified-state-map ":" 'evil-ex)
(define-key evil-evilified-state-map "h" 'evil-backward-char)
@ -111,23 +107,26 @@
(define-key evil-evilified-state-map (kbd "C-z") 'evil-emacs-state)
;; old macro
(defmacro evilify (mode map &rest body)
;;;###autoload
(defmacro evilified-state-evilify (mode map &rest body)
"Set `evilified state' as default for MODE.
BODY is a list of additional key bindings to apply for the given MAP in
`evilified state'."
(let ((defkey (when body `(evil-define-key 'evilified ,map ,@body))))
`(progn (unless ,(null mode)
(unless (memq ',mode spacemacs-core-evilified-state--modes)
(push ',mode spacemacs-core-evilified-state--modes))
(unless (memq ',mode evilified-state--modes)
(push ',mode evilified-state--modes))
(unless (or (bound-and-true-p holy-mode)
(memq ',mode evil-evilified-state-modes))
(delq ',mode evil-emacs-state-modes)
(push ',mode evil-evilified-state-modes)))
(unless ,(null defkey) (,@defkey)))))
(put 'evilified-state-evilify 'lisp-indent-function 'defun)
;; new macro
(defmacro spacemacs|evilify-map (map &rest props)
;;;###autoload
(defmacro evilified-state-evilify-map (map &rest props)
"Evilify MAP.
Avaiblabe PROPS:
@ -154,16 +153,16 @@ Each pair KEYn FUNCTIONn is defined in MAP after the evilification of it."
(let* ((mode (plist-get props :mode))
(evilified-map (plist-get props :evilified-map))
(eval-after-load (plist-get props :eval-after-load))
(bindings (spacemacs/mplist-get props :bindings))
(bindings (evilified-state--mplist-get props :bindings))
(defkey (when bindings `(evil-define-key 'evilified ,map ,@bindings)))
(body
`(progn
(let ((sorted-map (spacemacs//evilify-sort-keymap
(let ((sorted-map (evilified-state--sort-keymap
(or ,evilified-map evil-evilified-state-map)))
processed)
(mapc (lambda (map-entry)
(unless (member (car map-entry) processed)
(setq processed (spacemacs//evilify-event
(setq processed (evilified-state--evilify-event
,map ',map
(or ,evilified-map
evil-evilified-state-map)
@ -172,19 +171,20 @@ Each pair KEYn FUNCTIONn is defined in MAP after the evilification of it."
(unless ,(null defkey)
(,@defkey))
(unless ,(null mode)
(spacemacs/evilify-configure-default-state ',mode)))))
(evilified-state--configure-default-state ',mode)))))
(if (null eval-after-load)
`(,@body)
`(with-eval-after-load ',eval-after-load ,body))))
(put 'evilified-state-evilify-map 'lisp-indent-function 'defun)
(defun spacemacs/evilify-configure-default-state (mode)
(defun evilified-state--configure-default-state (mode)
"Configure default state for the passed mode."
(add-to-list 'spacemacs-core-evilified-state--modes mode)
(add-to-list 'evilified-state--modes mode)
(unless (bound-and-true-p holy-mode)
(delq mode evil-emacs-state-modes)
(add-to-list 'evil-evilified-state-modes mode)))
(defun spacemacs//evilify-event (map map-symbol evil-map event evil-value
(defun evilified-state--evilify-event (map map-symbol evil-map event evil-value
&optional processed pending-funcs)
"Evilify EVENT in MAP and return a list of PROCESSED events."
(if (and event (or evil-value pending-funcs))
@ -198,9 +198,9 @@ Each pair KEYn FUNCTIONn is defined in MAP after the evilification of it."
(when map-value
(add-to-list 'pending-funcs (cons map-value event) 'append))
(push event processed)
(setq processed (spacemacs//evilify-event
(setq processed (evilified-state--evilify-event
map map-symbol evil-map
(spacemacs//evilify-find-new-event event) nil
(evilified-state--find-new-event event) nil
processed pending-funcs)))
(when pending-funcs
(spacemacs-buffer/warning
@ -213,7 +213,7 @@ Each pair KEYn FUNCTIONn is defined in MAP after the evilification of it."
pending-funcs "\n")))))
processed)
(defun spacemacs//evilify-find-new-event (event)
(defun evilified-state--find-new-event (event)
"Return a new event for the evilified EVENT."
(when event
(cond
@ -226,7 +226,7 @@ Each pair KEYn FUNCTIONn is defined in MAP after the evilification of it."
((and (<= ?A event) (<= event ?Z)) (- event 64))
((and (<= 1 event) (<= event 26)) (+ (expt 2 25) event)))))
(defun spacemacs//evilify-sort-keymap (map)
(defun evilified-state--sort-keymap (map)
"Sort MAP following the order: `s' > `S' > `C-s' > `C-S-s'"
(let (list)
(map-keymap (lambda (a b) (push (cons a b) list)) map)
@ -242,6 +242,26 @@ Each pair KEYn FUNCTIONn is defined in MAP after the evilification of it."
(if (integerp b) nil
(string< a b)))))))
(provide 'core-evilified-state)
(defun evilified-state--mplist-get (plist prop)
"Get the values associated to PROP in PLIST, a modified plist.
A modified plist is one where keys are keywords and values are
all non-keywords elements that follow it.
If there are multiple properties with the same keyword, only the first property
and its values is returned.
Currently this function infloops when the list is circular."
(let ((tail plist)
result)
(while (and (consp tail) (not (eq prop (car tail))))
(pop tail))
;; pop the found keyword
(pop tail)
(while (and (consp tail) (not (keywordp (car tail))))
(push (pop tail) result))
(nreverse result)))
(provide 'evilified-state)
;;; core-evilified-state.el ends here

12
layers/+distribution/spacemacs-base/packages.el
View File

@ -23,6 +23,7 @@
evil-leader
evil-surround
evil-visualstar
(evilified-state :location local :step pre)
exec-path-from-shell
fill-column-indicator
helm
@ -114,7 +115,7 @@
;; "setup the evil ediff keymap"
;; (progn
;; (add-to-list 'evil-emacs-state-modes 'Ediff)
;; (spacemacs|evilify ediff-mode-map)
;; (evilified-state-evilify ediff-mode-map)
;; (spacemacs/activate-evil-leader-for-map 'ediff-mode-map)
;; )
;; )
@ -445,6 +446,12 @@ Example: (evil-map visual \"<\" \"<gv\")"
(define-key evil-visual-state-map (kbd "#")
'evil-visualstar/begin-search-backward))))
(defun spacemacs-base/init-evilified-state ()
(use-package evilified-state)
(with-eval-after-load 'evil-leader
(define-key evil-evilified-state-map (kbd dotspacemacs-leader-key)
evil-leader--default-map)))
(defun spacemacs-base/init-exec-path-from-shell ()
(use-package exec-path-from-shell
:init (when (memq window-system '(mac ns x))
@ -1222,7 +1229,8 @@ ARG non nil means that the editing style is `vim'."
popwin:special-display-config))))))
(defun spacemacs-base/init-process-menu ()
(evilify process-menu-mode process-menu-mode-map))
(when (configuration-layer/package-usedp 'evilified-state)
(evilified-state-evilify process-menu-mode process-menu-mode-map)))
(defun spacemacs-base/init-projectile ()
(use-package projectile

62
layers/+distribution/spacemacs/packages.el
View File

@ -485,22 +485,23 @@
(use-package doc-view
:defer t
:init
(evilify doc-view-mode doc-view-mode-map
"/" 'spacemacs/doc-view-search-new-query
"?" 'spacemacs/doc-view-search-new-query-backward
"gg" 'doc-view-first-page
"G" 'doc-view-last-page
"gt" 'doc-view-goto-page
"h" 'doc-view-previous-page
"j" 'doc-view-next-line-or-next-page
"k" 'doc-view-previous-line-or-previous-page
"K" 'doc-view-kill-proc-and-buffer
"l" 'doc-view-next-page
"n" 'doc-view-search
"N" 'doc-view-search-backward
(kbd "C-d") 'doc-view-scroll-up-or-next-page
(kbd "C-k") 'doc-view-kill-proc
(kbd "C-u") 'doc-view-scroll-down-or-previous-page)
(when (configuration-layer/package-usedp 'evilified-state)
(evilified-state-evilify doc-view-mode doc-view-mode-map
"/" 'spacemacs/doc-view-search-new-query
"?" 'spacemacs/doc-view-search-new-query-backward
"gg" 'doc-view-first-page
"G" 'doc-view-last-page
"gt" 'doc-view-goto-page
"h" 'doc-view-previous-page
"j" 'doc-view-next-line-or-next-page
"k" 'doc-view-previous-line-or-previous-page
"K" 'doc-view-kill-proc-and-buffer
"l" 'doc-view-next-page
"n" 'doc-view-search
"N" 'doc-view-search-backward
(kbd "C-d") 'doc-view-scroll-up-or-next-page
(kbd "C-k") 'doc-view-kill-proc
(kbd "C-u") 'doc-view-scroll-down-or-previous-page))
:config
(progn
(defun spacemacs/doc-view-search-new-query ()
@ -1210,10 +1211,11 @@ Search for a search tool in the order provided by `dotspacemacs-search-tools'."
(interactive)
(helm-exit-and-execute-action 'spacemacs/helm-project-smart-do-search-in-dir))))
;; evilify the helm-grep buffer
(evilify helm-grep-mode helm-grep-mode-map
(kbd "RET") 'helm-grep-mode-jump-other-window
(kbd "q") 'quit-window)
;; evilified-state-evilify the helm-grep buffer
(when (configuration-layer/package-usedp 'evilified-state)
(evilified-state-evilify helm-grep-mode helm-grep-mode-map
(kbd "RET") 'helm-grep-mode-jump-other-window
(kbd "q") 'quit-window))
(evil-leader/set-key
;; opened buffers scope
@ -1253,9 +1255,10 @@ Search for a search tool in the order provided by `dotspacemacs-search-tools'."
:config
(progn
(evil-define-key 'normal helm-ag-map "SPC" evil-leader--default-map)
(evilify helm-ag-mode helm-ag-mode-map
(kbd "RET") 'helm-ag-mode-jump-other-window
(kbd "q") 'quit-window))))
(when (configuration-layer/package-usedp 'evilified-state)
(evilified-state-evilify helm-ag-mode helm-ag-mode-map
(kbd "RET") 'helm-ag-mode-jump-other-window
(kbd "q") 'quit-window)))))
(defun spacemacs/init-helm-make ()
(use-package helm-make
@ -1649,12 +1652,13 @@ It will toggle the overlay under point or create an overlay of one character."
paradox-token)))))
(paradox-list-packages nil))
(evilify paradox-menu-mode paradox-menu-mode-map
"H" 'paradox-menu-quick-help
"J" 'paradox-next-describe
"K" 'paradox-previous-describe
"L" 'paradox-menu-view-commit-list
"o" 'paradox-menu-visit-homepage)
(when (configuration-layer/package-usedp 'evilified-state)
(evilified-state-evilify paradox-menu-mode paradox-menu-mode-map
"H" 'paradox-menu-quick-help
"J" 'paradox-next-describe
"K" 'paradox-previous-describe
"L" 'paradox-menu-view-commit-list
"o" 'paradox-menu-visit-homepage))
(evil-leader/set-key
"aP" 'spacemacs/paradox-list-packages))))

21
layers/+email/gnus/packages.el
View File

@ -75,11 +75,16 @@
(gnus-summary-scroll-up arg))))
(add-to-list 'nnmail-extra-headers nnrss-url-field)
(evilify gnus-group-mode gnus-group-mode-map)
(evilify gnus-server-mode gnus-server-mode-map)
(evilify gnus-browse-mode gnus-browse-mode-map)
(evilify gnus-article-mode gnus-article-mode-map)
(evilify gnus-summary-mode gnus-summary-mode-map
(kbd "J") 'gnus-summary-next-article
(kbd "K") 'gnus-summary-prev-article
(kbd "<RET>") 'spacemacs/browse-nnrss-url))))
(when (configuration-layer/package-usedp 'evilified-state)
(evilified-state-evilify gnus-group-mode gnus-group-mode-map))
(when (configuration-layer/package-usedp 'evilified-state)
(evilified-state-evilify gnus-server-mode gnus-server-mode-map))
(when (configuration-layer/package-usedp 'evilified-state)
(evilified-state-evilify gnus-browse-mode gnus-browse-mode-map))
(when (configuration-layer/package-usedp 'evilified-state)
(evilified-state-evilify gnus-article-mode gnus-article-mode-map))
(when (configuration-layer/package-usedp 'evilified-state)
(evilified-state-evilify gnus-summary-mode gnus-summary-mode-map
(kbd "J") 'gnus-summary-next-article
(kbd "K") 'gnus-summary-prev-article
(kbd "<RET>") 'spacemacs/browse-nnrss-url)))))

7
layers/+fun/emoji/packages.el
View File

@ -23,9 +23,10 @@
(progn
(evil-leader/set-key "aE" 'emoji-cheat-sheet-plus-buffer)
(evil-leader/set-key "ie" 'emoji-cheat-sheet-plus-insert)
(evilify emoji-cheat-sheet-plus-buffer-mode
emoji-cheat-sheet-plus-buffer-mode-map
"<RET>" 'emoji-cheat-sheet-plus-echo-and-copy)
(when (configuration-layer/package-usedp 'evilified-state)
(evilified-state-evilify emoji-cheat-sheet-plus-buffer-mode
emoji-cheat-sheet-plus-buffer-mode-map
"<RET>" 'emoji-cheat-sheet-plus-echo-and-copy))
(defun spacemacs/delay-emoji-cheat-sheet-hook ()
"Work-around for org buffers."
;; we need to wait for org buffer to be fully loaded before

15
layers/+fun/games/extensions.el
View File

@ -36,13 +36,14 @@
(tetris-pause-game))))
:config
(progn
(evilify tetris-mode tetris-mode-map
"h" 'tetris-move-left
"i" 'tetris-rotate-prev
"j" 'tetris-move-bottom
"k" 'tetris-rotate-next
"l" 'tetris-move-right
"q" 'spacemacs/tetris-quit-game))))
(when (configuration-layer/package-usedp 'evilified-state)
(evilified-state-evilify tetris-mode tetris-mode-map
"h" 'tetris-move-left
"i" 'tetris-rotate-prev
"j" 'tetris-move-bottom
"k" 'tetris-rotate-next
"l" 'tetris-move-right
"q" 'spacemacs/tetris-quit-game)))))
(defun games/init-helm-games ()
(use-package helm-games

22
layers/+fun/games/packages.el
View File

@ -22,11 +22,12 @@
(progn
(push '("2048" . (2048-game :quit (kill-buffer-ask (get-buffer "2048"))
:reset 2048-init)) helm-games-list)
(evilify 2048-mode 2048-mode-map
"j" '2048-down
"k" '2048-up
"h" '2048-left
"l" '2048-right))))
(when (configuration-layer/package-usedp 'evilified-state)
(evilified-state-evilify 2048-mode 2048-mode-map
"j" '2048-down
"k" '2048-up
"h" '2048-left
"l" '2048-right)))))
(defun games/init-pacmacs ()
(use-package pacmacs
@ -34,8 +35,9 @@
:init
(push '("pacmacs" . (pacmacs-start :quit (kill-buffer-ask (get-buffer "*Pacmacs*"))
:reset pacmacs-start)) helm-games-list)
(evilify pacmacs-mode pacmacs-mode-map
"h" 'pacmacs-left
"j" 'pacmacs-down
"k" 'pacmacs-up
"l" 'pacmacs-right)))
(when (configuration-layer/package-usedp 'evilified-state)
(evilified-state-evilify pacmacs-mode pacmacs-mode-map
"h" 'pacmacs-left
"j" 'pacmacs-down
"k" 'pacmacs-up
"l" 'pacmacs-right))))

11
layers/+fun/xkcd/packages.el
View File

@ -22,8 +22,9 @@
(make-directory xkcd-cache-dir))
(evil-leader/set-key
"ax" 'xkcd)
(evilify xkcd-mode xkcd-mode-map
"h" 'xkcd-prev
"j" 'xkcd-next
"k" 'xkcd-prev
"l" 'xkcd-next))))
(when (configuration-layer/package-usedp 'evilified-state)
(evilified-state-evilify xkcd-mode xkcd-mode-map
"h" 'xkcd-prev
"j" 'xkcd-next
"k" 'xkcd-prev
"l" 'xkcd-next)))))

50
layers/+keyboard-layouts/bepo/keybindings.el
View File

@ -199,33 +199,35 @@
magit-unpushed-section-map
magit-unstaged-section-map
magit-untracked-section-map))
(spacemacs|evilify-map map
:mode magit-status-mode
:bindings
;; Remap CRTS
(kbd "c") 'magit-commit-popup
(kbd "r") 'magit-rebase-popup
(kbd "t") 'evil-next-line
(kbd "s") 'evil-previous-line
;; Remap HJKL from default spacemacs
(kbd "h") 'magit-discard
(kbd "j") 'magit-tag-popup
(kbd "k") 'magit-stage
(kbd "l") 'magit-log-popup
;; Correct others
(kbd "v") 'magit-revert-popup
(kbd "g") 'magit-refresh
))
(when (configuration-layer/package-usedp 'evilified-state)
(evilified-state-evilify-map map
:mode magit-status-mode
:bindings
;; Remap CRTS
(kbd "c") 'magit-commit-popup
(kbd "r") 'magit-rebase-popup
(kbd "t") 'evil-next-line
(kbd "s") 'evil-previous-line
;; Remap HJKL from default spacemacs
(kbd "h") 'magit-discard
(kbd "j") 'magit-tag-popup
(kbd "k") 'magit-stage
(kbd "l") 'magit-log-popup
;; Correct others
(kbd "v") 'magit-revert-popup
(kbd "g") 'magit-refresh
)))
(dolist (map (list magit-popup-mode-map
magit-popup-help-mode-map
magit-popup-sequence-mode-map))
(spacemacs|evilify-map map
:mode magit-commit-mode
:bindings
(kbd "c") 'magit-commit
(kbd "s") 'magit-commit-squash
(kbd "S") 'magit-commit-instant-squash
))
(when (configuration-layer/package-usedp 'evilified-state)
(evilified-state-evilify-map map
:mode magit-commit-mode
:bindings
(kbd "c") 'magit-commit
(kbd "s") 'magit-commit-squash
(kbd "S") 'magit-commit-instant-squash
)))
))

70
layers/+lang/clojure/packages.el
View File

@ -163,45 +163,49 @@ If called with a prefix argument, uses the other-window instead."
(add-hook 'cider--debug-mode-hook 'spacemacs/cider-debug-setup)
(evilify cider-stacktrace-mode cider-stacktrace-mode-map
(kbd "C-j") 'cider-stacktrace-next-cause
(kbd "C-k") 'cider-stacktrace-previous-cause
(kbd "TAB") 'cider-stacktrace-cycle-current-cause
(kbd "0") 'cider-stacktrace-cycle-all-causes
(kbd "1") 'cider-stacktrace-cycle-cause-1
(kbd "2") 'cider-stacktrace-cycle-cause-2
(kbd "3") 'cider-stacktrace-cycle-cause-3
(kbd "4") 'cider-stacktrace-cycle-cause-4
(kbd "5") 'cider-stacktrace-cycle-cause-5
(kbd "a") 'cider-stacktrace-toggle-all
(kbd "c") 'cider-stacktrace-toggle-clj
(kbd "d") 'cider-stacktrace-toggle-duplicates
(kbd "J") 'cider-stacktrace-toggle-java
(kbd "r") 'cider-stacktrace-toggle-repl
(kbd "T") 'cider-stacktrace-toggle-tooling)
(when (configuration-layer/package-usedp 'evilified-state)
(evilified-state-evilify cider-stacktrace-mode cider-stacktrace-mode-map
(kbd "C-j") 'cider-stacktrace-next-cause
(kbd "C-k") 'cider-stacktrace-previous-cause
(kbd "TAB") 'cider-stacktrace-cycle-current-cause
(kbd "0") 'cider-stacktrace-cycle-all-causes
(kbd "1") 'cider-stacktrace-cycle-cause-1
(kbd "2") 'cider-stacktrace-cycle-cause-2
(kbd "3") 'cider-stacktrace-cycle-cause-3
(kbd "4") 'cider-stacktrace-cycle-cause-4
(kbd "5") 'cider-stacktrace-cycle-cause-5
(kbd "a") 'cider-stacktrace-toggle-all
(kbd "c") 'cider-stacktrace-toggle-clj
(kbd "d") 'cider-stacktrace-toggle-duplicates
(kbd "J") 'cider-stacktrace-toggle-java
(kbd "r") 'cider-stacktrace-toggle-repl
(kbd "T") 'cider-stacktrace-toggle-tooling))
;; open cider-doc directly and close it with q
(setq cider-prompt-for-symbol nil)
(evilify cider-docview-mode cider-docview-mode-map
(kbd "q") 'cider-popup-buffer-quit)
(when (configuration-layer/package-usedp 'evilified-state)
(evilified-state-evilify cider-docview-mode cider-docview-mode-map
(kbd "q") 'cider-popup-buffer-quit))
(evilify cider-inspector-mode cider-inspector-mode-map
(kbd "L") 'cider-inspector-pop
(kbd "n") 'cider-inspector-next-page
(kbd "N") 'cider-inspector-previous-page
(kbd "r") 'cider-inspector-refresh)
(when (configuration-layer/package-usedp 'evilified-state)
(evilified-state-evilify cider-inspector-mode cider-inspector-mode-map
(kbd "L") 'cider-inspector-pop
(kbd "n") 'cider-inspector-next-page
(kbd "N") 'cider-inspector-previous-page
(kbd "r") 'cider-inspector-refresh))
(evilify cider-test-report-mode cider-test-report-mode-map
(kbd "C-j") 'cider-test-next-result
(kbd "C-k") 'cider-test-previous-result
(kbd "RET") 'cider-test-jump
(kbd "d") 'cider-test-ediff
(kbd "e") 'cider-test-stacktrace
(kbd "q") 'cider-popup-buffer-quit
(kbd "r") 'cider-test-rerun-tests
(kbd "t") 'cider-test-run-test
(kbd "T") 'cider-test-run-tests)
(when (configuration-layer/package-usedp 'evilified-state)
(evilified-state-evilify cider-test-report-mode cider-test-report-mode-map
(kbd "C-j") 'cider-test-next-result
(kbd "C-k") 'cider-test-previous-result
(kbd "RET") 'cider-test-jump
(kbd "d") 'cider-test-ediff
(kbd "e") 'cider-test-stacktrace
(kbd "q") 'cider-popup-buffer-quit
(kbd "r") 'cider-test-rerun-tests
(kbd "t") 'cider-test-run-test
(kbd "T") 'cider-test-run-tests))
;; TODO: having this work for cider-macroexpansion-mode would be nice,
;; but the problem is that it uses clojure-mode as its major-mode

19
layers/+lang/elm/packages.el
View File

@ -94,15 +94,16 @@
"mpc" 'elm-package-catalog
"mpd" 'elm-documentation-lookup)
(evilify elm-package-mode elm-package-mode-map
"g" 'elm-package-refresh
"n" 'elm-package-next
"p" 'elm-package-prev
"v" 'elm-package-view
"m" 'elm-package-mark
"u" 'elm-package-unmark
"x" 'elm-package-install
"q" 'quit-window))))
(when (configuration-layer/package-usedp 'evilified-state)
(evilified-state-evilify elm-package-mode elm-package-mode-map
"g" 'elm-package-refresh
"n" 'elm-package-next
"p" 'elm-package-prev
"v" 'elm-package-view
"m" 'elm-package-mark
"u" 'elm-package-unmark
"x" 'elm-package-install
"q" 'quit-window)))))
(defun elm/pre-init-popwin ()
(spacemacs|use-package-add-hook popwin

3
layers/+lang/python/extensions.el
View File

@ -57,7 +57,8 @@
:commands (pylookup-lookup pylookup-update pylookup-update-all)
:init
(progn
(evilify pylookup-mode pylookup-mode-map)
(when (configuration-layer/package-usedp 'evilified-state)
(evilified-state-evilify pylookup-mode pylookup-mode-map))
(evil-leader/set-key-for-mode 'python-mode
"mhH" 'pylookup-lookup))
:config

5
layers/+lang/python/packages.el
View File

@ -49,8 +49,9 @@
"mgg" 'anaconda-mode-find-definitions
"mga" 'anaconda-mode-find-assignments
"mgu" 'anaconda-mode-find-references)
(evilify anaconda-mode-view-mode anaconda-mode-view-mode-map
(kbd "q") 'quit-window)
(when (configuration-layer/package-usedp 'evilified-state)
(evilified-state-evilify anaconda-mode-view-mode anaconda-mode-view-mode-map
(kbd "q") 'quit-window))
(spacemacs|hide-lighter anaconda-mode))))
(defun python/init-cython-mode ()

233
layers/+source-control/git/packages.el
View File

@ -142,122 +142,123 @@
(unless (configuration-layer/package-usedp 'evil-magit)
;; mode maps
(spacemacs|evilify-map magit-mode-map)
(spacemacs|evilify-map magit-status-mode-map
:mode magit-status-mode
:bindings
(kbd "C-S-j") 'magit-section-forward
(kbd "C-S-k") 'magit-section-backward
(kbd "C-n") 'magit-section-forward
(kbd "C-p") 'magit-section-backward)
(spacemacs|evilify-map magit-refs-mode-map
:mode magit-refs-mode
:bindings
(kbd "C-S-j") 'magit-section-forward
(kbd "C-S-k") 'magit-section-backward
(kbd "C-n") 'magit-section-forward
(kbd "C-p") 'magit-section-backward)
(spacemacs|evilify-map magit-blame-mode-map
:mode magit-blame-mode
:bindings
(kbd "C-S-j") 'magit-section-forward
(kbd "C-S-k") 'magit-section-backward
(kbd "C-n") 'magit-section-forward
(kbd "C-p") 'magit-section-backward)
(spacemacs|evilify-map magit-hunk-section-map
:mode magit-status-mode
:bindings
(kbd "C-S-j") 'magit-section-forward
(kbd "C-S-k") 'magit-section-backward
(kbd "C-n") 'magit-section-forward
(kbd "C-p") 'magit-section-backward)
(spacemacs|evilify-map magit-diff-mode-map
:mode magit-diff-mode
:bindings
(kbd "C-S-j") 'magit-section-forward
(kbd "C-S-k") 'magit-section-backward
(kbd "C-n") 'magit-section-forward
(kbd "C-p") 'magit-section-backward)
(spacemacs|evilify-map magit-log-read-revs-map
:mode magit-log-read-revs
:bindings
(kbd "C-S-j") 'magit-section-forward
(kbd "C-S-k") 'magit-section-backward
(kbd "C-n") 'magit-section-forward
(kbd "C-p") 'magit-section-backward)
(spacemacs|evilify-map magit-log-mode-map
:mode magit-log-mode
:bindings
(kbd "C-S-j") 'magit-section-forward
(kbd "C-S-k") 'magit-section-backward
(kbd "C-n") 'magit-section-forward
(kbd "C-p") 'magit-section-backward)
(spacemacs|evilify-map magit-log-select-mode-map
:mode magit-log-select-mode
:bindings
(kbd "C-S-j") 'magit-section-forward
(kbd "C-S-k") 'magit-section-backward
(kbd "C-n") 'magit-section-forward
(kbd "C-p") 'magit-section-backward)
(spacemacs|evilify-map magit-cherry-mode-map
:mode magit-cherry-mode
:bindings
(kbd "C-S-j") 'magit-section-forward
(kbd "C-S-k") 'magit-section-backward
(kbd "C-n") 'magit-section-forward
(kbd "C-p") 'magit-section-backward)
(spacemacs|evilify-map magit-reflog-mode-map
:mode magit-reflog-mode
:bindings
(kbd "C-S-j") 'magit-section-forward
(kbd "C-S-k") 'magit-section-backward
(kbd "C-n") 'magit-section-forward
(kbd "C-p") 'magit-section-backward)
(spacemacs|evilify-map magit-process-mode-map
:mode magit-process-mode
:bindings
(kbd "C-S-j") 'magit-section-forward
(kbd "C-S-k") 'magit-section-backward
(kbd "C-n") 'magit-section-forward
(kbd "C-p") 'magit-section-backward)
(spacemacs|evilify-map magit-stash-mode-map
:mode magit-stash-mode
:bindings
(kbd "C-S-j") 'magit-section-forward
(kbd "C-S-k") 'magit-section-backward
(kbd "C-n") 'magit-section-forward
(kbd "C-p") 'magit-section-backward)
(spacemacs|evilify-map git-rebase-mode-map
:mode git-rebase-mode
:bindings
(kbd "C-S-j") 'magit-section-forward
(kbd "C-S-k") 'magit-section-backward
(kbd "C-n") 'magit-section-forward
(kbd "C-p") 'magit-section-backward
"J" 'git-rebase-move-line-down
"K" 'git-rebase-move-line-up
"u" 'git-rebase-undo
"y" 'git-rebase-insert)
;; default state for additional modes
(dolist (mode '(magit-popup-mode
magit-popup-sequence-mode))
(add-to-list 'evil-emacs-state-modes mode))
(spacemacs/evilify-configure-default-state 'magit-revision-mode)
;; section maps
(spacemacs|evilify-map magit-tag-section-map)
(spacemacs|evilify-map magit-untracked-section-map)
(spacemacs|evilify-map magit-branch-section-map)
(spacemacs|evilify-map magit-remote-section-map)
(spacemacs|evilify-map magit-file-section-map)
(spacemacs|evilify-map magit-hunk-section-map)
(spacemacs|evilify-map magit-unstaged-section-map)
(spacemacs|evilify-map magit-staged-section-map)
(spacemacs|evilify-map magit-commit-section-map)
(spacemacs|evilify-map magit-module-commit-section-map)
(spacemacs|evilify-map magit-unpulled-section-map)
(spacemacs|evilify-map magit-unpushed-section-map)
(spacemacs|evilify-map magit-stashes-section-map)
(spacemacs|evilify-map magit-stash-section-map))
(when (configuration-layer/package-usedp 'evilified-state)
(evilified-state-evilify-map magit-mode-map)
(evilified-state-evilify-map magit-status-mode-map
:mode magit-status-mode
:bindings
(kbd "C-S-j") 'magit-section-forward
(kbd "C-S-k") 'magit-section-backward
(kbd "C-n") 'magit-section-forward
(kbd "C-p") 'magit-section-backward)
(evilified-state-evilify-map magit-refs-mode-map
:mode magit-refs-mode
:bindings
(kbd "C-S-j") 'magit-section-forward
(kbd "C-S-k") 'magit-section-backward
(kbd "C-n") 'magit-section-forward
(kbd "C-p") 'magit-section-backward)
(evilified-state-evilify-map magit-blame-mode-map
:mode magit-blame-mode
:bindings
(kbd "C-S-j") 'magit-section-forward
(kbd "C-S-k") 'magit-section-backward
(kbd "C-n") 'magit-section-forward
(kbd "C-p") 'magit-section-backward)
(evilified-state-evilify-map magit-hunk-section-map
:mode magit-status-mode
:bindings
(kbd "C-S-j") 'magit-section-forward
(kbd "C-S-k") 'magit-section-backward
(kbd "C-n") 'magit-section-forward
(kbd "C-p") 'magit-section-backward)
(evilified-state-evilify-map magit-diff-mode-map
:mode magit-diff-mode
:bindings
(kbd "C-S-j") 'magit-section-forward
(kbd "C-S-k") 'magit-section-backward
(kbd "C-n") 'magit-section-forward
(kbd "C-p") 'magit-section-backward)
(evilified-state-evilify-map magit-log-read-revs-map
:mode magit-log-read-revs
:bindings
(kbd "C-S-j") 'magit-section-forward
(kbd "C-S-k") 'magit-section-backward
(kbd "C-n") 'magit-section-forward
(kbd "C-p") 'magit-section-backward)
(evilified-state-evilify-map magit-log-mode-map
:mode magit-log-mode
:bindings
(kbd "C-S-j") 'magit-section-forward
(kbd "C-S-k") 'magit-section-backward
(kbd "C-n") 'magit-section-forward
(kbd "C-p") 'magit-section-backward)
(evilified-state-evilify-map magit-log-select-mode-map
:mode magit-log-select-mode
:bindings
(kbd "C-S-j") 'magit-section-forward
(kbd "C-S-k") 'magit-section-backward
(kbd "C-n") 'magit-section-forward
(kbd "C-p") 'magit-section-backward)
(evilified-state-evilify-map magit-cherry-mode-map
:mode magit-cherry-mode
:bindings
(kbd "C-S-j") 'magit-section-forward
(kbd "C-S-k") 'magit-section-backward
(kbd "C-n") 'magit-section-forward
(kbd "C-p") 'magit-section-backward)
(evilified-state-evilify-map magit-reflog-mode-map
:mode magit-reflog-mode
:bindings
(kbd "C-S-j") 'magit-section-forward
(kbd "C-S-k") 'magit-section-backward
(kbd "C-n") 'magit-section-forward
(kbd "C-p") 'magit-section-backward)
(evilified-state-evilify-map magit-process-mode-map
:mode magit-process-mode
:bindings
(kbd "C-S-j") 'magit-section-forward
(kbd "C-S-k") 'magit-section-backward
(kbd "C-n") 'magit-section-forward
(kbd "C-p") 'magit-section-backward)
(evilified-state-evilify-map magit-stash-mode-map
:mode magit-stash-mode
:bindings
(kbd "C-S-j") 'magit-section-forward
(kbd "C-S-k") 'magit-section-backward
(kbd "C-n") 'magit-section-forward
(kbd "C-p") 'magit-section-backward)
(evilified-state-evilify-map git-rebase-mode-map
:mode git-rebase-mode
:bindings
(kbd "C-S-j") 'magit-section-forward
(kbd "C-S-k") 'magit-section-backward
(kbd "C-n") 'magit-section-forward
(kbd "C-p") 'magit-section-backward
"J" 'git-rebase-move-line-down
"K" 'git-rebase-move-line-up
"u" 'git-rebase-undo
"y" 'git-rebase-insert)
;;defaultstateforadditionalmodes
(dolist (mode '(magit-popup-mode
magit-popup-sequence-mode))
(add-to-list 'evil-emacs-state-modes mode))
(evilified-state--configure-default-state 'magit-revision-mode)
;;sectionmaps
(evilified-state-evilify-map magit-tag-section-map)
(evilified-state-evilify-map magit-untracked-section-map)
(evilified-state-evilify-map magit-branch-section-map)
(evilified-state-evilify-map magit-remote-section-map)
(evilified-state-evilify-map magit-file-section-map)
(evilified-state-evilify-map magit-hunk-section-map)
(evilified-state-evilify-map magit-unstaged-section-map)
(evilified-state-evilify-map magit-staged-section-map)
(evilified-state-evilify-map magit-commit-section-map)
(evilified-state-evilify-map magit-module-commit-section-map)
(evilified-state-evilify-map magit-unpulled-section-map)
(evilified-state-evilify-map magit-unpushed-section-map)
(evilified-state-evilify-map magit-stashes-section-map)
(evilified-state-evilify-map magit-stash-section-map)))
;; full screen magit-status
(when git-magit-status-fullscreen

9
layers/+source-control/github/packages.el
View File

@ -26,10 +26,11 @@
:defer t
:init
(progn
(evilify gist-list-mode gist-list-menu-mode-map
"f" 'gist-fetch-current
"K" 'gist-kill-current
"o" 'gist-browse-current-url)
(when (configuration-layer/package-usedp 'evilified-state)
(evilified-state-evilify gist-list-mode gist-list-menu-mode-map
"f" 'gist-fetch-current
"K" 'gist-kill-current
"o" 'gist-browse-current-url))
(evil-leader/set-key
"ggb" 'gist-buffer
"ggB" 'gist-buffer-private

7
layers/+source-control/version-control/packages.el
View File

@ -19,9 +19,10 @@
(use-package diff-mode
:defer t
:config
(evilify diff-mode diff-mode-map
"j" 'diff-hunk-next
"k" 'diff-hunk-prev)))
(when (configuration-layer/package-usedp 'evilified-state)
(evilified-state-evilify diff-mode diff-mode-map
"j" 'diff-hunk-next
"k" 'diff-hunk-prev))))
(defun version-control/init-diff-hl ()
(use-package diff-hl

47
layers/+vim/vinegar/keybindings.el
View File

@ -4,26 +4,27 @@
(add-hook 'dired-mode-hook 'vinegar/dired-setup)
(with-eval-after-load 'dired
(evilify dired-mode dired-mode-map
"j" 'vinegar/move-down
"k" 'vinegar/move-up
"-" 'vinegar/up-directory
"0" 'dired-back-to-start-of-files
"=" 'vinegar/dired-diff
(kbd "C-j") 'dired-next-subdir
(kbd "C-k") 'dired-prev-subdir
"I" 'vinegar/dotfiles-toggle
(kbd "~") '(lambda ()(interactive) (find-alternate-file "~/"))
(kbd "RET") (if vinegar-reuse-dired-buffer
'dired-find-alternate-file
'dired-find-file)
"f" 'helm-find-files
"J" 'dired-goto-file
(kbd "C-f") 'find-name-dired
"H" 'diredp-dired-recent-dirs
"T" 'dired-tree-down
"K" 'dired-do-kill-lines
"r" 'revert-buffer
(kbd "C-r") 'dired-do-redisplay
"gg" 'vinegar/back-to-top
"G" 'vinegar/jump-to-bottom))
(when (configuration-layer/package-usedp 'evilified-state)
(evilified-state-evilify dired-mode dired-mode-map
"j" 'vinegar/move-down
"k" 'vinegar/move-up
"-" 'vinegar/up-directory
"0" 'dired-back-to-start-of-files
"=" 'vinegar/dired-diff
(kbd "C-j") 'dired-next-subdir
(kbd "C-k") 'dired-prev-subdir
"I" 'vinegar/dotfiles-toggle
(kbd "~") '(lambda ()(interactive) (find-alternate-file "~/"))
(kbd "RET") (if vinegar-reuse-dired-buffer
'dired-find-alternate-file
'dired-find-file)
"f" 'helm-find-files
"J" 'dired-goto-file
(kbd "C-f") 'find-name-dired
"H" 'diredp-dired-recent-dirs
"T" 'dired-tree-down
"K" 'dired-do-kill-lines
"r" 'revert-buffer
(kbd "C-r") 'dired-do-redisplay
"gg" 'vinegar/back-to-top
"G" 'vinegar/jump-to-bottom)))

3
layers/chinese/packages.el
View File

@ -68,7 +68,8 @@
pyim-personal-file (concat spacemacs-cache-directory
"pyim-personal.txt")
default-input-method "chinese-pyim")
(evilify pyim-dicts-manager-mode pyim-dicts-manager-mode-map))))
(when (configuration-layer/package-usedp 'evilified-state)
(evilified-state-evilify pyim-dicts-manager-mode pyim-dicts-manager-mode-map)))))
(defun chinese/init-find-by-pinyin-dired ()
(use-package find-by-pinyin-dired

3
layers/finance/packages.el
View File

@ -45,7 +45,8 @@
"mt" 'ledger-insert-effective-date
"my" 'ledger-set-year
"m RET" 'ledger-set-month)
(evilify ledger-report-mode ledger-report-mode-map))))
(when (configuration-layer/package-usedp 'evilified-state)
(evilified-state-evilify ledger-report-mode ledger-report-mode-map)))))
(when (configuration-layer/layer-usedp 'auto-completion)
(defun finance/post-init-company ()

7
layers/geolocation/packages.el
View File

@ -46,9 +46,10 @@
"aw" 'sunshine-forecast
"aW" 'sunshine-quick-forecast)
(evilify sunshine-mode sunshine-mode-map
(kbd "q") 'quit-window
(kbd "i") 'sunshine-toggle-icons))
(when (configuration-layer/package-usedp 'evilified-state)
(evilified-state-evilify sunshine-mode sunshine-mode-map
(kbd "q") 'quit-window
(kbd "i") 'sunshine-toggle-icons)))
:config
;; just in case location was not set by user, or on OS X,
;; if wasn't set up automatically, will not work with Emac's

5
layers/ibuffer/packages.el
View File

@ -32,8 +32,9 @@
;; Use ibuffer to provide :ls
(evil-ex-define-cmd "buffers" 'ibuffer))
:config
(spacemacs|evilify-map ibuffer-mode-map
:mode ibuffer-mode)))
(when (configuration-layer/package-usedp 'evilified-state)
(evilified-state-evilify-map ibuffer-mode-map
:mode ibuffer-mode))))
(defun ibuffer/init-ibuffer-projectile()
(use-package ibuffer-projectile

9
layers/org/packages.el
View File

@ -294,10 +294,11 @@ Will work on both org-mode and any mode that accepts plain html."
:defer t
:init
(progn
(evilify nil org-present-mode-keymap
"h" 'org-present-prev
"l" 'org-present-next
"q" 'org-present-quit)
(when (configuration-layer/package-usedp 'evilified-state)
(evilified-state-evilify nil org-present-mode-keymap
"h" 'org-present-prev
"l" 'org-present-next
"q" 'org-present-quit))
(defun spacemacs//org-present-start ()
"Initiate `org-present' mode"
(org-present-big)

43
layers/osx/packages.el
View File

@ -46,27 +46,28 @@
(evil-leader/set-key "al" 'launchctl))
:config
(progn
(evilify launchctl-mode launchctl-mode-map
(kbd "q") 'quit-window
(kbd "s") 'tabulated-list-sort
(kbd "g") 'launchctl-refresh
(kbd "n") 'launchctl-new
(kbd "e") 'launchctl-edit
(kbd "v") 'launchctl-view
(kbd "l") 'launchctl-load
(kbd "u") 'launchctl-unload
(kbd "r") 'launchctl-reload
(kbd "S") 'launchctl-start
(kbd "K") 'launchctl-stop
(kbd "R") 'launchctl-restart
(kbd "D") 'launchctl-remove
(kbd "d") 'launchctl-disable
(kbd "E") 'launchctl-enable
(kbd "i") 'launchctl-info
(kbd "f") 'launchctl-filter
(kbd "=") 'launchctl-setenv
(kbd "#") 'launchctl-unsetenv
(kbd "h") 'launchctl-help))))
(when (configuration-layer/package-usedp 'evilified-state)
(evilified-state-evilify launchctl-mode launchctl-mode-map
(kbd "q") 'quit-window
(kbd "s") 'tabulated-list-sort
(kbd "g") 'launchctl-refresh
(kbd "n") 'launchctl-new
(kbd "e") 'launchctl-edit
(kbd "v") 'launchctl-view
(kbd "l") 'launchctl-load
(kbd "u") 'launchctl-unload
(kbd "r") 'launchctl-reload
(kbd "S") 'launchctl-start
(kbd "K") 'launchctl-stop
(kbd "R") 'launchctl-restart
(kbd "D") 'launchctl-remove
(kbd "d") 'launchctl-disable
(kbd "E") 'launchctl-enable
(kbd "i") 'launchctl-info
(kbd "f") 'launchctl-filter
(kbd "=") 'launchctl-setenv
(kbd "#") 'launchctl-unsetenv
(kbd "h") 'launchctl-help)))))
(defun osx/init-reveal-in-osx-finder ()
(use-package reveal-in-osx-finder

25
layers/prodigy/packages.el
View File

@ -17,15 +17,16 @@
:init
(evil-leader/set-key "aS" 'prodigy)
:config
(evilify prodigy-mode prodigy-mode-map
"h" 'prodigy-first
"j" 'prodigy-next
"k" 'prodigy-prev
"l" 'prodigy-last
"H" 'prodigy-display-process
"J" 'prodigy-next-with-status
"K" 'prodigy-prev-with-status
"L" 'prodigy-start
"d" 'prodigy-jump-dired
"g" 'prodigy-jump-magit
"Y" 'prodigy-copy-cmd)))
(when (configuration-layer/package-usedp 'evilified-state)
(evilified-state-evilify prodigy-mode prodigy-mode-map
"h" 'prodigy-first
"j" 'prodigy-next
"k" 'prodigy-prev
"l" 'prodigy-last
"H" 'prodigy-display-process
"J" 'prodigy-next-with-status
"K" 'prodigy-prev-with-status
"L" 'prodigy-start
"d" 'prodigy-jump-dired
"g" 'prodigy-jump-magit
"Y" 'prodigy-copy-cmd))))

13
layers/syntax-checking/packages.el
View File

@ -78,12 +78,13 @@ If the error list is visible, hide it. Otherwise, show it."
(quit-window nil window)
(flycheck-list-errors)))
(spacemacs|evilify-map flycheck-error-list-mode-map
:mode flycheck-error-list-mode
:bindings
"RET" 'flycheck-error-list-goto-error
"j" 'flycheck-error-list-next-error
"k" 'flycheck-error-list-previous-error)
(when (configuration-layer/package-usedp 'evilified-state)
(evilified-state-evilify-map flycheck-error-list-mode-map
:mode flycheck-error-list-mode
:bindings
"RET" 'flycheck-error-list-goto-error
"j" 'flycheck-error-list-next-error
"k" 'flycheck-error-list-previous-error))
;; key bindings
(evil-leader/set-key

2
tests/core/Makefile
View File

@ -14,11 +14,9 @@ TEST_DIR := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
LOAD_FILES = core/core-load-paths.el
UNIT_TEST_FILES = \
core-evilified-state-utest.el \
core-configuration-layer-utest.el \
core-funcs-utest.el
FUNC_TEST_FILES = \
core-evilified-state-ftest.el \
core-spacemacs-ftest.el \
core-spacemacs-buffer-ftest.el \
core-configuration-layer-ftest.el \