diff --git a/core/autoload/help.el b/core/autoload/help.el index 4d485508d..fa010b9e3 100644 --- a/core/autoload/help.el +++ b/core/autoload/help.el @@ -306,14 +306,14 @@ without needing to check if they are available." (defun doom--help-modules-list () (cl-loop for path in (cdr (doom-module-load-path 'all)) for (cat . mod) = (doom-module-from-path path) - for path = (or (doom-module-locate-path cat mod "README.org") - (doom-module-locate-path cat mod)) + for readme-path = (or (doom-module-locate-path cat mod "README.org") + (doom-module-locate-path cat mod)) for format = (format "%s %s" cat mod) if (doom-module-p cat mod) - collect (list format path) + collect (list format readme-path) else if (and cat mod) collect (list (propertize format 'face 'font-lock-comment-face) - path))) + readme-path))) (defun doom--help-current-module-str () (cond ((and buffer-file-name diff --git a/modules/completion/ivy/config.el b/modules/completion/ivy/config.el index bca1f21bb..31ca4eb4b 100644 --- a/modules/completion/ivy/config.el +++ b/modules/completion/ivy/config.el @@ -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) #'+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)) (setf (alist-get fn ivy-posframe-display-functions-alist) #'ivy-display-function-fallback))) diff --git a/modules/ui/doom/config.el b/modules/ui/doom/config.el index efa2f4345..82da526b8 100644 --- a/modules/ui/doom/config.el +++ b/modules/ui/doom/config.el @@ -14,9 +14,9 @@ (doom-solarized-dark . t) (doom-solarized-light) (doom-spacegrey . t) - (doom-vibrant) (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 `solaire-mode-swap-bg' will be used automatically, when the theme is loaded.") @@ -24,7 +24,6 @@ ;; ;;; Packages -;; (use-package! doom-themes :defer t :init diff --git a/modules/ui/workspaces/config.el b/modules/ui/workspaces/config.el index e401719ca..cc5057665 100644 --- a/modules/ui/workspaces/config.el +++ b/modules/ui/workspaces/config.el @@ -162,8 +162,10 @@ stored in `persp-save-dir'.") ("C" counsel-projectile-switch-project-action-configure "run project configure command") ("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") - ("s" (lambda (project) (let ((projectile-switch-project-action (lambda () (call-interactively #'+ivy/project-search)))) - (counsel-projectile-switch-project-by-name project))) "search project") + ("s" (lambda (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") ("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")