Revert macros to ...! name convention (elisp doesn't like @...)
This commit is contained in:
Henrik Lissner
parent
b64d5554e3
commit
33c88d4f82
125 changed files with 877 additions and 880 deletions
|
|
@ -11,7 +11,7 @@
|
|||
;;;###autoload (autoload '+debug:debug-toggle-breakpoint "feature/debug/autoload" nil t)
|
||||
;;;###autoload (autoload '+debug:run "feature/debug/autoload" nil t)
|
||||
|
||||
(@after evil
|
||||
(after! evil
|
||||
(evil-define-command +debug:run (&optional path)
|
||||
"Initiate debugger for current major mode"
|
||||
(interactive "<f>")
|
||||
|
|
|
|||
|
|
@ -1,17 +1,17 @@
|
|||
;;; feature/debug/config.el
|
||||
|
||||
(@after debug
|
||||
(after! debug
|
||||
;; For elisp debugging
|
||||
(@map :map debugger-mode-map
|
||||
(map! :map debugger-mode-map
|
||||
:n "RET" 'debug-help-follow
|
||||
:n "n" 'debugger-step-through
|
||||
:n "c" 'debugger-continue))
|
||||
|
||||
|
||||
(@def-package realgud
|
||||
(def-package! realgud
|
||||
:commands (realgud:gdb realgud:trepanjs realgud:bashdb realgud:zshdb)
|
||||
:config
|
||||
(@map :map realgud:shortkey-mode-map
|
||||
(map! :map realgud:shortkey-mode-map
|
||||
:n "j" 'evil-next-line
|
||||
:n "k" 'evil-previous-line
|
||||
:n "h" 'evil-backward-char
|
||||
|
|
@ -22,7 +22,7 @@
|
|||
:n "c" 'realgud:cmd-continue)
|
||||
|
||||
;; Popup rules
|
||||
(@set :popup
|
||||
(set! :popup
|
||||
'("^\\*\\(g\\|zsh\\|bash\\)db.*?\\*$" :size 20 :regexp t)
|
||||
'("^\\*trepanjs.*?\\*$" :size 20 :regexp t))
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
;; -*- no-byte-compile: t; -*-
|
||||
;;; feature/debug/packages.el
|
||||
|
||||
(@package realgud)
|
||||
(package! realgud)
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
;;;###autoload (autoload '+repl:open "feature/repl/autoload/repl" nil t)
|
||||
;;;###autoload (autoload '+repl:send "feature/repl/autoload/repl" nil t)
|
||||
|
||||
(@after evil
|
||||
(after! evil
|
||||
(evil-define-command +repl:open (&optional bang command)
|
||||
:repeat nil
|
||||
(interactive "<!><a>")
|
||||
|
|
|
|||
|
|
@ -17,13 +17,13 @@ by `+eval/build', and filled with the `:build' setting")
|
|||
(setq eval-expression-print-length nil
|
||||
eval-expression-print-level nil)
|
||||
|
||||
(@def-setting :repl (mode command)
|
||||
(def-setting! :repl (mode command)
|
||||
"Define a REPL for a mode. Takes same arguements as `rtog/add-repl'."
|
||||
(if (featurep 'repl-toggle)
|
||||
(list 'rtog/add-repl mode command)
|
||||
`(push ',(list mode command) +eval--repls)))
|
||||
|
||||
(@def-setting :build (name mode pred-fn &optional build-fn)
|
||||
(def-setting! :build (name mode pred-fn &optional build-fn)
|
||||
"Define a build command function (BUILD-FN) for major-mode MODE, called NAME
|
||||
-- a symbol -- PRED-FN is a predicate function that determines this builder's
|
||||
suitability for the current buffer."
|
||||
|
|
@ -34,7 +34,7 @@ suitability for the current buffer."
|
|||
(list :predicate ,pred-fn :fn ,build-fn)
|
||||
+eval-builders))
|
||||
|
||||
(@def-setting :eval (mode command)
|
||||
(def-setting! :eval (mode command)
|
||||
"Define a code evaluator for `quickrun'.
|
||||
|
||||
1. If MODE is a string and COMMAND is the string, MODE is a file regexp and
|
||||
|
|
@ -45,12 +45,12 @@ suitability for the current buffer."
|
|||
3. If MODE is not a string and COMMAND is a list, use `quickrun-add-command'. e.g.
|
||||
(quickrun-add-command MODE COMMAND :mode MODE)"
|
||||
(if (stringp command)
|
||||
`(@after quickrun
|
||||
`(after! quickrun
|
||||
(push ,(cons mode command)
|
||||
,(if (stringp mode)
|
||||
'quickrun-file-alist
|
||||
'quickrun--major-mode-alist)))
|
||||
`(@after quickrun
|
||||
`(after! quickrun
|
||||
(quickrun-add-command
|
||||
,(symbol-name mode)
|
||||
',command :mode ',mode))))
|
||||
|
|
@ -60,7 +60,7 @@ suitability for the current buffer."
|
|||
;; Packages
|
||||
;;
|
||||
|
||||
(@def-package quickrun
|
||||
(def-package! quickrun
|
||||
:commands (quickrun
|
||||
quickrun-region
|
||||
quickrun-with-arg
|
||||
|
|
@ -69,7 +69,7 @@ suitability for the current buffer."
|
|||
quickrun-replace-region)
|
||||
:init (add-hook 'quickrun/mode-hook 'linum-mode)
|
||||
:config
|
||||
(@set :popup "*quickrun*" :size 10)
|
||||
(set! :popup "*quickrun*" :size 10)
|
||||
|
||||
;; don't auto-focus quickrun windows. Shackle handles that for us.
|
||||
(setq quickrun-focus-p nil)
|
||||
|
|
@ -94,12 +94,12 @@ suitability for the current buffer."
|
|||
(add-hook 'quickrun-after-run-hook '+repl|quickrun-scroll-to-bof))
|
||||
|
||||
|
||||
(@def-package repl-toggle
|
||||
(def-package! repl-toggle
|
||||
:commands rtog/toggle-repl
|
||||
:preface (defvar rtog/mode-repl-alist nil)
|
||||
:init (@add-hook repl-toggle-mode (evil-initialize-state 'emacs))
|
||||
:init (add-hook! repl-toggle-mode (evil-initialize-state 'emacs))
|
||||
:config
|
||||
(@set :popup
|
||||
(set! :popup
|
||||
'(:custom (lambda (b &rest _)
|
||||
(when (and (featurep 'repl-toggle)
|
||||
(string-prefix-p "*" (buffer-name (get-buffer b))))
|
||||
|
|
@ -109,7 +109,7 @@ suitability for the current buffer."
|
|||
(dolist (repl +eval--repls)
|
||||
(apply 'rtog/add-repl repl))
|
||||
|
||||
(@map :map repl-toggle-mode-map
|
||||
(map! :map repl-toggle-mode-map
|
||||
:ei "C-n" 'comint-next-input
|
||||
:ei "C-p" 'comint-previous-input
|
||||
:ei "<down>" 'comint-next-input
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
;; -*- no-byte-compile: t; -*-
|
||||
;;; feature/repl/packages.el
|
||||
|
||||
(@package quickrun)
|
||||
(@package repl-toggle)
|
||||
(package! quickrun)
|
||||
(package! repl-toggle)
|
||||
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
;; I'm a vimmer at heart. Its modal philosophy suits me better, and this module
|
||||
;; strives to make Emacs a much better vim than vim was.
|
||||
|
||||
(@def-setting :evil-state (&rest mode-state-list)
|
||||
(def-setting! :evil-state (&rest mode-state-list)
|
||||
"Set the initialize STATE of MODE using `evil-set-initial-state'."
|
||||
(if (cl-every 'listp mode-state-list)
|
||||
(let (forms)
|
||||
|
|
@ -22,7 +22,7 @@
|
|||
;; evil-mode
|
||||
;;
|
||||
|
||||
(@def-package evil :demand t
|
||||
(def-package! evil :demand t
|
||||
:init
|
||||
(setq evil-want-C-u-scroll t
|
||||
evil-want-visual-char-semi-exclusive t
|
||||
|
|
@ -44,12 +44,12 @@
|
|||
(evil-mode +1)
|
||||
(evil-select-search-module 'evil-search-module 'evil-search)
|
||||
|
||||
(@set :popup
|
||||
(set! :popup
|
||||
'("*evil-registers*" :size 0.3)
|
||||
'("*Command Line*" :size 8))
|
||||
|
||||
;; Set cursor colors later, presumably once theme is loaded
|
||||
(@add-hook 'after-init-hook
|
||||
(add-hook! 'after-init-hook
|
||||
(setq evil-default-cursor (face-attribute 'cursor :background nil t)
|
||||
evil-normal-state-cursor 'box
|
||||
evil-emacs-state-cursor `(,(face-attribute 'warning :foreground nil nil) box)
|
||||
|
|
@ -153,19 +153,19 @@
|
|||
;; Plugins
|
||||
;;
|
||||
|
||||
(@def-package evil-args
|
||||
(def-package! evil-args
|
||||
:commands (evil-inner-arg evil-outer-arg
|
||||
evil-forward-arg evil-backward-arg
|
||||
evil-jump-out-args)
|
||||
:init (+evil--textobj "a" 'evil-inner-arg 'evil-outer-arg))
|
||||
|
||||
|
||||
(@def-package evil-commentary
|
||||
(def-package! evil-commentary
|
||||
:commands (evil-commentary evil-commentary-yank evil-commentary-line)
|
||||
:config (evil-commentary-mode 1))
|
||||
|
||||
|
||||
(@def-package evil-easymotion
|
||||
(def-package! evil-easymotion
|
||||
:defer 1
|
||||
:commands evilem-define
|
||||
:config
|
||||
|
|
@ -192,7 +192,7 @@
|
|||
(evil-snipe-enable-incremental-highlight)))))
|
||||
|
||||
|
||||
(@def-package evil-embrace
|
||||
(def-package! evil-embrace
|
||||
:after evil-surround
|
||||
:config
|
||||
(setq evil-embrace-show-help-p nil)
|
||||
|
|
@ -238,15 +238,15 @@
|
|||
;; Add extra pairs
|
||||
(add-hook 'LaTeX-mode-hook 'embrace-LaTeX-mode-hook)
|
||||
(add-hook 'org-mode-hook 'embrace-org-mode-hook)
|
||||
(@add-hook emacs-lisp-mode
|
||||
(add-hook! emacs-lisp-mode
|
||||
(embrace-add-pair ?\` "`" "'"))
|
||||
(@add-hook (emacs-lisp-mode lisp-mode)
|
||||
(add-hook! (emacs-lisp-mode lisp-mode)
|
||||
(embrace-add-pair-regexp ?f "([^ ]+ " ")" '+evil--embrace-elisp-fn))
|
||||
(@add-hook (org-mode LaTeX-mode)
|
||||
(add-hook! (org-mode LaTeX-mode)
|
||||
(embrace-add-pair-regexp ?l "\\[a-z]+{" "}" '+evil--embrace-latex)))
|
||||
|
||||
|
||||
(@def-package evil-escape
|
||||
(def-package! evil-escape
|
||||
:commands evil-escape-mode
|
||||
:init
|
||||
(defun +evil|escape-disable () (evil-escape-mode -1))
|
||||
|
|
@ -261,7 +261,7 @@
|
|||
evil-escape-delay 0.25))
|
||||
|
||||
|
||||
(@def-package evil-exchange
|
||||
(def-package! evil-exchange
|
||||
:commands evil-exchange
|
||||
:config
|
||||
(defun +evil*exchange-off ()
|
||||
|
|
@ -269,7 +269,7 @@
|
|||
(advice-add 'evil-force-normal-state :after '+evil*exchange-off))
|
||||
|
||||
|
||||
(@def-package evil-indent-plus
|
||||
(def-package! evil-indent-plus
|
||||
:commands (evil-indent-plus-i-indent
|
||||
evil-indent-plus-a-indent
|
||||
evil-indent-plus-i-indent-up
|
||||
|
|
@ -282,13 +282,13 @@
|
|||
(+evil--textobj "J" 'evil-indent-plus-i-indent-up-down 'evil-indent-plus-a-indent-up-down))
|
||||
|
||||
|
||||
(@def-package evil-matchit
|
||||
(def-package! evil-matchit
|
||||
:commands (evilmi-jump-items evilmi-text-object global-evil-matchit-mode)
|
||||
:config (global-evil-matchit-mode 1)
|
||||
:init (+evil--textobj "%" 'evilmi-text-object))
|
||||
|
||||
|
||||
(@def-package evil-multiedit
|
||||
(def-package! evil-multiedit
|
||||
:commands (evil-multiedit-match-all
|
||||
evil-multiedit-match-and-next
|
||||
evil-multiedit-match-and-prev
|
||||
|
|
@ -302,20 +302,20 @@
|
|||
:config (evil-multiedit-default-keybinds))
|
||||
|
||||
|
||||
(@def-package evil-textobj-anyblock
|
||||
(def-package! evil-textobj-anyblock
|
||||
:commands (evil-numbers/inc-at-pt evil-numbers/dec-at-pt)
|
||||
:init
|
||||
(+evil--textobj "B" 'evil-textobj-anyblock-inner-block 'evil-textobj-anyblock-a-block))
|
||||
|
||||
|
||||
(@def-package evil-search-highlight-persist :demand t
|
||||
(def-package! evil-search-highlight-persist :demand t
|
||||
:commands (evil-textobj-anyblock-inner-block evil-textobj-anyblock-a-block)
|
||||
:config
|
||||
(global-evil-search-highlight-persist t)
|
||||
(advice-add 'evil-force-normal-state :after 'evil-search-highlight-persist-remove-all))
|
||||
|
||||
|
||||
(@def-package evil-snipe :demand t
|
||||
(def-package! evil-snipe :demand t
|
||||
:init
|
||||
(setq evil-snipe-smart-case t
|
||||
evil-snipe-scope 'line
|
||||
|
|
@ -331,12 +331,12 @@
|
|||
(evil-snipe-mode 1)
|
||||
(evil-snipe-override-mode 1)
|
||||
;; Switch to evil-easymotion/avy after first snipe
|
||||
(@map :map evil-snipe-parent-transient-map
|
||||
"C-;" (@λ (require 'evil-easymotion)
|
||||
(map! :map evil-snipe-parent-transient-map
|
||||
"C-;" (λ! (require 'evil-easymotion)
|
||||
(call-interactively +evil--snipe-repeat-fn))))
|
||||
|
||||
|
||||
(@def-package evil-surround
|
||||
(def-package! evil-surround
|
||||
:commands (global-evil-surround-mode
|
||||
evil-surround-edit
|
||||
evil-Surround-edit
|
||||
|
|
@ -344,7 +344,7 @@
|
|||
:config (global-evil-surround-mode 1))
|
||||
|
||||
|
||||
(@def-package evil-visualstar
|
||||
(def-package! evil-visualstar
|
||||
:commands (global-evil-visualstar-mode
|
||||
evil-visualstar/begin-search
|
||||
evil-visualstar/begin-search-forward
|
||||
|
|
@ -353,7 +353,7 @@
|
|||
|
||||
|
||||
;; A side-panel for browsing my project files. Inspired by vim's NERDTree.
|
||||
(@def-package neotree
|
||||
(def-package! neotree
|
||||
:commands (neotree-show
|
||||
neotree-hide
|
||||
neotree-toggle
|
||||
|
|
@ -382,7 +382,7 @@
|
|||
"~$"
|
||||
"^#.*#$"))
|
||||
|
||||
(@set :evil-state 'neotree-mode 'motion)
|
||||
(set! :evil-state 'neotree-mode 'motion)
|
||||
|
||||
(push neo-buffer-name winner-boring-buffers)
|
||||
|
||||
|
|
@ -390,7 +390,7 @@
|
|||
;; overridden when the neotree buffer is spawned). So we bind them in a hook.
|
||||
(add-hook 'neo-after-create-hook '+evil|neotree-init-keymap)
|
||||
(defun +evil|neotree-init-keymap (&rest _)
|
||||
(@map :Lm "\\\\" 'evil-window-prev
|
||||
(map! :Lm "\\\\" 'evil-window-prev
|
||||
:Lm "RET" 'neotree-enter
|
||||
:Lm "<return>" 'neotree-enter
|
||||
:Lm "ESC ESC" 'neotree-hide
|
||||
|
|
|
|||
|
|
@ -1,20 +1,20 @@
|
|||
;; -*- no-byte-compile: t; -*-
|
||||
;;; feature/evil/packages.el
|
||||
|
||||
(@package evil)
|
||||
(@package evil-args)
|
||||
(@package evil-commentary)
|
||||
(@package evil-easymotion)
|
||||
(@package evil-embrace)
|
||||
(@package evil-escape)
|
||||
(@package evil-exchange)
|
||||
(@package evil-indent-plus)
|
||||
(@package evil-matchit)
|
||||
(@package evil-multiedit)
|
||||
(@package evil-numbers)
|
||||
(@package evil-textobj-anyblock)
|
||||
(@package evil-search-highlight-persist)
|
||||
(@package evil-snipe)
|
||||
(@package evil-surround)
|
||||
(@package evil-visualstar)
|
||||
(@package neotree)
|
||||
(package! evil)
|
||||
(package! evil-args)
|
||||
(package! evil-commentary)
|
||||
(package! evil-easymotion)
|
||||
(package! evil-embrace)
|
||||
(package! evil-escape)
|
||||
(package! evil-exchange)
|
||||
(package! evil-indent-plus)
|
||||
(package! evil-matchit)
|
||||
(package! evil-multiedit)
|
||||
(package! evil-numbers)
|
||||
(package! evil-textobj-anyblock)
|
||||
(package! evil-search-highlight-persist)
|
||||
(package! evil-snipe)
|
||||
(package! evil-surround)
|
||||
(package! evil-visualstar)
|
||||
(package! neotree)
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
;;; feature/file-templates/config.el
|
||||
|
||||
(@require :feature snippets)
|
||||
(require! :feature snippets)
|
||||
|
||||
(defvar +file-templates-dir
|
||||
(expand-file-name "templates/" (file-name-directory load-file-name))
|
||||
"")
|
||||
|
||||
(@def-package autoinsert ; built-in
|
||||
(def-package! autoinsert ; built-in
|
||||
:after yasnippet
|
||||
:init
|
||||
(setq auto-insert-query nil ; Don't prompt before insertion
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
;; -*- no-byte-compile: t; -*-
|
||||
;;; feature/file-templates/packages.el
|
||||
|
||||
(@depends-on :feature snippets)
|
||||
(depends-on! :feature snippets)
|
||||
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
;; Snippets! I've thrown together a few hacks to make `yasnippet' and `evil'
|
||||
;; behave together.
|
||||
|
||||
(@def-package yasnippet
|
||||
(def-package! yasnippet
|
||||
:commands (yas-minor-mode
|
||||
yas-minor-mode-on
|
||||
yas-expand
|
||||
|
|
@ -14,7 +14,7 @@
|
|||
(defvar yas-minor-mode-map (make-sparse-keymap))
|
||||
|
||||
:init
|
||||
(@add-hook (text-mode prog-mode snippet-mode markdown-mode org-mode)
|
||||
(add-hook! (text-mode prog-mode snippet-mode markdown-mode org-mode)
|
||||
'yas-minor-mode-on)
|
||||
|
||||
:config
|
||||
|
|
@ -34,8 +34,8 @@
|
|||
;; fix an error caused by smartparens interfering with yasnippet bindings
|
||||
(advice-add 'yas-expand :before 'sp-remove-active-pair-overlay)
|
||||
|
||||
(@after evil
|
||||
(@map (:map yas-keymap
|
||||
(after! evil
|
||||
(map! (:map yas-keymap
|
||||
"C-e" '+snippets/goto-end-of-field
|
||||
"C-a" '+snippets/goto-start-of-field
|
||||
"<M-right>" '+snippets/goto-end-of-field
|
||||
|
|
@ -73,10 +73,10 @@
|
|||
(add-hook 'yas-after-exit-snippet-hook '+snippets|yas-after-expand)))
|
||||
|
||||
|
||||
(@def-package auto-yasnippet
|
||||
(def-package! auto-yasnippet
|
||||
:commands (aya-create aya-expand aya-open-line aya-persist-snippet)
|
||||
:init
|
||||
(@map :i [C-tab] 'aya-expand
|
||||
(map! :i [C-tab] 'aya-expand
|
||||
:nv [C-tab] 'aya-create)
|
||||
:config
|
||||
(setq aya-persist-snippets-dir (concat doom-local-dir "auto-snippets/")))
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
;; -*- no-byte-compile: t; -*-
|
||||
;;; feature/snippets/packages.el
|
||||
|
||||
(@package yasnippet)
|
||||
(@package auto-yasnippet)
|
||||
(package! yasnippet)
|
||||
(package! auto-yasnippet)
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
;;; feature/spellcheck/config.el
|
||||
|
||||
(@def-package flyspell ; built-in
|
||||
(def-package! flyspell ; built-in
|
||||
:commands flyspell-mode
|
||||
:init
|
||||
(add-hook 'text-mode-hook 'flyspell-mode)
|
||||
|
|
@ -9,25 +9,25 @@
|
|||
ispell-list-command "--list"
|
||||
ispell-extr-args '("--dont-tex-check-comments"))
|
||||
|
||||
(@map :map flyspell-mode-map
|
||||
(map! :map flyspell-mode-map
|
||||
:localleader
|
||||
:n "s" 'flyspell-correct-word-generic
|
||||
:n "S" 'flyspell-correct-previous-word-generic))
|
||||
|
||||
|
||||
(@def-package flyspell-correct
|
||||
(def-package! flyspell-correct
|
||||
:commands (flyspell-correct-word-generic
|
||||
flyspell-correct-previous-word-generic))
|
||||
|
||||
|
||||
(@def-package flyspell-correct-popup
|
||||
(def-package! flyspell-correct-popup
|
||||
:after flyspell-correct
|
||||
:config
|
||||
(setq flyspell-popup-correct-delay 0.8)
|
||||
(define-key popup-menu-keymap [escape] 'keyboard-quit))
|
||||
|
||||
|
||||
(@def-package flyspell-correct-helm :after flyspell-correct)
|
||||
(def-package! flyspell-correct-helm :after flyspell-correct)
|
||||
|
||||
|
||||
(@def-package flyspell-correct-ivy :after flyspell-correct)
|
||||
(def-package! flyspell-correct-ivy :after flyspell-correct)
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
;; -*- no-byte-compile: t; -*-
|
||||
;;; feature/spellcheck/packages.el
|
||||
|
||||
(@package flyspell-correct)
|
||||
(cond ((@featurep :completion ivy)
|
||||
(@package flyspell-correct-ivy))
|
||||
((@featurep :completion helm)
|
||||
(@package flyspell-correct-helm))
|
||||
(package! flyspell-correct)
|
||||
(cond ((featurep! :completion ivy)
|
||||
(package! flyspell-correct-ivy))
|
||||
((featurep! :completion helm)
|
||||
(package! flyspell-correct-helm))
|
||||
(t
|
||||
(@package flyspell-correct-popup)))
|
||||
(package! flyspell-correct-popup)))
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
;;; feature/syntax-checker/config.el
|
||||
|
||||
(@def-package flycheck
|
||||
(def-package! flycheck
|
||||
:commands (flycheck-mode flycheck-list-errors flycheck-buffer)
|
||||
:config
|
||||
(setq flycheck-indication-mode 'right-fringe ; git-gutter is in the left fringe
|
||||
|
|
@ -9,9 +9,9 @@
|
|||
flycheck-highlighting-mode 'symbols
|
||||
flycheck-disabled-checkers '(emacs-lisp-checkdoc make))
|
||||
|
||||
(@set :popup " ?\\*Flycheck.+\\*" :size 14 :noselect t :regexp t)
|
||||
(set! :popup " ?\\*Flycheck.+\\*" :size 14 :noselect t :regexp t)
|
||||
|
||||
(@map :map flycheck-error-list-mode-map
|
||||
(map! :map flycheck-error-list-mode-map
|
||||
:n "C-n" 'flycheck-error-list-next-error
|
||||
:n "C-p" 'flycheck-error-list-previous-error
|
||||
:n "j" 'flycheck-error-list-next-error
|
||||
|
|
@ -27,7 +27,7 @@
|
|||
(advice-add 'evil-force-normal-state :after '+syntax-checkers|flycheck-buffer))
|
||||
|
||||
|
||||
(@def-package flycheck-pos-type :after flycheck
|
||||
(def-package! flycheck-pos-type :after flycheck
|
||||
:config
|
||||
(setq flycheck-pos-tip-timeout 10
|
||||
flycheck-display-errors-delay 0.5)
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
;; -*- no-byte-compile: t; -*-
|
||||
;;; feature/syntax-checker/packages.el
|
||||
|
||||
(@package flycheck)
|
||||
(@package flycheck-pos-tip)
|
||||
(package! flycheck)
|
||||
(package! flycheck-pos-tip)
|
||||
|
||||
|
|
|
|||
|
|
@ -1,44 +1,44 @@
|
|||
;;; feature/version-control/+git.el
|
||||
|
||||
(@def-package gitconfig-mode
|
||||
(def-package! gitconfig-mode
|
||||
:mode "/\\.?git/?config$"
|
||||
:mode "/\\.gitmodules$"
|
||||
:init (add-hook 'gitconfig-mode-hook 'flyspell-mode))
|
||||
|
||||
(@def-package gitignore-mode
|
||||
(def-package! gitignore-mode
|
||||
:mode "/\\.gitignore$")
|
||||
|
||||
|
||||
(@def-package git-gutter-fringe
|
||||
(def-package! git-gutter-fringe
|
||||
:commands git-gutter-mode
|
||||
:init
|
||||
(@add-hook (text-mode prog-mode conf-mode) 'git-gutter-mode)
|
||||
(add-hook! (text-mode prog-mode conf-mode) 'git-gutter-mode)
|
||||
:config
|
||||
(@set :popup "^\\*git-gutter.+\\*$" :regexp t :size 15 :noselect t)
|
||||
(set! :popup "^\\*git-gutter.+\\*$" :regexp t :size 15 :noselect t)
|
||||
|
||||
;; Update git-gutter on focus (in case I was using git externally)
|
||||
(add-hook 'focus-in-hook 'git-gutter:update-all-windows)
|
||||
|
||||
(@after evil
|
||||
(after! evil
|
||||
;; Refreshing git-gutter on ESC
|
||||
(advice-add 'evil-force-normal-state :after 'git-gutter)))
|
||||
|
||||
|
||||
(@def-package browse-at-remote
|
||||
(def-package! browse-at-remote
|
||||
:commands (browse-at-remote/browse browse-at-remote/get-url))
|
||||
|
||||
|
||||
(@def-package magit
|
||||
(def-package! magit
|
||||
:commands magit-status
|
||||
:config
|
||||
(@set :popup "^\\*magit" :regexp t)
|
||||
(@map :map magit-mode-map
|
||||
(set! :popup "^\\*magit" :regexp t)
|
||||
(map! :map magit-mode-map
|
||||
;; Don't interfere with window movement keys
|
||||
:nv "C-j" nil
|
||||
:nv "C-k" nil))
|
||||
|
||||
|
||||
(@def-package evil-magit
|
||||
(def-package! evil-magit
|
||||
:after magit
|
||||
:config
|
||||
;; evil-snipe conflicts with magit
|
||||
|
|
|
|||
|
|
@ -1,19 +1,19 @@
|
|||
;;; feature/version-control/config.el
|
||||
|
||||
(@load +git)
|
||||
;; (@load +hg)
|
||||
(load! +git)
|
||||
;; (load! +hg)
|
||||
|
||||
(@after vc-annotate
|
||||
(@set :popup
|
||||
(after! vc-annotate
|
||||
(set! :popup
|
||||
'("*vc-diff*" :size 15 :noselect t)
|
||||
'("*vc-change-log*" :size 15)
|
||||
'(vc-annotate-mode :same t))
|
||||
|
||||
(@set :evil-state
|
||||
(set! :evil-state
|
||||
'(vc-annotate-mode . normal)
|
||||
'(vc-git-log-view-mode . normal))
|
||||
|
||||
(@map :map vc-annotate-mode-map
|
||||
(map! :map vc-annotate-mode-map
|
||||
:n "q" 'kill-this-buffer
|
||||
:n "d" 'vc-annotate-show-diff-revision-at-line
|
||||
:n "D" 'vc-annotate-show-changeset-diff-revision-at-line
|
||||
|
|
|
|||
|
|
@ -5,12 +5,12 @@
|
|||
;; n/a
|
||||
|
||||
;;; +git
|
||||
(@package browse-at-remote)
|
||||
(@package git-gutter-fringe)
|
||||
(@package gitconfig-mode)
|
||||
(@package gitignore-mode)
|
||||
(@package magit)
|
||||
(when (@featurep :feature evil)
|
||||
(@package evil-magit))
|
||||
(package! browse-at-remote)
|
||||
(package! git-gutter-fringe)
|
||||
(package! gitconfig-mode)
|
||||
(package! gitignore-mode)
|
||||
(package! magit)
|
||||
(when (featurep! :feature evil)
|
||||
(package! evil-magit))
|
||||
|
||||
;;; TODO +hg
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
"A hook that runs when persp loads a new session.")
|
||||
|
||||
|
||||
(@def-package persp-mode :demand t
|
||||
(def-package! persp-mode :demand t
|
||||
:config
|
||||
(setq persp-autokill-buffer-on-remove 'kill-weak
|
||||
persp-nil-name "main"
|
||||
|
|
@ -55,7 +55,7 @@
|
|||
;; TODO Test per-frame perspectives
|
||||
|
||||
;; Be quiet when saving
|
||||
(defun +workspace*silence (orig-fn &rest args) (@quiet (apply orig-fn args)))
|
||||
(defun +workspace*silence (orig-fn &rest args) (quiet! (apply orig-fn args)))
|
||||
(advice-add 'persp-save-state-to-file :around '+workspace*silence)
|
||||
|
||||
;; Add a hook to session loading
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
;; -*- no-byte-compile: t; -*-
|
||||
;;; feature/workspaces/packages.el
|
||||
|
||||
(@package persp-mode)
|
||||
(package! persp-mode)
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue