Minor refactors & reformatting

This commit is contained in:
Henrik Lissner 2019-12-05 14:56:16 -05:00
parent 96e0ccab21
commit c13b8df5df
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
4 changed files with 13 additions and 10 deletions

View file

@ -306,14 +306,14 @@ without needing to check if they are available."
(defun doom--help-modules-list () (defun doom--help-modules-list ()
(cl-loop for path in (cdr (doom-module-load-path 'all)) (cl-loop for path in (cdr (doom-module-load-path 'all))
for (cat . mod) = (doom-module-from-path path) for (cat . mod) = (doom-module-from-path path)
for path = (or (doom-module-locate-path cat mod "README.org") for readme-path = (or (doom-module-locate-path cat mod "README.org")
(doom-module-locate-path cat mod)) (doom-module-locate-path cat mod))
for format = (format "%s %s" cat mod) for format = (format "%s %s" cat mod)
if (doom-module-p cat mod) if (doom-module-p cat mod)
collect (list format path) collect (list format readme-path)
else if (and cat mod) else if (and cat mod)
collect (list (propertize format 'face 'font-lock-comment-face) collect (list (propertize format 'face 'font-lock-comment-face)
path))) readme-path)))
(defun doom--help-current-module-str () (defun doom--help-current-module-str ()
(cond ((and buffer-file-name (cond ((and buffer-file-name

View file

@ -333,7 +333,9 @@ evil-ex-specific constructs, so we disable it solely in evil-ex."
(setf (alist-get t ivy-posframe-display-functions-alist) (setf (alist-get t ivy-posframe-display-functions-alist)
#'+ivy-display-at-frame-center-near-bottom-fn) #'+ivy-display-at-frame-center-near-bottom-fn)
;; posframe doesn't work well with async sources ;; posframe doesn't work well with async sources (the posframe will
;; occasionally stop responding/redrawing), and causes violent resizing of the
;; posframe.
(dolist (fn '(swiper counsel-rg counsel-grep counsel-git-grep)) (dolist (fn '(swiper counsel-rg counsel-grep counsel-git-grep))
(setf (alist-get fn ivy-posframe-display-functions-alist) (setf (alist-get fn ivy-posframe-display-functions-alist)
#'ivy-display-function-fallback))) #'ivy-display-function-fallback)))

View file

@ -14,9 +14,9 @@
(doom-solarized-dark . t) (doom-solarized-dark . t)
(doom-solarized-light) (doom-solarized-light)
(doom-spacegrey . t) (doom-spacegrey . t)
(doom-vibrant)
(doom-tomorrow-day . t) (doom-tomorrow-day . t)
(doom-tomorrow-night . t)) (doom-tomorrow-night . t)
(doom-vibrant))
"An alist of themes that support `solaire-mode'. If CDR is t, then "An alist of themes that support `solaire-mode'. If CDR is t, then
`solaire-mode-swap-bg' will be used automatically, when the theme is loaded.") `solaire-mode-swap-bg' will be used automatically, when the theme is loaded.")
@ -24,7 +24,6 @@
;; ;;
;;; Packages ;;; Packages
;; <https://github.com/hlissner/emacs-doom-theme>
(use-package! doom-themes (use-package! doom-themes
:defer t :defer t
:init :init

View file

@ -162,8 +162,10 @@ stored in `persp-save-dir'.")
("C" counsel-projectile-switch-project-action-configure "run project configure command") ("C" counsel-projectile-switch-project-action-configure "run project configure command")
("e" counsel-projectile-switch-project-action-edit-dir-locals "edit project dir-locals") ("e" counsel-projectile-switch-project-action-edit-dir-locals "edit project dir-locals")
("v" counsel-projectile-switch-project-action-vc "open project in vc-dir / magit / monky") ("v" counsel-projectile-switch-project-action-vc "open project in vc-dir / magit / monky")
("s" (lambda (project) (let ((projectile-switch-project-action (lambda () (call-interactively #'+ivy/project-search)))) ("s" (lambda (project)
(counsel-projectile-switch-project-by-name project))) "search project") (let ((projectile-switch-project-action
(lambda () (call-interactively #'+ivy/project-search))))
(counsel-projectile-switch-project-by-name project))) "search project")
("xs" counsel-projectile-switch-project-action-run-shell "invoke shell from project root") ("xs" counsel-projectile-switch-project-action-run-shell "invoke shell from project root")
("xe" counsel-projectile-switch-project-action-run-eshell "invoke eshell from project root") ("xe" counsel-projectile-switch-project-action-run-eshell "invoke eshell from project root")
("xt" counsel-projectile-switch-project-action-run-term "invoke term from project root") ("xt" counsel-projectile-switch-project-action-run-term "invoke term from project root")