Doom style: add blank lines, align keys, change macro expansion keys

This commit is contained in:
Hugo Nobrega 2021-04-19 21:08:02 -03:00
parent c2b40148b8
commit 4f50d9a750

View file

@ -4,12 +4,13 @@
:hook (scheme-mode . rainbow-delimiters-mode) :hook (scheme-mode . rainbow-delimiters-mode)
:config (advice-add #'scheme-indent-function :override #'+scheme-scheme-indent-function-a)) :config (advice-add #'scheme-indent-function :override #'+scheme-scheme-indent-function-a))
(use-package! geiser (use-package! geiser
:defer t :defer t
:init :init
(setq geiser-autodoc-identifier-format "%s → %s" (setq geiser-autodoc-identifier-format "%s → %s"
geiser-repl-current-project-function #'doom-project-root) geiser-repl-current-project-function #'doom-project-root)
(after! scheme ; built-in (after! scheme ; built-in
(set-repl-handler! 'scheme-mode #'+scheme/open-repl) (set-repl-handler! 'scheme-mode #'+scheme/open-repl)
(set-eval-handler! 'scheme-mode #'geiser-eval-region) (set-eval-handler! 'scheme-mode #'geiser-eval-region)
@ -21,39 +22,40 @@
'(("^\\*[gG]eiser \\(dbg\\|xref\\|messages\\)\\*$" :slot 1 :vslot -1) '(("^\\*[gG]eiser \\(dbg\\|xref\\|messages\\)\\*$" :slot 1 :vslot -1)
("^\\*Geiser documentation\\*$" :slot 2 :vslot 2 :select t :size 0.35) ("^\\*Geiser documentation\\*$" :slot 2 :vslot 2 :select t :size 0.35)
("^\\* [A-Za-z0-9_-]+ REPL \\*" :size 0.3 :quit nil :ttl nil))) ("^\\* [A-Za-z0-9_-]+ REPL \\*" :size 0.3 :quit nil :ttl nil)))
(map!
:localleader (map! :localleader
(:map (scheme-mode-map geiser-repl-mode-map) (:map (scheme-mode-map geiser-repl-mode-map)
:desc "Toggle REPL" "'" #'switch-to-geiser :desc "Toggle REPL" "'" #'switch-to-geiser
:desc "Connect to external Scheme" "\"" #'geiser-connect :desc "Connect to external Scheme" "\"" #'geiser-connect
:desc "Toggle type of brackets" "[" #'geiser-squarify :desc "Toggle type of brackets" "[" #'geiser-squarify
:desc "Insert lambda" "\\" #'geiser-insert-lambda :desc "Insert lambda" "\\" #'geiser-insert-lambda
:desc "Set Scheme implementation" "s" #'geiser-set-scheme :desc "Set Scheme implementation" "s" #'geiser-set-scheme
:desc "Reload Geiser buffers+REPLs" "R" #'geiser-reload :desc "Reload Geiser buffers+REPLs" "R" #'geiser-reload
(:prefix ("h" . "help") (:prefix ("h" . "help")
:desc "Show callers of <point>" "<" #'geiser-xref-callers :desc "Show callers of <point>" "<" #'geiser-xref-callers
:desc "Show callees of <point>" ">" #'geiser-xref-callees :desc "Show callees of <point>" ">" #'geiser-xref-callees
:desc "Toggle autodoc mode" "a" #'geiser-autodoc-mode :desc "Toggle autodoc mode" "a" #'geiser-autodoc-mode
:desc "Show autodoc of <point>" "s" #'geiser-autodoc-show :desc "Show autodoc of <point>" "s" #'geiser-autodoc-show
:desc "Search manual for <point>" "m" #'geiser-doc-look-up-manual :desc "Search manual for <point>" "m" #'geiser-doc-look-up-manual
:desc "Show docstring of <point>" "." #'geiser-doc-symbol-at-point) :desc "Show docstring of <point>" "." #'geiser-doc-symbol-at-point)
(:prefix ("r" . "repl") (:prefix ("r" . "repl")
:desc "Load file into REPL" "f" #'geiser-load-file :desc "Load file into REPL" "f" #'geiser-load-file
:desc "Restart REPL" "r" #'geiser-restart-repl)) :desc "Restart REPL" "r" #'geiser-restart-repl))
(:map scheme-mode-map (:map scheme-mode-map
(:prefix ("e" . "eval") (:prefix ("e" . "eval")
:desc "Eval buffer" "b" #'geiser-eval-buffer :desc "Eval buffer" "b" #'geiser-eval-buffer
:desc "Eval buffer and go to REPL" "B" #'geiser-eval-buffer-and-go :desc "Eval buffer and go to REPL" "B" #'geiser-eval-buffer-and-go
:desc "Eval last sexp" "e" #'geiser-eval-last-sexp :desc "Eval last sexp" "e" #'geiser-eval-last-sexp
:desc "Eval definition" "d" #'geiser-eval-definition :desc "Eval definition" "d" #'geiser-eval-definition
:desc "Eval defn. and go to REPL" "D" #'geiser-eval-definition-and-go :desc "Eval defn. and go to REPL" "D" #'geiser-eval-definition-and-go
:desc "Eval region" "r" #'geiser-eval-region :desc "Eval region" "r" #'geiser-eval-region
:desc "Eval region and go to REPL" "R" #'geiser-eval-region-and-go) :desc "Eval region and go to REPL" "R" #'geiser-eval-region-and-go)
(:prefix ("r" . "repl") (:prefix ("r" . "repl")
:desc "Load current buffer in REPL" "b" #'geiser-load-current-buffer)) :desc "Load current buffer in REPL" "b" #'geiser-load-current-buffer))
(:map geiser-repl-mode-map (:map geiser-repl-mode-map
:desc "Clear REPL buffer" "c" #'geiser-repl-clear-buffer :desc "Clear REPL buffer" "c" #'geiser-repl-clear-buffer
:desc "Quit REPL" "q" #'geiser-repl-exit))) :desc "Quit REPL" "q" #'geiser-repl-exit)))
(use-package! macrostep-geiser (use-package! macrostep-geiser
:hook (geiser-mode . macrostep-geiser-setup) :hook (geiser-mode . macrostep-geiser-setup)
@ -62,10 +64,9 @@
(map! :after geiser (map! :after geiser
:localleader :localleader
:map (scheme-mode-map geiser-repl-mode-map) :map (scheme-mode-map geiser-repl-mode-map)
(:prefix ("x" . "expand") :desc "Expand macro by one step" "m" #'macrostep-expand
:desc "Expand macro by one step" "x" #'macrostep-expand :desc "Recursively expand macro" "M" #'macrostep-geiser-expand-all))
:desc "Recursively expand macro" "r" #'macrostep-geiser-expand-all
:desc "Collapse macro by one step" "c" #'macrostep-collapse)))
(use-package! flycheck-guile (use-package! flycheck-guile
:when (featurep! +guile) :when (featurep! +guile)