dev: merging from main and pr7339
This commit is contained in:
commit
3daf85b919
18 changed files with 78 additions and 86 deletions
|
|
@ -8,7 +8,7 @@
|
|||
:config
|
||||
(set-yas-minor-mode! 'emacs-everywhere-mode)
|
||||
|
||||
;; HACK Inhibit MAJOR-MODE-local-vars-hook in emacs-everywhere buffers,
|
||||
;; HACK: Inhibit MAJOR-MODE-local-vars-hook in emacs-everywhere buffers,
|
||||
;; because Doom commonly starts servers and other extraneous services on
|
||||
;; this hook, which will rarely work well in emacs-everywhere's temporary
|
||||
;; buffers anyway.
|
||||
|
|
|
|||
|
|
@ -53,7 +53,7 @@ TAB/S-TAB.")
|
|||
(corfu-mode +1))))
|
||||
:config
|
||||
(setq corfu-auto t
|
||||
corfu-auto-delay 0.1
|
||||
corfu-auto-delay 0.18
|
||||
corfu-auto-prefix 2
|
||||
global-corfu-modes '((not
|
||||
erc-mode
|
||||
|
|
|
|||
|
|
@ -413,20 +413,6 @@ This generally applies to your private config (`doom-user-dir') or Doom's source
|
|||
;;
|
||||
;;; Fontification
|
||||
|
||||
;;;###autoload
|
||||
(defun +emacs-lisp-truncate-pin ()
|
||||
"Truncates long SHA1 hashes in `package!' :pin's."
|
||||
(save-excursion
|
||||
(goto-char (match-beginning 0))
|
||||
(and (stringp (plist-get (sexp-at-point) :pin))
|
||||
(search-forward ":pin" nil t)
|
||||
(let ((start (re-search-forward "\"[^\"\n]\\{12\\}" nil t))
|
||||
(finish (and (re-search-forward "\"" (line-end-position) t)
|
||||
(match-beginning 0))))
|
||||
(when (and start finish)
|
||||
(put-text-property start finish 'display "...")))))
|
||||
nil)
|
||||
|
||||
(defvar +emacs-lisp--face nil)
|
||||
;;;###autoload
|
||||
(defun +emacs-lisp-highlight-vars-and-faces (end)
|
||||
|
|
|
|||
|
|
@ -115,8 +115,6 @@ See `+emacs-lisp-non-package-mode' for details.")
|
|||
'emacs-lisp-mode
|
||||
(append `(;; custom Doom cookies
|
||||
("^;;;###\\(autodef\\|if\\|package\\)[ \n]" (1 font-lock-warning-face t)))
|
||||
;; Shorten the :pin of `package!' statements to 10 characters
|
||||
`(("(package!\\_>" (0 (+emacs-lisp-truncate-pin))))
|
||||
;; highlight defined, special variables & functions
|
||||
(when +emacs-lisp-enable-extra-fontification
|
||||
`((+emacs-lisp-highlight-vars-and-faces . +emacs-lisp--face)))))
|
||||
|
|
|
|||
|
|
@ -11,8 +11,6 @@
|
|||
:interpreter ("\\(?:cached-\\)?nix-shell" . +nix-shell-init-mode)
|
||||
:mode "\\.nix\\'"
|
||||
:init
|
||||
;; Treat flake.lock files as json. Fall back to js-mode because it's faster
|
||||
;; than js2-mode, and its extra features aren't needed there.
|
||||
(add-to-list 'auto-mode-alist
|
||||
(cons "/flake\\.lock\\'"
|
||||
(if (modulep! :lang json)
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
;; -*- no-byte-compile: t; -*-
|
||||
;;; tools/magit/packages.el
|
||||
|
||||
(when (package! magit :pin "0963697f24cfbe80f92312044bd9ab28b914b053")
|
||||
(when (package! magit :pin "0e8f25a8d8011328f2bf082232c720b24c2a12c2")
|
||||
(when (modulep! +forge)
|
||||
(package! forge :pin "68771ca4d53c3aea5c860eeb888cee8e9cb5ca37")
|
||||
(package! forge :pin "2a3b41eb6235b3f39c017c1f86b3928a45c5a64d")
|
||||
(package! code-review
|
||||
:recipe (:host github
|
||||
:repo "doomelpa/code-review"
|
||||
:files ("graphql" "code-review*.el"))
|
||||
:pin "e4c34fa284da25d8e0bafbae4300f1db5bdcda44"))
|
||||
(package! magit-todos :pin "1e9acc0ba63fbc297001bf334d63cb4326be80df"))
|
||||
(package! magit-todos :pin "332ce763f7336ea356964b92723678aa1ed4640f"))
|
||||
|
|
|
|||
|
|
@ -161,12 +161,13 @@ and cannot run in."
|
|||
(fboundp 'mac-auto-operator-composition-mode))
|
||||
(add-hook 'doom-init-ui-hook #'mac-auto-operator-composition-mode 'append))
|
||||
|
||||
;; NOTE: the module does not support Emacs 27 and less, but if we still try to enable ligatures,
|
||||
;; it will end up in catastrophic work-loss errors, so we leave the check here for safety.
|
||||
;; This module does not support Emacs 27 and less, but if we still try to
|
||||
;; enable ligatures, it will end up in catastrophic work-loss errors, so we
|
||||
;; leave the check here for safety.
|
||||
((and (> emacs-major-version 27)
|
||||
(or (featurep 'ns)
|
||||
(string-match-p "HARFBUZZ" system-configuration-features))
|
||||
(featurep 'composite)) ; Emacs loads `composite' at startup
|
||||
(featurep 'harfbuzz))
|
||||
(featurep 'composite)) ; Emacs loads `composite' at startup
|
||||
|
||||
(use-package! ligature
|
||||
:config
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ This must be set before `treemacs' has loaded.")
|
|||
treemacs-persist-file (concat doom-cache-dir "treemacs-persist")
|
||||
treemacs-last-error-persist-file (concat doom-cache-dir "treemacs-last-error-persist"))
|
||||
:config
|
||||
;; Don't follow the cursor
|
||||
;; Don't follow the cursor (it's more disruptive/jarring than helpful as a default)
|
||||
(treemacs-follow-mode -1)
|
||||
|
||||
(set-popup-rule! "^ ?\\*Treemacs" :ignore t)
|
||||
|
|
|
|||
|
|
@ -1,17 +0,0 @@
|
|||
;;; ui/workspaces/autoload/ivy.el -*- lexical-binding: t; -*-
|
||||
;;;###if (modulep! :completion ivy)
|
||||
|
||||
;;;###autoload
|
||||
(defun +workspace--ivy-rich-preview (workspace)
|
||||
(if-let (buffers (when-let (workspace (gethash workspace *persp-hash*))
|
||||
(cl-loop for (type . rest) in (persp-window-conf workspace)
|
||||
if (eq type 'buffer)
|
||||
collect (car leaf)
|
||||
else if (eq type 'leaf)
|
||||
append (cl-loop for (type . leaf) in rest
|
||||
if (eq type 'buffer)
|
||||
collect (car leaf)))))
|
||||
(string-join buffers " ")
|
||||
"*No buffers*"))
|
||||
|
||||
;;; ivy.el ends here
|
||||
|
|
@ -318,12 +318,7 @@ workspace, otherwise the new workspace is blank."
|
|||
end of the workspace list."
|
||||
(interactive
|
||||
(list (or current-prefix-arg
|
||||
(if (modulep! :completion ivy)
|
||||
(ivy-read "Switch to workspace: "
|
||||
(+workspace-list-names)
|
||||
:caller #'+workspace/switch-to
|
||||
:preselect (+workspace-current-name))
|
||||
(completing-read "Switch to workspace: " (+workspace-list-names))))))
|
||||
(completing-read "Switch to workspace: " (+workspace-list-names)))))
|
||||
(when (and (stringp index)
|
||||
(string-match-p "^[0-9]+$" index))
|
||||
(setq index (string-to-number index)))
|
||||
|
|
|
|||
|
|
@ -206,13 +206,6 @@ stored in `persp-save-dir'.")
|
|||
("xt" counsel-projectile-switch-project-action-run-term "invoke term from project root")
|
||||
("X" counsel-projectile-switch-project-action-org-capture "org-capture into project")))
|
||||
|
||||
(when (modulep! :completion ivy)
|
||||
(after! ivy-rich
|
||||
(cl-callf plist-put ivy-rich-display-transformers-list
|
||||
'+workspace/switch-to
|
||||
'(:columns ((ivy-rich-candidate (:width 50))
|
||||
(+workspace--ivy-rich-preview))))))
|
||||
|
||||
(when (modulep! :completion helm)
|
||||
(after! helm-projectile
|
||||
(setcar helm-source-projectile-projects-actions
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue