From 1ddd74b003cf6b803c15a64a1e97bb754f042497 Mon Sep 17 00:00:00 2001 From: "Kirill A. Korinsky" Date: Fri, 12 Jan 2024 02:57:25 +0100 Subject: [PATCH 01/49] bump: :email wanderlust wanderlust/flim@80b8121f05a5 -> wanderlust/flim@abdd2315006e wanderlust/semi@9370961ddcee -> wanderlust/semi@9063a4485b14 wanderlust/wanderlust@8369b2d5170a -> wanderlust/wanderlust@9fd2c65e8d69 --- modules/email/wanderlust/packages.el | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/email/wanderlust/packages.el b/modules/email/wanderlust/packages.el index 4d9a109a9..57afc4e87 100644 --- a/modules/email/wanderlust/packages.el +++ b/modules/email/wanderlust/packages.el @@ -5,7 +5,7 @@ ;; depends on flim, flim on apel), but they all have non-standard default ;; branches which straight cannot detect without our help. (package! apel :recipe (:branch "apel-wl") :pin "82eb2325bd149dc57b43a9ce9402c6c6183e4052") -(package! flim :recipe (:branch "flim-1_14-wl") :pin "80b8121f05a5a0d7fcfe3e54085467a646dd2028") -(package! semi :recipe (:branch "semi-1_14-wl") :pin "9370961ddcee78e389e44b36d38c3d93f8351619") +(package! flim :recipe (:branch "flim-1_14-wl") :pin "abdd2315006eb31476249223569808adb1c0f7b2") +(package! semi :recipe (:branch "semi-1_14-wl") :pin "9063a4485b148a767ea924f0e7cc78d3524ba256") -(package! wanderlust :pin "8369b2d5170a174652294835dd9a18ed21a38cb2") +(package! wanderlust :pin "9fd2c65e8d690625f35035a71e73f51f740dbe04") From 916c97bdf1add1f964ca630848bd2c5e544e21de Mon Sep 17 00:00:00 2001 From: "Kirill A. Korinsky" Date: Sun, 14 Jan 2024 14:09:05 +0100 Subject: [PATCH 02/49] tweak(wanderlust): switch to alerting --- modules/email/wanderlust/config.el | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/email/wanderlust/config.el b/modules/email/wanderlust/config.el index 23b7bf70a..021a3f996 100644 --- a/modules/email/wanderlust/config.el +++ b/modules/email/wanderlust/config.el @@ -70,6 +70,10 @@ (setq wl-message-id-domain wl-local-domain) + ;; Use alert for alerting + (when (fboundp 'alert) + (setq wl-biff-notify-hook '((lambda () (alert "You have new mail!" :title "Wanderlust"))))) + (when (modulep! :editor evil) ;; Neither `wl-folder-mode' nor `wl-summary-mode' are correctly defined as ;; major modes, so we cannot use `set-evil-initial-state!' here. From dbbd1f2b01010c5f784241d066ccf586167b099c Mon Sep 17 00:00:00 2001 From: "Kirill A. Korinsky" Date: Sun, 14 Jan 2024 14:10:54 +0100 Subject: [PATCH 03/49] tweak(wanderlust): don't show DKIM, ARC and similar signatures --- modules/email/wanderlust/config.el | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/modules/email/wanderlust/config.el b/modules/email/wanderlust/config.el index 021a3f996..ce1a4bcf0 100644 --- a/modules/email/wanderlust/config.el +++ b/modules/email/wanderlust/config.el @@ -29,6 +29,7 @@ "^References:" "^Replied:" "^Errors-To:" + "^Mail-.*-To:" "^Lines:" "^Sender:" ".*Host:" @@ -40,7 +41,14 @@ "^MIME.*:" "^In-Reply-To:" "^Content-Transfer-Encoding:" - "^List-.*:") + "^Content-Disposition:" + "^List-.*:" + "^Received-SPF:" + "^DKIM-.*:" + "^SPF-.*:" + "^Autocrypt:" + "^ARC-.*:" + "^Authentication-Results:") wl-message-visible-field-list '("^Message-Id:" "^User-Agent:" From e09838e01ae42b1043b6e5f7262e0a91270d173f Mon Sep 17 00:00:00 2001 From: "Kirill A. Korinsky" Date: Sun, 14 Jan 2024 14:13:17 +0100 Subject: [PATCH 04/49] fix(wanderlust): avoid `File name too long...` --- modules/email/wanderlust/config.el | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/email/wanderlust/config.el b/modules/email/wanderlust/config.el index ce1a4bcf0..f9a718355 100644 --- a/modules/email/wanderlust/config.el +++ b/modules/email/wanderlust/config.el @@ -20,6 +20,10 @@ wl-init-file (expand-file-name "wl.el" doom-user-dir) wl-folders-file (expand-file-name "folders.wl" doom-user-dir)) + ;; macOS allows file names up to 255 characters, + ;; use half of that size as threshold to switch to hashing + (setq elmo-msgdb-path-encode-threshold 128) + (setq wl-message-truncate-lines t wl-summary-width 120 wl-message-ignored-field-list From ebcb383c99008a25e1c4f1cb3ea2b80c645d2be6 Mon Sep 17 00:00:00 2001 From: "Kirill A. Korinsky" Date: Sun, 14 Jan 2024 14:18:23 +0100 Subject: [PATCH 05/49] tweak(wanderlust): do not truncate long subjects or mail lines --- modules/email/wanderlust/config.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/email/wanderlust/config.el b/modules/email/wanderlust/config.el index f9a718355..b393760c7 100644 --- a/modules/email/wanderlust/config.el +++ b/modules/email/wanderlust/config.el @@ -24,8 +24,8 @@ ;; use half of that size as threshold to switch to hashing (setq elmo-msgdb-path-encode-threshold 128) - (setq wl-message-truncate-lines t - wl-summary-width 120 + (setq wl-message-truncate-lines nil + wl-summary-width nil wl-message-ignored-field-list '(".*Received:" ".*Path:" From a20ca0cc0a316881546bd6aaa0fe636ae0459ab4 Mon Sep 17 00:00:00 2001 From: "Kirill A. Korinsky" Date: Sun, 14 Jan 2024 14:19:53 +0100 Subject: [PATCH 06/49] fix(wanderlust): enforce `wl-message-id-domain` only on automatic gmail config --- modules/email/wanderlust/config.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/email/wanderlust/config.el b/modules/email/wanderlust/config.el index b393760c7..31e16c889 100644 --- a/modules/email/wanderlust/config.el +++ b/modules/email/wanderlust/config.el @@ -78,9 +78,9 @@ wl-draft-folder "%[Gmail]/Drafts" wl-trash-folder "%[Gmail]/Trash" wl-fcc-force-as-read t - wl-default-spec "%")) + wl-default-spec "%") - (setq wl-message-id-domain wl-local-domain) + (setq wl-message-id-domain wl-local-domain)) ;; Use alert for alerting (when (fboundp 'alert) From a461a1f62c625dcbaaa6ccb141ac945063f32b23 Mon Sep 17 00:00:00 2001 From: "Kirill A. Korinsky" Date: Sun, 14 Jan 2024 14:31:31 +0100 Subject: [PATCH 07/49] tweak(wanderlust): add +xface flag --- modules/email/wanderlust/README.org | 6 ++++++ modules/email/wanderlust/config.el | 5 +++++ modules/email/wanderlust/packages.el | 6 ++++++ 3 files changed, 17 insertions(+) diff --git a/modules/email/wanderlust/README.org b/modules/email/wanderlust/README.org index 21f236458..3c9f17333 100644 --- a/modules/email/wanderlust/README.org +++ b/modules/email/wanderlust/README.org @@ -15,6 +15,9 @@ - +gmail :: Enable gmail-specific configuration for mail ~To~ or ~From~ a gmail address. +- +xface :: + Enable support of [X-Face] powered by [compface]. + ** Packages - [[doom-package:wanderlust]] @@ -52,3 +55,6 @@ #+begin_quote 󱌣 This module has no appendix yet. [[doom-contrib-module:][Write one?]] #+end_quote + +[X-Face]: https://en.wikipedia.org/wiki/X-Face +[compface]: http://freecode.com/projects/compface/ diff --git a/modules/email/wanderlust/config.el b/modules/email/wanderlust/config.el index 31e16c889..679c04f9d 100644 --- a/modules/email/wanderlust/config.el +++ b/modules/email/wanderlust/config.el @@ -82,6 +82,11 @@ (setq wl-message-id-domain wl-local-domain)) + ;; Use x-face only when compface installed + (when (modulep! +xface) + (autoload 'x-face-decode-message-header "x-face-e21") + (setq wl-highlight-x-face-function 'x-face-decode-message-header)) + ;; Use alert for alerting (when (fboundp 'alert) (setq wl-biff-notify-hook '((lambda () (alert "You have new mail!" :title "Wanderlust"))))) diff --git a/modules/email/wanderlust/packages.el b/modules/email/wanderlust/packages.el index 57afc4e87..48203a6bd 100644 --- a/modules/email/wanderlust/packages.el +++ b/modules/email/wanderlust/packages.el @@ -9,3 +9,9 @@ (package! semi :recipe (:branch "semi-1_14-wl") :pin "9063a4485b148a767ea924f0e7cc78d3524ba256") (package! wanderlust :pin "9fd2c65e8d690625f35035a71e73f51f740dbe04") + +(when (modulep! +xface) + (package! x-face-e21 + :recipe (:host nil :repo "https://salsa.debian.org/debian/x-face-el.git" + :files ("debian/x-face-e21.el")) + :pin "871156a776cc1bc9dd035205b6875c55db6ae215")) From 302b72d9ed0e90186d9c79730ee9b9927947495c Mon Sep 17 00:00:00 2001 From: "Kirill A. Korinsky" Date: Thu, 18 Jan 2024 00:40:46 +0100 Subject: [PATCH 08/49] tweak(wanderlust): sane forward tag --- modules/email/wanderlust/config.el | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/email/wanderlust/config.el b/modules/email/wanderlust/config.el index 679c04f9d..3175268c3 100644 --- a/modules/email/wanderlust/config.el +++ b/modules/email/wanderlust/config.el @@ -26,6 +26,7 @@ (setq wl-message-truncate-lines nil wl-summary-width nil + wl-forward-subject-prefix "Fwd: " wl-message-ignored-field-list '(".*Received:" ".*Path:" From 659f7bfc71d4d321728a5b8d68c5d2cd218d3dcb Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Tue, 5 Dec 2023 17:05:13 -0500 Subject: [PATCH 09/49] refactor!: deprecate IS-* OS constants BREAKING CHANGE: This deprecates the IS-(MAC|WINDOWS|LINUX|BSD) family of global constants in favor of a native `featurep` check: IS-MAC -> (featurep :system 'macos) IS-WINDOWS -> (featurep :system 'windows) IS-LINUX -> (featurep :system 'linux) IS-BSD -> (featurep :system 'bsd) The constants will stick around until the v3 release so folks can still use it -- and there are still some modules that use it, but I'll phase those uses out gradually. Fix: #7479 --- docs/examples.org | 6 +- lisp/cli/packages.el | 2 +- lisp/doom-keybinds.el | 4 +- lisp/doom-projects.el | 6 +- lisp/doom-start.el | 4 +- lisp/doom.el | 72 +++++++++++++++------- lisp/lib/system.el | 4 +- modules/app/everywhere/doctor.el | 4 +- modules/app/irc/config.el | 4 +- modules/checkers/grammar/config.el | 4 +- modules/completion/helm/config.el | 2 +- modules/completion/ivy/config.el | 6 +- modules/completion/vertico/config.el | 2 +- modules/config/default/+evil-bindings.el | 2 +- modules/config/default/autoload/default.el | 2 +- modules/config/default/config.el | 6 +- modules/editor/format/autoload/format.el | 2 +- modules/editor/multiple-cursors/config.el | 3 +- modules/editor/parinfer/config.el | 13 ++-- modules/emacs/dired/config.el | 8 +-- modules/emacs/dired/doctor.el | 2 +- modules/emacs/vc/config.el | 2 +- modules/email/mu4e/autoload/advice.el | 2 +- modules/email/mu4e/config.el | 4 +- modules/email/mu4e/doctor.el | 2 +- modules/lang/cc/config.el | 10 +-- modules/lang/latex/+viewers.el | 6 +- modules/lang/lua/autoload/lua.el | 2 +- modules/lang/lua/config.el | 6 +- modules/lang/markdown/config.el | 4 +- modules/lang/nim/config.el | 2 +- modules/lang/org/autoload/org-capture.el | 4 +- modules/lang/org/autoload/org-export.el | 9 +-- modules/lang/org/config.el | 6 +- modules/lang/org/contrib/dragndrop.el | 4 +- modules/lang/org/contrib/ipython.el | 2 +- modules/lang/org/doctor.el | 6 +- modules/lang/org/packages.el | 2 +- modules/lang/sh/config.el | 2 +- modules/os/macos/config.el | 2 +- modules/os/tty/config.el | 4 +- modules/term/eshell/config.el | 2 +- modules/term/eshell/packages.el | 2 +- modules/tools/debugger/config.el | 2 +- modules/tools/lookup/autoload/lookup.el | 2 +- modules/tools/lookup/config.el | 2 +- modules/tools/lookup/packages.el | 2 +- modules/ui/ligatures/config.el | 3 +- modules/ui/ligatures/doctor.el | 8 +-- modules/ui/modeline/+light.el | 2 +- modules/ui/modeline/config.el | 4 +- templates/init.example.el | 2 +- 52 files changed, 150 insertions(+), 120 deletions(-) diff --git a/docs/examples.org b/docs/examples.org index 9b1107f43..c88ba5fd5 100644 --- a/docs/examples.org +++ b/docs/examples.org @@ -379,7 +379,7 @@ Or to create aliases for functions that behave differently: "C-x C-r" 'a-global-keybind :g "C-x C-r" 'another-global-keybind ; same as above - (:when IS-MAC + (:when (featurep :system 'macos) :n "M-s" 'some-fn :i "M-o" (cmd! (message "Hi")))) @@ -604,7 +604,7 @@ These are side-by-side comparisons, showing how to bind keys with and without ;;helm :tools - (:if IS-MAC macos) + (:if (featurep :system 'macos) macos) docker lsp @@ -617,7 +617,7 @@ These are side-by-side comparisons, showing how to bind keys with and without ((string= system-name "writing-pc") (org +dragndrop) ruby)) - (:if IS-LINUX + (:if (featurep :system 'linux) (web +lsp) web) diff --git a/lisp/cli/packages.el b/lisp/cli/packages.el index 74daa9ea7..1cd6d4d45 100644 --- a/lisp/cli/packages.el +++ b/lisp/cli/packages.el @@ -297,7 +297,7 @@ declaration) or dependency thereof that hasn't already been." ;; variables entry is missing the suffix" errors when ;; installing them (see hlissner/doom-emacs#2637), so ;; have git handle conversion by force. - (when (and IS-WINDOWS (stringp local-repo)) + (when (and doom--system-windows-p (stringp local-repo)) (let ((default-directory (straight--repos-dir local-repo))) (when (file-in-directory-p default-directory straight-base-dir) (straight--process-run "git" "config" "core.autocrlf" "true"))))) diff --git a/lisp/doom-keybinds.el b/lisp/doom-keybinds.el index 0cc6e4841..f6ff2a99a 100644 --- a/lisp/doom-keybinds.el +++ b/lisp/doom-keybinds.el @@ -30,7 +30,7 @@ and Emacs states, and for non-evil users.") ;;; Global keybind settings (cond - (IS-MAC + (doom--system-macos-p ;; mac-* variables are used by the special emacs-mac build of Emacs by ;; Yamamoto Mitsuharu, while other builds use ns-*. (setq mac-command-modifier 'super @@ -40,7 +40,7 @@ and Emacs states, and for non-evil users.") ;; Free up the right option for character composition mac-right-option-modifier 'none ns-right-option-modifier 'none)) - (IS-WINDOWS + (doom--system-windows-p (setq w32-lwindow-modifier 'super w32-rwindow-modifier 'super))) diff --git a/lisp/doom-projects.el b/lisp/doom-projects.el index 98c4affb4..4d434e32d 100644 --- a/lisp/doom-projects.el +++ b/lisp/doom-projects.el @@ -147,7 +147,7 @@ c) are not valid projectile projects." (projectile-serialize-cache)))) ;; Some MSYS utilities auto expanded the `/' path separator, so we need to prevent it. - (when IS-WINDOWS + (when doom--system-windows-p (setenv "MSYS_NO_PATHCONV" "1") ; Fix path in Git Bash (setenv "MSYS2_ARG_CONV_EXCL" "--path-separator")) ; Fix path in MSYS2 @@ -192,11 +192,11 @@ And if it's a function, evaluate it." (concat (format "%s . -0 -H --color=never --type file --type symlink --follow --exclude .git %s" bin (if (version< version "8.3.0") "" "--strip-cwd-prefix")) - (if IS-WINDOWS " --path-separator=/")))) + (if doom--system-windows-p " --path-separator=/")))) ;; Otherwise, resort to ripgrep, which is also faster than find ((executable-find "rg" t) (concat "rg -0 --files --follow --color=never --hidden -g!.git" - (if IS-WINDOWS " --path-separator=/"))) + (if doom--system-windows-p " --path-separator=/"))) ("find . -type f -print0")))) (defadvice! doom--projectile-default-generic-command-a (fn &rest args) diff --git a/lisp/doom-start.el b/lisp/doom-start.el index a3777b47b..5a68dd036 100644 --- a/lisp/doom-start.el +++ b/lisp/doom-start.el @@ -120,7 +120,7 @@ ;; focus when it is started, among other things, so enable the menu-bar for ;; GUI frames, but keep it disabled in terminal frames because there it ;; activates an ugly, in-frame menu bar. -(eval-when! IS-MAC +(eval-when! doom--system-macos-p (add-hook! '(window-setup-hook after-make-frame-functions) (defun doom-restore-menu-bar-in-gui-frames-h (&optional frame) (when-let (frame (or frame (selected-frame))) @@ -137,7 +137,7 @@ (setq default-input-method nil) ;; ...And the clipboard on Windows could be in a wider encoding (UTF-16), so ;; leave Emacs to its own devices. -(eval-when! IS-WINDOWS +(eval-when! (not doom--system-windows-p) (setq selection-coding-system 'utf-8)) diff --git a/lisp/doom.el b/lisp/doom.el index 17fc2e32f..d6812e6f2 100644 --- a/lisp/doom.el +++ b/lisp/doom.el @@ -107,7 +107,30 @@ "recompile it.") emacs-version old-version))) -;;; Custom features +;;; Custom features & global constants +;; Doom has its own features that its modules, CLI, and user extensions can +;; announce, and don't belong in `features', so they are stored here, which can +;; include information about the external system environment. +(defconst doom-features + (pcase system-type + ('darwin '(macos bsd)) + ((or 'cygwin 'windows-nt 'ms-dos) '(windows)) + ((or 'gnu 'gnu/linux) '(linux)) + ((or 'gnu/kfreebsd 'berkeley-unix) '(linux bsd))) + "A list of symbols denoting available features in the active Doom profile.") + +;; Convenience aliases for internal use only (may be removed later). +(defconst doom-system (car doom-features)) +(defconst doom--system-windows-p (eq 'windows doom-system)) +(defconst doom--system-macos-p (eq 'macos doom-system)) +(defconst doom--system-linux-p (eq 'linux doom-system)) + +;; `system-type' is esoteric, so I create a pseudo feature as a stable and +;; consistent alternative, and all while using the same `featurep' interface +;; we're already familiar with. +(push :system features) +(put :system 'subfeatures doom-features) + ;; Emacs needs a more consistent way to detect build features, and the docs ;; claim `system-configuration-features' is not da way. Some features (that ;; don't represent packages) can be found in `features' (which `featurep' @@ -126,25 +149,30 @@ (if (not (native-comp-available-p)) (delq 'native-compile features))) -;;; Global constants ;; DEPRECATED remove in v3 -(defconst IS-MAC (eq system-type 'darwin)) -(defconst IS-LINUX (memq system-type '(gnu gnu/linux gnu/kfreebsd berkeley-unix))) -(defconst IS-WINDOWS (memq system-type '(cygwin windows-nt ms-dos))) -(defconst IS-BSD (memq system-type '(darwin berkeley-unix gnu/kfreebsd))) -(defconst EMACS28+ (> emacs-major-version 27)) -(defconst EMACS29+ (> emacs-major-version 28)) -(defconst MODULES (featurep 'dynamic-modules)) -(defconst NATIVECOMP (featurep 'native-compile)) +(with-no-warnings + (defconst IS-MAC doom--system-macos-p) + (defconst IS-LINUX doom--system-linux-p) + (defconst IS-WINDOWS doom--system-windows-p) + (defconst IS-BSD (memq 'bsd doom-features)) + (defconst EMACS28+ (> emacs-major-version 27)) + (defconst EMACS29+ (> emacs-major-version 28)) + (defconst MODULES (featurep 'dynamic-modules)) + (defconst NATIVECOMP (featurep 'native-compile)) + + (make-obsolete-variable 'IS-MAC "Use (featurep :system 'macos) instead" "3.0.0") + (make-obsolete-variable 'IS-LINUX "Use (featurep :system 'linux) instead" "3.0.0") + (make-obsolete-variable 'IS-WINDOWS "Use (featurep :system 'windows) instead" "3.0.0") + (make-obsolete-variable 'IS-BSD "Use (featurep :system 'bsd) instead" "3.0.0") + (make-obsolete-variable 'EMACS28+ "Use (>= emacs-major-version 28) instead" "3.0.0") + (make-obsolete-variable 'EMACS29+ "Use (>= emacs-major-version 29) instead" "3.0.0") + (make-obsolete-variable 'MODULES "Use (featurep 'dynamic-modules) instead" "3.0.0") + (make-obsolete-variable 'NATIVECOMP "Use (featurep 'native-compile) instead" "3.0.0")) -(make-obsolete-variable 'EMACS28+ "Use (>= emacs-major-version 28) instead" "3.0.0") -(make-obsolete-variable 'EMACS29+ "Use (>= emacs-major-version 29) instead" "3.0.0") -(make-obsolete-variable 'MODULES "Use (featurep 'dynamic-modules) instead" "3.0.0") -(make-obsolete-variable 'NATIVECOMP "Use (featurep 'native-compile) instead" "3.0.0") ;;; Fix $HOME on Windows ;; $HOME isn't normally defined on Windows, but many unix tools expect it. -(when IS-WINDOWS +(when doom--system-windows-p (when-let (realhome (and (null (getenv-internal "HOME")) (getenv "USERPROFILE"))) @@ -228,7 +256,7 @@ These files should not be shared across systems. By default, it is used by (define-obsolete-variable-alias 'doom-etc-dir 'doom-data-dir "3.0.0") (defvar doom-data-dir (if doom-profile - (if IS-WINDOWS + (if doom--system-windows-p (expand-file-name "doomemacs/data/" (getenv-internal "APPDATA")) (expand-file-name "doom/" (or (getenv-internal "XDG_DATA_HOME") "~/.local/share"))) ;; DEPRECATED: .local will be removed entirely in 3.0 @@ -247,7 +275,7 @@ For profile-local data files, use `doom-profile-data-dir' instead.") (defvar doom-cache-dir (if doom-profile - (if IS-WINDOWS + (if doom--system-windows-p (expand-file-name "doomemacs/cache/" (getenv-internal "APPDATA")) (expand-file-name "doom/" (or (getenv-internal "XDG_CACHE_HOME") "~/.cache"))) ;; DEPRECATED: .local will be removed entirely in 3.0 @@ -266,7 +294,7 @@ For profile-local cache files, use `doom-profile-cache-dir' instead.") (defvar doom-state-dir (if doom-profile - (if IS-WINDOWS + (if doom--system-windows-p (expand-file-name "doomemacs/state/" (getenv-internal "APPDATA")) (expand-file-name "doom/" (or (getenv-internal "XDG_STATE_HOME") "~/.local/state"))) ;; DEPRECATED: .local will be removed entirely in 3.0 @@ -470,8 +498,8 @@ users).") (add-transient-hook! 'tool-bar-mode (tool-bar-setup))) ;; PERF: Unset a non-trivial list of command line options that aren't - ;; relevant to our current OS, but `command-line-1' still processes. - (unless IS-MAC + ;; relevant to this session, but `command-line-1' still processes. + (unless doom--system-macos-p (setq command-line-ns-option-alist nil)) (unless (memq initial-window-system '(x pgtk)) (setq command-line-x-option-alist nil))))) @@ -649,7 +677,7 @@ of 'doom sync' or 'doom gc'." gnutls-algorithm-priority (when (boundp 'libgnutls-version) (concat "SECURE128:+SECURE192:-VERS-ALL" - (if (and (not IS-WINDOWS) + (if (and (not doom--system-windows-p) (>= libgnutls-version 30605)) ":+VERS-TLS1.3") ":+VERS-TLS1.2")) @@ -713,6 +741,8 @@ appropriately against `noninteractive' or the `cli' context." (defun doom--begin-init-h () "Begin the startup process." (when (doom-context-push 'init) + ;; HACK: Ensure OS checks are as fast as possible (given their ubiquity). + (setq features (cons :system (delq :system features))) ;; Remember these variables' initial values, so we can safely reset them at ;; a later time, or consult them without fear of contamination. (dolist (var '(exec-path load-path process-environment)) diff --git a/lisp/lib/system.el b/lisp/lib/system.el index 7a07d1975..0c8d7ea61 100644 --- a/lisp/lib/system.el +++ b/lisp/lib/system.el @@ -4,8 +4,8 @@ (defun doom-system-distro () "Return a symbol representing the installed distro." (with-memoization (get 'doom-system-distro 'cached-value) - (cond (IS-WINDOWS 'windows) - (IS-MAC 'macos) + (cond (doom--system-windows-p 'windows) + (doom--system-macos-p 'macos) ((ignore-errors (with-file-contents! "/etc/os-release" (when (re-search-forward "^ID=\"?\\([^\"\n]+\\)\"?" nil t) diff --git a/modules/app/everywhere/doctor.el b/modules/app/everywhere/doctor.el index 8e7223710..db697d65e 100644 --- a/modules/app/everywhere/doctor.el +++ b/modules/app/everywhere/doctor.el @@ -1,9 +1,9 @@ ;;; app/everywhere/doctor.el -*- lexical-binding: t; -*- -(when IS-WINDOWS +(when (featurep :system 'windows) (error! "emacs-everywhere package does not support windows.")) -(when IS-LINUX +(when (featurep :system 'linux) (let (unmet-deps) (dolist (dep '("xclip" "xdotool" "xprop" "xwininfo")) (unless (executable-find dep) diff --git a/modules/app/irc/config.el b/modules/app/irc/config.el index bf1d73cf1..35133b887 100644 --- a/modules/app/irc/config.el +++ b/modules/app/irc/config.el @@ -187,8 +187,8 @@ playback.") (setq circe-notifications-watch-strings +irc-notifications-watch-strings circe-notifications-emacs-focused nil circe-notifications-alert-style - (cond (IS-MAC 'osx-notifier) - (IS-LINUX 'libnotify) + (cond ((featurep :system 'macos) 'osx-notifier) + ((featurep :system 'linux) 'libnotify) (circe-notifications-alert-style)))) diff --git a/modules/checkers/grammar/config.el b/modules/checkers/grammar/config.el index 174298f5e..64f7ec911 100644 --- a/modules/checkers/grammar/config.el +++ b/modules/checkers/grammar/config.el @@ -13,7 +13,7 @@ (cond ((setq langtool-bin (or (executable-find "languagetool-commandline") (executable-find "languagetool")))) ; for nixpkgs.languagetool - (IS-MAC + ((featurep :system 'macos) (cond ;; is user using home brew? ((file-directory-p "/usr/local/Cellar/languagetool") @@ -25,7 +25,7 @@ ;; macports compatibility ((file-directory-p "/opt/local/share/java/LanguageTool") (setq langtool-java-classpath "/opt/local/share/java/LanguageTool/*")))) - (IS-LINUX + ((featurep :system 'linux) (setq langtool-java-classpath "/usr/share/languagetool:/usr/share/java/languagetool/*"))))) diff --git a/modules/completion/helm/config.el b/modules/completion/helm/config.el index 39dd73c91..7f983f872 100644 --- a/modules/completion/helm/config.el +++ b/modules/completion/helm/config.el @@ -148,7 +148,7 @@ Can be negative.") (defvar helm-generic-files-map (make-sparse-keymap)) (after! helm-locate - (when (and IS-MAC + (when (and (featurep :system 'macos) (null helm-locate-command) (executable-find "mdfind")) (setq helm-locate-command "mdfind -name %s")) diff --git a/modules/completion/ivy/config.el b/modules/completion/ivy/config.el index e1a758dc8..e537abf81 100644 --- a/modules/completion/ivy/config.el +++ b/modules/completion/ivy/config.el @@ -237,7 +237,7 @@ results buffer.") (add-to-list 'ivy-sort-functions-alist '(counsel-imenu)) ;; `counsel-locate' - (when IS-MAC + (when (featurep :system 'macos) ;; Use spotlight on mac by default since it doesn't need any additional setup (setq counsel-locate-cmd #'counsel-locate-cmd-mdfind)) @@ -276,13 +276,13 @@ results buffer.") (cl-loop for dir in projectile-globally-ignored-directories collect "--exclude" collect dir) - (if IS-WINDOWS '("--path-separator=/"))))) + (if (featurep :system 'windows) '("--path-separator=/"))))) ((executable-find "rg" t) (append (list "rg" "--hidden" "--files" "--follow" "--color=never" "--no-messages") (cl-loop for dir in projectile-globally-ignored-directories collect "--glob" collect (concat "!" dir)) - (if IS-WINDOWS '("--path-separator=/")))) + (if (featurep :system 'windows) '("--path-separator=/")))) ((cons find-program args))) (unless (listp args) (user-error "`counsel-file-jump-args' is a list now, please customize accordingly.")) diff --git a/modules/completion/vertico/config.el b/modules/completion/vertico/config.el index e92b9ec47..f92bd85a2 100644 --- a/modules/completion/vertico/config.el +++ b/modules/completion/vertico/config.el @@ -153,7 +153,7 @@ orderless." ;; https://github.com/sharkdp/fd/issues/839 "--full-path --absolute-path" "--hidden --exclude .git" - (when IS-WINDOWS "--path-separator=/")))) + (if (featurep :system 'windows) "--path-separator=/")))) (consult-customize consult-ripgrep consult-git-grep consult-grep diff --git a/modules/config/default/+evil-bindings.el b/modules/config/default/+evil-bindings.el index a62541d4c..c79c078f6 100644 --- a/modules/config/default/+evil-bindings.el +++ b/modules/config/default/+evil-bindings.el @@ -228,7 +228,7 @@ :g "M-8" #'+workspace/switch-to-7 :g "M-9" #'+workspace/switch-to-8 :g "M-0" #'+workspace/switch-to-final - (:when IS-MAC + (:when (featurep :system 'macos) :g "s-t" #'+workspace/new :g "s-T" #'+workspace/display :n "s-1" #'+workspace/switch-to-0 diff --git a/modules/config/default/autoload/default.el b/modules/config/default/autoload/default.el index d49ea8643..a1f645b81 100644 --- a/modules/config/default/autoload/default.el +++ b/modules/config/default/autoload/default.el @@ -24,7 +24,7 @@ If ARG (universal argument), runs `compile' from the current directory." generate `completing-read' candidates." (interactive) (call-interactively - (if (and (not IS-MAC) (executable-find "man")) + (if (and (not (featurep :system 'macos)) (executable-find "man")) (or (command-remapping #'man) #'man) #'woman))) diff --git a/modules/config/default/config.el b/modules/config/default/config.el index 14bed119c..e67adf1e3 100644 --- a/modules/config/default/config.el +++ b/modules/config/default/config.el @@ -81,7 +81,7 @@ ;;;###package tramp -(unless IS-WINDOWS +(unless (featurep :system 'windows) (setq tramp-default-method "ssh")) ; faster than the default scp @@ -300,7 +300,7 @@ Continues comments if executed from a commented line. Consults (define-key tabulated-list-mode-map "q" #'quit-window)) ;; OS specific fixes -(when IS-MAC +(when (featurep :system 'macos) ;; Fix MacOS shift+tab (define-key key-translation-map [S-iso-lefttab] [backtab]) ;; Fix conventional OS keys in Emacs @@ -487,7 +487,7 @@ Continues comments if executed from a commented line. Consults :gi "C-S-RET" #'+default/newline-above :gn [C-S-return] #'+default/newline-above - (:when IS-MAC + (:when (featurep :system 'macos) :gn "s-RET" #'+default/newline-below :gn [s-return] #'+default/newline-below :gn "S-s-RET" #'+default/newline-above diff --git a/modules/editor/format/autoload/format.el b/modules/editor/format/autoload/format.el index 90929cb22..63b932f4e 100644 --- a/modules/editor/format/autoload/format.el +++ b/modules/editor/format/autoload/format.el @@ -17,7 +17,7 @@ (indent 0)) (with-current-buffer formatted-buffer (erase-buffer) - (unless IS-WINDOWS + (unless (featurep :system 'windows) (setq-local coding-system-for-read 'utf-8) (setq-local coding-system-for-write 'utf-8)) ;; Ensure this temp buffer seems as much like the origin buffer as diff --git a/modules/editor/multiple-cursors/config.el b/modules/editor/multiple-cursors/config.el index 107844ed4..cbc4e0d0f 100644 --- a/modules/editor/multiple-cursors/config.el +++ b/modules/editor/multiple-cursors/config.el @@ -74,8 +74,7 @@ (apply fn args))) ;; REVIEW This is tremendously slow on macos and windows for some reason. - (setq evil-mc-enable-bar-cursor (not (or IS-MAC - IS-WINDOWS))) + (setq evil-mc-enable-bar-cursor (featurep :system 'linux)) (after! smartparens ;; Make evil-mc cooperate with smartparens better diff --git a/modules/editor/parinfer/config.el b/modules/editor/parinfer/config.el index a11155393..f76c71a28 100644 --- a/modules/editor/parinfer/config.el +++ b/modules/editor/parinfer/config.el @@ -11,12 +11,13 @@ hy-mode) . parinfer-rust-mode) :init (setq parinfer-rust-library - (concat doom-data-dir "parinfer-rust/" - (cond (IS-MAC "parinfer-rust-darwin.so") - (IS-LINUX "parinfer-rust-linux.so") - (IS-WINDOWS "parinfer-rust-windows.dll") - (IS-BSD "libparinfer_rust.so"))) - parinfer-rust-auto-download (not IS-BSD)) + (file-name-concat + doom-data-dir "parinfer-rust/" + (cond ((featurep :system 'macos) "parinfer-rust-darwin.so") + ((featurep :system 'linux) "parinfer-rust-linux.so") + ((featurep :system 'windows) "parinfer-rust-windows.dll") + ((featurep :system 'bsd) "libparinfer_rust.so"))) + parinfer-rust-auto-download (not (featurep :system 'bsd))) :config (map! :map parinfer-rust-mode-map :localleader diff --git a/modules/emacs/dired/config.el b/modules/emacs/dired/config.el index fe1404ee5..11eab8a36 100644 --- a/modules/emacs/dired/config.el +++ b/modules/emacs/dired/config.el @@ -29,7 +29,7 @@ (set-evil-initial-state! 'image-dired-display-image-mode 'emacs) (let ((args (list "-ahl" "-v" "--group-directories-first"))) - (when IS-BSD + (when (featurep :system 'bsd) ;; Use GNU ls as `gls' from `coreutils' if available. Add `(setq ;; dired-use-ls-dired nil)' to your config to suppress the Dired warning ;; when not using GNU ls. @@ -188,9 +188,9 @@ we have to clean it up ourselves." ;; deleted directory. Of course I do! (setq dired-clean-confirm-killing-deleted-buffers nil) ;; Let OS decide how to open certain files - (when-let (cmd (cond (IS-MAC "open") - (IS-LINUX "xdg-open") - (IS-WINDOWS "start"))) + (when-let (cmd (cond ((featurep :system 'macos) "open") + ((featurep :system 'linux) "xdg-open") + ((featurep :system 'windows) "start"))) (setq dired-guess-shell-alist-user `(("\\.\\(?:docx\\|pdf\\|djvu\\|eps\\)\\'" ,cmd) ("\\.\\(?:jpe?g\\|png\\|gif\\|xpm\\)\\'" ,cmd) diff --git a/modules/emacs/dired/doctor.el b/modules/emacs/dired/doctor.el index 2c2e77b29..bb157a484 100644 --- a/modules/emacs/dired/doctor.el +++ b/modules/emacs/dired/doctor.el @@ -1,4 +1,4 @@ ;;; emacs/dired/doctor.el -*- lexical-binding: t; -*- -(when (and IS-BSD (not (executable-find "gls"))) +(when (and (featurep :system 'bsd) (not (executable-find "gls"))) (warn! "Cannot find gls (GNU ls). This may cause issues with dired")) diff --git a/modules/emacs/vc/config.el b/modules/emacs/vc/config.el index 0fef2c56f..3ea79365c 100644 --- a/modules/emacs/vc/config.el +++ b/modules/emacs/vc/config.el @@ -5,7 +5,7 @@ ;; 2021, amirite? (setq-default vc-handled-backends '(SVN Git Hg)) -(when IS-WINDOWS +(when (featurep :system 'windows) (setenv "GIT_ASKPASS" "git-gui--askpass")) ;; In case the user is using `bug-reference-mode' diff --git a/modules/email/mu4e/autoload/advice.el b/modules/email/mu4e/autoload/advice.el index 29b24d502..d39eaa424 100644 --- a/modules/email/mu4e/autoload/advice.el +++ b/modules/email/mu4e/autoload/advice.el @@ -6,7 +6,7 @@ (defun +org-msg-img-scale-css (img-uri) "For a given IMG-URI, use imagemagick to find its width." (if +org-msg-currently-exporting - (when (and (not IS-WINDOWS)) ; relies on posix path + (when (and (not (featurep :system 'windows))) ; relies on posix path (let ((width-call (and (executable-find "identify") (doom-call-process "identify" "-format" "%w" (substring img-uri 7))))) ; 7=(length "file://") diff --git a/modules/email/mu4e/config.el b/modules/email/mu4e/config.el index 9f2791271..f4f6d9c5b 100644 --- a/modules/email/mu4e/config.el +++ b/modules/email/mu4e/config.el @@ -365,7 +365,7 @@ This should already be the case yet it does not always seem to be." (read-only-mode -1)) ;; process lock control - (when IS-WINDOWS + (when (featurep :system 'windows) (setq +mu4e-lock-file (expand-file-name "~/AppData/Local/Temp/mu4e_lock") +mu4e-lock-request-file (expand-file-name "~/AppData/Local/Temp/mu4e_lock_request"))) @@ -696,7 +696,7 @@ See `+mu4e-msg-gmail-p' and `mu4e-sent-messages-behavior'.") t))) mails))) - (when IS-LINUX + (when (featurep :system 'linux) (mu4e-alert-set-default-style 'libnotify) (defvar +mu4e-alert-bell-cmd '("paplay" . "/usr/share/sounds/freedesktop/stereo/message.oga") diff --git a/modules/email/mu4e/doctor.el b/modules/email/mu4e/doctor.el index bfe18dc4c..24f7c5381 100644 --- a/modules/email/mu4e/doctor.el +++ b/modules/email/mu4e/doctor.el @@ -9,7 +9,7 @@ You may not have a way of fetching mail.")) (when (and (modulep! +org) - (not IS-WINDOWS)) + (not (featurep :system 'windows))) (unless (executable-find "identify") (warn! "Couldn't find the identify command from imagemagick. \ LaTeX fragment re-scaling with org-msg will not work."))) diff --git a/modules/lang/cc/config.el b/modules/lang/cc/config.el index 75f74a55b..81514b2a9 100644 --- a/modules/lang/cc/config.el +++ b/modules/lang/cc/config.el @@ -17,7 +17,7 @@ This is ignored by ccls.") `((c-mode . nil) (c++-mode . ,(list "-std=c++1z" ; use C++17 draft by default - (when IS-MAC + (when (featurep :system 'macos) ;; NOTE beware: you'll get abi-inconsistencies when passing ;; std-objects to libraries linked with libstdc++ (e.g. if you ;; use boost which wasn't compiled with libc++) @@ -286,7 +286,7 @@ If rtags or rdm aren't available, fail silently instead of throwing a breaking e ;; NOTE : This setting is untested yet (after! eglot - (when IS-MAC + (when (featurep :system 'macos) (add-to-list 'eglot-workspace-configuration `((:ccls . ((:clang . ,(list :extraArgs ["-isystem/Library/Developer/CommandLineTools/usr/include/c++/v1" "-isystem/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include" @@ -313,12 +313,12 @@ If rtags or rdm aren't available, fail silently instead of throwing a breaking e (setq-hook! 'lsp-configure-hook ccls-sem-highlight-method (if lsp-enable-semantic-highlighting ccls-sem-highlight-method)) - (when (or IS-MAC - IS-LINUX) + (when (or (featurep :system 'macos) + (featurep :system 'linux)) (setq ccls-initialization-options `(:index (:trackDependency 1 :threads ,(max 1 (/ (doom-system-cpus) 2)))))) - (when IS-MAC + (when (featurep :system 'macos) (setq ccls-initialization-options (append ccls-initialization-options `(:clang ,(list :extraArgs ["-isystem/Library/Developer/CommandLineTools/usr/include/c++/v1" diff --git a/modules/lang/latex/+viewers.el b/modules/lang/latex/+viewers.el index e4c0787a3..f1d439c4b 100644 --- a/modules/lang/latex/+viewers.el +++ b/modules/lang/latex/+viewers.el @@ -9,7 +9,7 @@ (`skim (when-let (app-path - (and IS-MAC + (and (featurep :system 'macos) (file-exists-p! (or "/Applications/Skim.app" "~/Applications/Skim.app")))) (add-to-list 'TeX-view-program-selection '(output-pdf "Skim")) @@ -18,7 +18,7 @@ app-path))))) (`sumatrapdf - (when (and IS-WINDOWS + (when (and (featurep :system 'windows) (executable-find "SumatraPDF")) (add-to-list 'TeX-view-program-selection '(output-pdf "SumatraPDF")))) @@ -40,7 +40,7 @@ (`pdf-tools (when (modulep! :tools pdf) (add-to-list 'TeX-view-program-selection '(output-pdf "PDF Tools")) - (when IS-MAC + (when (featurep :system 'macos) ;; PDF Tools isn't in `TeX-view-program-list-builtin' on macs. (add-to-list 'TeX-view-program-list '("PDF Tools" TeX-pdf-tools-sync-view))) ;; Update PDF buffers after successful LaTeX runs. diff --git a/modules/lang/lua/autoload/lua.el b/modules/lang/lua/autoload/lua.el index 0e359d0d7..c519cbab5 100644 --- a/modules/lang/lua/autoload/lua.el +++ b/modules/lang/lua/autoload/lua.el @@ -5,7 +5,7 @@ (format "%s %s" (if (executable-find "love") "love" - (if IS-MAC "open -a love.app")) + (if (featurep :system 'macos) "open -a love.app")) (shell-quote-argument root)))) ;;;###autoload diff --git a/modules/lang/lua/config.el b/modules/lang/lua/config.el index f93a10611..7d04fd665 100644 --- a/modules/lang/lua/config.el +++ b/modules/lang/lua/config.el @@ -34,9 +34,9 @@ lua-language-server.") ;; is a function is to dynamically change when/if `+lua-lsp-dir' does (list (or (executable-find "lua-language-server") (doom-path +lua-lsp-dir - (cond (IS-MAC "bin/macOS") - (IS-LINUX "bin/Linux") - (IS-WINDOWS "bin/Windows")) + (cond ((featurep :system 'macos) "bin/macOS") + ((featurep :system 'linux) "bin/Linux") + ((featurep :system 'windows) "bin/Windows")) "lua-language-server")) "-E" "-e" "LANG=en" (doom-path +lua-lsp-dir "main.lua"))) diff --git a/modules/lang/markdown/config.el b/modules/lang/markdown/config.el index 6182d8eb1..9461635c9 100644 --- a/modules/lang/markdown/config.el +++ b/modules/lang/markdown/config.el @@ -32,8 +32,8 @@ capture, the end position, and the output buffer.") ;; This is set to `nil' by default, which causes a wrong-type-arg error ;; when you use `markdown-open'. These are more sensible defaults. markdown-open-command - (cond (IS-MAC "open") - (IS-LINUX "xdg-open")) + (cond ((featurep :system 'macos) "open") + ((featurep :system 'linux) "xdg-open")) ;; A sensible and simple default preamble for markdown exports that ;; takes after the github asthetic (plus highlightjs syntax coloring). diff --git a/modules/lang/nim/config.el b/modules/lang/nim/config.el index d15c271c5..ddaf986f3 100644 --- a/modules/lang/nim/config.el +++ b/modules/lang/nim/config.el @@ -14,7 +14,7 @@ nimsuggest isn't installed." (set-formatter! 'nmfmt '("nimfmt" filepath) :modes '(nim-mode)) - (when IS-WINDOWS + (when (featurep :system 'windows) ;; TODO File PR/report upstream (https://github.com/nim-lang/nim-mode) (defadvice! +nim--suggest-get-temp-file-name-a (path) "Removes invalid characters from the temp file path, including the unicode diff --git a/modules/lang/org/autoload/org-capture.el b/modules/lang/org/autoload/org-capture.el index 1430d2336..c00bf2755 100644 --- a/modules/lang/org/autoload/org-capture.el +++ b/modules/lang/org/autoload/org-capture.el @@ -15,12 +15,12 @@ (width . 70) (height . 25) (transient . t) - ,@(when IS-LINUX + ,@(when (featurep :system 'linux) `((window-system . ,(if (boundp 'pgtk-initialized) 'pgtk 'x)) (display . ,(or (getenv "WAYLAND_DISPLAY") (getenv "DISPLAY") ":0")))) - ,(if IS-MAC '(menu-bar-lines . 1))) + ,(if (featurep :system 'macos) '(menu-bar-lines . 1))) "TODO") ;;;###autoload diff --git a/modules/lang/org/autoload/org-export.el b/modules/lang/org/autoload/org-export.el index 5641d8a80..471b59eb0 100644 --- a/modules/lang/org/autoload/org-export.el +++ b/modules/lang/org/autoload/org-export.el @@ -3,13 +3,14 @@ (defun +org--yank-html-buffer (buffer) (with-current-buffer buffer (require 'ox-clip) - (cond ((or IS-WINDOWS IS-MAC) + (cond ((or (featurep :system 'windows) + (featurep :system 'macos)) (shell-command-on-region (point-min) (point-max) - (cond (IS-WINDOWS ox-clip-w32-cmd) - (IS-MAC ox-clip-osx-cmd)))) - (IS-LINUX + (cond ((featurep :system 'windows) ox-clip-w32-cmd) + ((featurep :system 'macos) ox-clip-osx-cmd)))) + ((featurep :system 'linux) (let ((html (buffer-string))) (with-temp-file (make-temp-file "ox-clip-md" nil ".html") (insert html)) diff --git a/modules/lang/org/config.el b/modules/lang/org/config.el index 6d162f428..aae33583c 100644 --- a/modules/lang/org/config.el +++ b/modules/lang/org/config.el @@ -507,7 +507,7 @@ relative to `org-directory', unless it is an absolute path." "file" :face (lambda (path) (if (or (file-remote-p path) ;; filter out network shares on windows (slow) - (if IS-WINDOWS (string-prefix-p "\\\\" path)) + (if (featurep :system 'windows) (string-prefix-p "\\\\" path)) (file-exists-p path)) 'org-link '(warning org-link)))) @@ -931,7 +931,7 @@ between the two." [C-return] #'+org/insert-item-below [C-S-return] #'+org/insert-item-above [C-M-return] #'org-insert-subheading - (:when IS-MAC + (:when (featurep :system 'macos) [s-return] #'+org/insert-item-below [s-S-return] #'+org/insert-item-above [s-M-return] #'org-insert-subheading) @@ -1391,7 +1391,7 @@ between the two." "Advise `server-visit-files' to load `org-protocol' lazily." :around #'server-visit-files (if (not (cl-loop with protocol = - (if IS-WINDOWS + (if (featurep :system 'windows) ;; On Windows, the file arguments for `emacsclient' ;; get funnelled through `expand-file-path' by ;; `server-process-filter'. This substitutes diff --git a/modules/lang/org/contrib/dragndrop.el b/modules/lang/org/contrib/dragndrop.el index e233619b3..fb3dcae11 100644 --- a/modules/lang/org/contrib/dragndrop.el +++ b/modules/lang/org/contrib/dragndrop.el @@ -26,8 +26,8 @@ (setq org-download-method 'attach org-download-timestamp "_%Y%m%d_%H%M%S" org-download-screenshot-method - (cond (IS-MAC "screencapture -i %s") - (IS-LINUX + (cond ((featurep :system 'macos) "screencapture -i %s") + ((featurep :system 'linux) (cond ((executable-find "maim") "maim -s %s") ((executable-find "scrot") "scrot -s %s") ((executable-find "gnome-screenshot") "gnome-screenshot -a -f %s")))) diff --git a/modules/lang/org/contrib/ipython.el b/modules/lang/org/contrib/ipython.el index c8047cf37..9b2016bc0 100644 --- a/modules/lang/org/contrib/ipython.el +++ b/modules/lang/org/contrib/ipython.el @@ -33,7 +33,7 @@ (advice-add #'org-babel-ipython-initiate-session :override #'+org-ob-ipython-initiate-session-a) ;; retina resolution image hack - (when IS-MAC + (when (featurep :system 'macos) (advice-add #'ob-ipython--write-base64-string :around #'+org-ob-ipython-write-base64-string-a)) ;; ipython has its own async keyword, disable ipython in ob-async. diff --git a/modules/lang/org/doctor.el b/modules/lang/org/doctor.el index 38e659fe3..b32bfd294 100644 --- a/modules/lang/org/doctor.el +++ b/modules/lang/org/doctor.el @@ -16,10 +16,10 @@ Migrate your notes to org-roam-v2 and switch to the +roam2 flag (see the module (warn! "Couldn't find the dot executable (from graphviz). org-roam will not be able to generate graph visualizations."))) (when (modulep! +dragndrop) - (when IS-MAC + (when (featurep :system 'macos) (unless (executable-find "pngpaste") (warn! "Couldn't find the pngpaste executable. org-download-clipboard will not work."))) - (when IS-LINUX + (when (featurep :system 'linux) (unless (or (executable-find "maim") (executable-find "scrot") (executable-find "gnome-screenshot")) (warn! "Couldn't find the maim, scrot or gnome-screenshot executable. org-download-clipboard will not work.")) (if (string= "wayland" (getenv "XDG_SESSION_TYPE")) @@ -27,6 +27,6 @@ Migrate your notes to org-roam-v2 and switch to the +roam2 flag (see the module (warn! "Couldn't find the wl-paste executable (from wl-clipboard). org-download-clipboard will not work.")) (unless (executable-find "xclip") (warn! "Couldn't find the xclip executable. org-download-clipboard will not work.")))) - (when IS-WINDOWS + (when (featurep :system 'windows) (unless (executable-find "convert") (warn! "Couldn't find the convert program (from ImageMagick). org-download-clipboard will not work.")))) diff --git a/modules/lang/org/packages.el b/modules/lang/org/packages.el index ac75cc70d..e91a6defd 100644 --- a/modules/lang/org/packages.el +++ b/modules/lang/org/packages.el @@ -54,7 +54,7 @@ :type git :repo "https://repo.or.cz/org-contacts.git"))) -(when (and IS-MAC +(when (and (featurep :system 'macos) (modulep! :os macos)) (package! org-mac-link :pin "e30171a6e98db90787ab8a23b3a7dc4fd13b10f9")) diff --git a/modules/lang/sh/config.el b/modules/lang/sh/config.el index 5a5cd7ed5..8967e60e6 100755 --- a/modules/lang/sh/config.el +++ b/modules/lang/sh/config.el @@ -83,7 +83,7 @@ (set-company-backend! 'sh-mode '(company-shell company-files)) (setq company-shell-delete-duplicates t ;; whatis lookups are exceptionally slow on macOS (#5860) - company-shell-dont-fetch-meta IS-MAC)) + company-shell-dont-fetch-meta (featurep :system 'macos))) (use-package! powershell diff --git a/modules/os/macos/config.el b/modules/os/macos/config.el index 0644a1e0b..848aaf06c 100644 --- a/modules/os/macos/config.el +++ b/modules/os/macos/config.el @@ -48,6 +48,6 @@ (when (not (fboundp 'system-move-file-to-trash)) (defun system-move-file-to-trash (file) "Move FILE to trash." - (when (and (not IS-LINUX) + (when (and (not (featurep :system 'linux)) (not (file-remote-p default-directory))) (osx-trash-move-file-to-trash file))))) diff --git a/modules/os/tty/config.el b/modules/os/tty/config.el index 674c00fea..444b4ba0d 100644 --- a/modules/os/tty/config.el +++ b/modules/os/tty/config.el @@ -19,8 +19,8 @@ (add-hook 'tty-setup-hook #'xterm-mouse-mode) ;; Windows terminals don't support what I'm about to do, but best not to wrap -;; this in a IS-WINDOWS check, in case you're using WSL or Cygwin, which do and -;; *might* support it. +;; this in an OS check, in case you're using WSL or Cygwin, which *might* +;; support it. (add-hook! 'tty-setup-hook (defun doom-init-clipboard-in-tty-emacs-h () ;; Fix the clipboard in tty Emacs by... diff --git a/modules/term/eshell/config.el b/modules/term/eshell/config.el index af7633082..f8e69ed2b 100644 --- a/modules/term/eshell/config.el +++ b/modules/term/eshell/config.el @@ -242,7 +242,7 @@ Emacs versions < 29." (use-package! fish-completion - :unless IS-WINDOWS + :unless (featurep :system 'windows) :hook (eshell-mode . fish-completion-mode) :init (setq fish-completion-fallback-on-bash-p t fish-completion-inhibit-missing-fish-command-warning t)) diff --git a/modules/term/eshell/packages.el b/modules/term/eshell/packages.el index fc1385f0b..21cf6e767 100644 --- a/modules/term/eshell/packages.el +++ b/modules/term/eshell/packages.el @@ -8,6 +8,6 @@ (package! eshell-did-you-mean :pin "80cd8c4b186a2fb29621cf634bcf2bcd914f1e3d") (package! eshell-syntax-highlighting :pin "4ac27eec6595ba116a6151dfaf0b0e0440101e10") -(unless IS-WINDOWS +(unless (featurep :system 'windows) (package! fish-completion :pin "d34d0b96fde63feedf13c4288183d8d4d4d748cf") (package! bash-completion :pin "f1daac0386c24cbe8a244a62c7588cc6847b07ae")) diff --git a/modules/tools/debugger/config.el b/modules/tools/debugger/config.el index 55ebd72be..8e914bc60 100644 --- a/modules/tools/debugger/config.el +++ b/modules/tools/debugger/config.el @@ -27,7 +27,7 @@ ((:lang rust +lsp) :after rustic-mode :require (dap-lldb dap-cpptools)) ((:lang javascript +lsp) :after (js2-mode typescript-mode) - :require (dap-node dap-chrome dap-firefox ,@(if IS-WINDOWS '(dap-edge))))) + :require (dap-node dap-chrome dap-firefox ,@(if (featurep :system 'windows) '(dap-edge))))) "TODO") diff --git a/modules/tools/lookup/autoload/lookup.el b/modules/tools/lookup/autoload/lookup.el index b72a52f4e..befd335fd 100644 --- a/modules/tools/lookup/autoload/lookup.el +++ b/modules/tools/lookup/autoload/lookup.el @@ -413,7 +413,7 @@ Otherwise, falls back on `find-file-at-point'." (read-string "Look up in dictionary: ")) current-prefix-arg)) (message "Looking up dictionary definition for %S" identifier) - (cond ((and IS-MAC (require 'osx-dictionary nil t)) + (cond ((and (featurep :system 'macos) (require 'osx-dictionary nil t)) (osx-dictionary--view-result identifier)) ((and +lookup-dictionary-prefer-offline (require 'wordnut nil t)) diff --git a/modules/tools/lookup/config.el b/modules/tools/lookup/config.el index 4c8daeca0..3a778332a 100644 --- a/modules/tools/lookup/config.el +++ b/modules/tools/lookup/config.el @@ -216,7 +216,7 @@ Dictionary.app behind the scenes to get definitions.") (use-package! define-word :when (modulep! +dictionary) - :unless IS-MAC + :unless (featurep :system 'macos) :defer t :config (setq define-word-displayfn-alist diff --git a/modules/tools/lookup/packages.el b/modules/tools/lookup/packages.el index 545a20fb1..98cff03a9 100644 --- a/modules/tools/lookup/packages.el +++ b/modules/tools/lookup/packages.el @@ -25,7 +25,7 @@ (package! counsel-dash :pin "8decb980f111ebe7027361ee252279a9076da261"))) (when (modulep! +dictionary) - (if IS-MAC + (if (featurep :system 'macos) (package! osx-dictionary :pin "0715e5a3ac659df32a0f0fabfbbeef0228fbd9a9") (package! define-word :pin "31a8c67405afa99d0e25e7c86a4ee7ef84a808fe") ;; REVIEW: This fork fixes SavchenkoValeriy/emacs-powerthesaurus#40. diff --git a/modules/ui/ligatures/config.el b/modules/ui/ligatures/config.el index e11d19579..6312493ba 100644 --- a/modules/ui/ligatures/config.el +++ b/modules/ui/ligatures/config.el @@ -157,7 +157,8 @@ and cannot run in." ;; using the same composition-function-table method ;; https://bitbucket.org/mituharu/emacs-mac/src/26c8fd9920db9d34ae8f78bceaec714230824dac/lisp/term/mac-win.el?at=master#lines-345:805 ;; so use that instead if this module is enabled. - ((and IS-MAC (fboundp 'mac-auto-operator-composition-mode)) + ((if (featurep :system 'macos) + (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, diff --git a/modules/ui/ligatures/doctor.el b/modules/ui/ligatures/doctor.el index 9ae683ab4..1b1534f67 100644 --- a/modules/ui/ligatures/doctor.el +++ b/modules/ui/ligatures/doctor.el @@ -1,7 +1,8 @@ ;; This cond expression mimics the activation conditional of ligatures, ;; with a fallback that triggers a warning. (cond - ((and IS-MAC (fboundp 'mac-auto-operator-composition-mode)) + ((if (featurep :system 'macos) + (fboundp 'mac-auto-operator-composition-mode)) (ignore)) ((and (> emacs-major-version 27) @@ -10,7 +11,6 @@ (featurep 'composite)) ; Emacs loads `composite' at startup (ignore)) - (t - (if IS-MAC - (warn! "The (:ui ligatures) module does not support your version of Emacs. Install emacs-plus with at least Emacs 28, or emacs-mac.") + ((if (featurep :system 'macos) + (warn! "The (:ui ligatures) module does not support your version of Emacs. Install emacs-plus with at least Emacs 28, or emacs-mac.") (warn! "The (:ui ligatures) module does not support your version of Emacs. Make sure to have at least Emacs 28 with Harfbuzz configured (should be the default).")))) diff --git a/modules/ui/modeline/+light.el b/modules/ui/modeline/+light.el index 8f96d9bf0..26515b65f 100644 --- a/modules/ui/modeline/+light.el +++ b/modules/ui/modeline/+light.el @@ -489,7 +489,7 @@ lines are selected, or the NxM dimensions of a block selection.") `(:eval (let ((sys (coding-system-plist buffer-file-coding-system)) (eol (coding-system-eol-type-mnemonic buffer-file-coding-system))) - (concat (unless (equal eol ,(if IS-WINDOWS "CRLF" "LF")) + (concat (unless (equal eol ,(if (featurep :system 'windows) "CRLF" "LF")) (concat " " eol " ")) (if (memq (plist-get sys :category) '(coding-category-undecided coding-category-utf-8)) diff --git a/modules/ui/modeline/config.el b/modules/ui/modeline/config.el index b58bf3eff..8aef20d7e 100644 --- a/modules/ui/modeline/config.el +++ b/modules/ui/modeline/config.el @@ -24,9 +24,7 @@ ;; than the current OSes preference doom-modeline-buffer-encoding 'nondefault doom-modeline-default-eol-type - (cond (IS-MAC 2) - (IS-WINDOWS 1) - (0))) + (pcase doom-system ('macos 2) ('windows 1) (_ 0))) :config ;; Fix an issue where these two variables aren't defined in TTY Emacs on MacOS diff --git a/templates/init.example.el b/templates/init.example.el index a55152d26..169604c3b 100644 --- a/templates/init.example.el +++ b/templates/init.example.el @@ -110,7 +110,7 @@ ;;upload ; map local to remote projects via ssh/ftp :os - (:if IS-MAC macos) ; improve compatibility with macOS + (:if (featurep :system 'macos) macos) ; improve compatibility with macOS ;;tty ; improve the terminal Emacs experience :lang From fc6934c24073f07c7caecba65bf303479ef036c7 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Fri, 2 Feb 2024 18:54:14 -0500 Subject: [PATCH 10/49] refactor: introduce doom-module-load-path This renames doom-modules-dirs to doom-module-load-path, which dictates where Doom searches for module trees or single modules, in preparation for more sophisticated module lookups in v3. This also deprecates doom-modules-dirs, which will be fully removed in the v3 release. --- lisp/doom-modules.el | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/lisp/doom-modules.el b/lisp/doom-modules.el index fa7f4ccbc..34a87863b 100644 --- a/lisp/doom-modules.el +++ b/lisp/doom-modules.el @@ -8,10 +8,18 @@ (defvar doom-modules (make-hash-table :test 'equal) "A hash table of enabled modules. Set by `doom-initialize-modules'.") -(defvar doom-modules-dirs - (list (expand-file-name "modules/" doom-user-dir) - doom-modules-dir) - "A list of module root directories. Order determines priority.") +(defvar doom-module-load-path + (list (file-name-concat doom-user-dir "modules") + (file-name-concat doom-emacs-dir "modules")) + "A list of paths where Doom should search for modules. + +Order determines priority (from highest to lowest). + +Each entry is a string; an absolute path to the root directory of a module tree. +In other words, they should contain a two-level nested directory structure, +where the module's group and name was deduced from the first and second level of +directories. For example: if $DOOMDIR/modules/ is an entry, a +$DOOMDIR/modules/lang/ruby/ directory represents a ':lang ruby' module.") ;;; Module file variables (defvar doom-module-init-file "init.el" @@ -41,6 +49,12 @@ NOT IMPLEMENTED YET. This file contains a module's metadata: their version, maintainers, checks, features, submodules, debug information, etc. And are used to locate modules in the user's file tree.") + +;; +;;; Obsolete variables + +(define-obsolete-variable-alias 'doom-modules-dirs 'doom-module-load-path "3.0.0") + (defconst doom-obsolete-modules '((:feature (version-control (:emacs vc) (:ui vc-gutter)) (spellcheck (:checkers spell)) @@ -342,14 +356,15 @@ If ENABLED-ONLY, return nil if the containing module isn't enabled." ((file-in-directory-p path doom-user-dir) (cons :user nil)))))) -(defun doom-module-load-path (&optional module-dirs) +(defun doom-module-load-path (&optional module-load-path) "Return a list of file paths to activated modules. The list is in no particular order and its file paths are absolute. If MODULE-DIRS is non-nil, include all modules (even disabled ones) available in those directories." (declare (pure t) (side-effect-free t)) - (cl-loop for (cat . mod) in (doom-module-list module-dirs) + (cl-loop with module-load-path = (or module-load-path doom-module-load-path) + for (cat . mod) in (doom-module-list module-load-path) collect (doom-module-locate-path cat mod))) (defun doom-module-mplist-map (fn mplist) From 77ea4013dd1a13253a712e593265e8164c144fee Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Fri, 2 Feb 2024 18:58:34 -0500 Subject: [PATCH 11/49] refactor: doom-module: conform variables to conventions - Rename doom--empty-module-context to doom-module--empty-context. - Nest doom-module-context symbol plist in its 'keys' property. (By convention, Doom uses keywords as keys in most places. Let's be consistent) - Updates all uses of doom-module--context-field and doom-module-context-get. --- lisp/doom-modules.el | 31 +++++++++++++++++-------------- modules/lang/org/config.el | 2 +- 2 files changed, 18 insertions(+), 15 deletions(-) diff --git a/lisp/doom-modules.el b/lisp/doom-modules.el index 34a87863b..0d0c5fd9b 100644 --- a/lisp/doom-modules.el +++ b/lisp/doom-modules.el @@ -125,12 +125,12 @@ your `doom!' block, a warning is emitted before replacing it with :emacs vc and ;; ;;; `doom-module-context' -(defvar doom--empty-module-context [nil nil nil nil nil nil nil]) +(defvar doom-module--empty-context [nil nil nil nil nil nil nil]) (eval-and-compile - (setplist 'doom-module-context '(index 0 initdepth 1 configdepth 2 - group 3 name 4 flags 5 features 6))) -(defvar doom-module-context doom--empty-module-context + (put 'doom-module-context 'keys '(:index 0 :initdepth 1 :configdepth 2 + :group 3 :name 4 :flags 5 :features 6))) +(defvar doom-module-context doom-module--empty-context "A vector describing the module associated it with the active context. Contains the following: [INDEX INITDEPTH CONFIGDEPTH :GROUP MODULE FLAGS FEATURES] @@ -138,7 +138,8 @@ Contains the following: [INDEX INITDEPTH CONFIGDEPTH :GROUP MODULE FLAGS FEATURE Do not directly set this variable, only let-bind it.") ;; DEPRECATED: Remove this when byte-compilation is introduced to Doom core. -(defmacro doom-module--context-field (field) (get 'doom-module-context field)) +(defmacro doom-module--context-field (field) + (plist-get (get 'doom-module-context 'keys) field)) (defun doom-module-context-get (field &optional context) "Return the FIELD of CONTEXT. @@ -146,7 +147,9 @@ Do not directly set this variable, only let-bind it.") FIELD should be one of `index', `initdepth', `configdepth', `group', `name', `flags', or `features'. CONTEXT should be a `doom-module-context' vector. If omitted, defaults to `doom-module-context'." - (aref (or context doom-module-context) (get 'doom-module-context field))) + (aref (or context doom-module-context) + (plist-get (get 'doom-module-context 'keys) + field))) (defun doom-module-context (group &optional name) "Create a `doom-module-context' from a module by GROUP and NAME. @@ -156,14 +159,14 @@ If NAME is omitted, GROUP is treated as a module key cons cell: (GROUP . NAME)." (let ((key (if name (cons group name) group))) (or (get (or (car-safe key) key) (cdr-safe key)) - doom--empty-module-context))) + doom-module--empty-context))) (defun doom-module-context-key (&optional context) "Return the module of the active `doom-module-context' as a module key." (declare (side-effect-free t)) (let ((context (or context doom-module-context))) - (cons (aref context (doom-module--context-field group)) - (aref context (doom-module--context-field name))))) + (cons (aref context (doom-module--context-field :group)) + (aref context (doom-module--context-field :name))))) (defmacro doom-module-context-with (module-key &rest body) "Evaluate BODY with `doom-module-context' informed by MODULE-KEY." @@ -477,20 +480,20 @@ For more about modules and flags, see `doom!'." ;; PERF: This macro bypasses the module API to spare startup their runtime ;; cost, as `modulep!' gets called *a lot* during startup. In the future, ;; Doom will byte-compile its core files. At that time, we can use it again. - (and (cond (flag (memq flag (aref (or (get category module) doom--empty-module-context) - (doom-module--context-field flags)))) + (and (cond (flag (memq flag (aref (or (get category module) doom-module--empty-context) + (doom-module--context-field :flags)))) (module (get category module)) ((aref doom-module-context 0) (memq category (aref doom-module-context - (doom-module--context-field flags)))) + (doom-module--context-field :flags)))) ((let ((file ;; This must be expanded at the call site, not in ;; `modulep!'s definition, to get the file we want. (macroexpand '(file!)))) (if-let (module (doom-module-from-path file)) (memq category (aref (or (get (car module) (cdr module)) - doom--empty-module-context) - (doom-module--context-field flags))) + doom-module--empty-context) + (doom-module--context-field :flags))) (error "(modulep! %s %s %s) couldn't figure out what module it was called from (in %s)" category module flag file))))) t)) diff --git a/modules/lang/org/config.el b/modules/lang/org/config.el index aae33583c..0fda370f9 100644 --- a/modules/lang/org/config.el +++ b/modules/lang/org/config.el @@ -1352,7 +1352,7 @@ between the two." )) ;;; Custom org modules - (dolist (flag (doom-module-context-get 'flags)) + (dolist (flag (doom-module-context-get :flags)) (load! (concat "contrib/" (substring (symbol-name flag) 1)) nil t)) ;; Add our general hooks after the submodules, so that any hooks the From 3bea4f66a8443ef8a0525bd3b180b0c650dccdb8 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Sat, 3 Feb 2024 17:01:37 -0500 Subject: [PATCH 12/49] refactor(emacs-lisp): elisp-demos: reorganize Doom demos - Move Doom core elisp API demos out of docs/examples.org into lisp/demos.org. - Recognize and search demos.org file in modules for additional demos (including $DOOMDIR/demos.org). - Refactor emacs-lisp module to use new elisp-demos-user-files variable instead of an advice. This way, elisp-demo's commands (such as `elisp-demos-find-demo` and `elisp-demos-add-demo`) will include Doom's demos. --- docs/examples.org | 678 +--------------------------- lisp/demos.org | 654 +++++++++++++++++++++++++++ modules/lang/emacs-lisp/autoload.el | 25 - modules/lang/emacs-lisp/config.el | 21 +- 4 files changed, 675 insertions(+), 703 deletions(-) create mode 100644 lisp/demos.org diff --git a/docs/examples.org b/docs/examples.org index c88ba5fd5..51287c7ab 100644 --- a/docs/examples.org +++ b/docs/examples.org @@ -34,33 +34,6 @@ of our contributing guide first. This section is dedicated to examples of concepts and libraries that can benefit all Emacs users, whether or not they use Doom. -** TODO Emacs Lisp :demos: -**** file-name-with-extension -:PROPERTIES: -:added: 28.1 -:END: -#+begin_src emacs-lisp -(file-name-with-extension "some/file.cpp" "h") -#+end_src - -#+RESULTS: -: some/file.h - -**** file-name-concat -:PROPERTIES: -:added: 28.1 -:END: -#+begin_src emacs-lisp -(file-name-concat user-emacs-directory "lisp" "file.el") -#+end_src - -#+begin_src emacs-lisp -(file-name-concat "foo" "bar" "baz") -#+end_src - -#+RESULTS: -: foo/bar/baz - ** TODO Templates *** TODO Emacs package *** TODO Dynamic module @@ -70,655 +43,6 @@ This section is dedicated to examples of concepts and libraries only relevant to Doom and its users. These are intended to be demonstrations, not substitutes for documentation. -** TODO Emacs Lisp :demos: -*** doom-lib -**** add-hook! -:PROPERTIES: -:added: 3.0.0-pre -:END: -#+begin_src emacs-lisp -;; With only one hook and one function, this is identical to `add-hook'. In that -;; case, use that instead. -(add-hook! 'some-mode-hook #'enable-something) - -;; Adding many-to-many functions to hooks -(add-hook! some-mode #'enable-something #'and-another) -(add-hook! some-mode '(enable-something and-another)) -(add-hook! '(one-mode-hook second-mode-hook) #'enable-something) -(add-hook! (one-mode second-mode) #'enable-something) - -;; Appending and local hooks -(add-hook! (one-mode second-mode) :append #'enable-something) -(add-hook! (one-mode second-mode) :local #'enable-something) - -;; With arbitrary forms -(add-hook! (one-mode second-mode) (setq v 5) (setq a 2)) -(add-hook! (one-mode second-mode) :append :local (setq v 5) (setq a 2)) - -;; Inline named hook functions -(add-hook! '(one-mode-hook second-mode-hook) - (defun do-something () - ...) - (defun do-another-thing () - ...)) -#+end_src - -**** TODO add-transient-hook! -:PROPERTIES: -:added: 3.0.0-pre -:END: -**** after! -:PROPERTIES: -:added: 3.0.0-pre -:END: -#+begin_src emacs-lisp :eval no -;;; `after!' will take: - -;; An unquoted package symbol (the name of a package) -(after! helm ...) - -;; An unquoted list of package symbols (i.e. BODY is evaluated once both magit -;; and git-gutter have loaded) -(after! (magit git-gutter) ...) - -;; An unquoted, nested list of compound package lists, using any combination of -;; :or/:any and :and/:all -(after! (:or package-a package-b ...) ...) -(after! (:and package-a package-b ...) ...) -(after! (:and package-a (:or package-b package-c) ...) ...) -;; (Without :or/:any/:and/:all, :and/:all are implied.) - -;; A common mistake is to pass it the names of major or minor modes, e.g. -(after! rustic-mode ...) -(after! python-mode ...) -;; But the code in them will never run! rustic-mode is in the `rustic' package -;; and python-mode is in the `python' package. This is what you want: -(after! rustic ...) -(after! python ...) -#+end_src -**** appendq! -:PROPERTIES: -:added: 3.0.0-pre -:END: -#+begin_src emacs-lisp -(let ((x '(a b c))) - (appendq! x '(c d e)) - x) -#+end_src - -#+RESULTS: -: (a b c c d e) - -#+begin_src emacs-lisp -(let ((x '(a b c)) - (y '(c d e)) - (z '(f g))) - (appendq! x y z '(h)) - x) -#+end_src - -#+RESULTS: -: (a b c c d e f g h) - -**** custom-set-faces! -:PROPERTIES: -:added: 3.0.0-pre -:END: -#+begin_src emacs-lisp :eval no -(custom-set-faces! - '(outline-1 :weight normal) - '(outline-2 :weight normal) - '(outline-3 :weight normal) - '(outline-4 :weight normal) - '(outline-5 :weight normal) - '(outline-6 :weight normal) - '(default :background "red" :weight bold) - '(region :background "red" :weight bold)) - -(custom-set-faces! - '((outline-1 outline-2 outline-3 outline-4 outline-5 outline-6) - :weight normal) - '((default region) - :background "red" :weight bold)) - -(let ((red-bg-faces '(default region))) - (custom-set-faces! - `(,(cl-loop for i from 0 to 6 collect (intern (format "outline-%d" i))) - :weight normal) - `(,red-bg-faces - :background "red" :weight bold))) - -;; You may utilise `doom-themes's theme API to fetch or tweak colors from their -;; palettes. No need to wait until the theme or package is loaded. e.g. -(custom-set-faces! - `(outline-1 :foreground ,(doom-color 'red)) - `(outline-2 :background ,(doom-color 'blue))) -#+end_src - -**** custom-theme-set-faces! -:PROPERTIES: -:added: 3.0.0-pre -:END: -#+begin_src emacs-lisp :eval no -(custom-theme-set-faces! 'doom-one - '(outline-1 :weight normal) - '(outline-2 :weight normal) - '(outline-3 :weight normal) - '(outline-4 :weight normal) - '(outline-5 :weight normal) - '(outline-6 :weight normal) - '(default :background "red" :weight bold) - '(region :background "red" :weight bold)) - -(custom-theme-set-faces! '(doom-one-theme doom-one-light-theme) - '((outline-1 outline-2 outline-3 outline-4 outline-5 outline-6) - :weight normal) - '((default region) - :background "red" :weight bold)) - -(let ((red-bg-faces '(default region))) - (custom-theme-set-faces! '(doom-one-theme doom-one-light-theme) - `(,(cl-loop for i from 0 to 6 collect (intern (format "outline-%d" i))) - :weight normal) - `(,red-bg-faces - :background "red" :weight bold))) - -;; You may utilise `doom-themes's theme API to fetch or tweak colors from their -;; palettes. No need to wait until the theme or package is loaded. e.g. -(custom-theme-set-faces! 'doom-one - `(outline-1 :foreground ,(doom-color 'red)) - `(outline-2 :background ,(doom-color 'blue))) -#+end_src - -**** TODO defer-feature! -:PROPERTIES: -:added: 3.0.0-pre -:END: -**** TODO defer-until! -:PROPERTIES: -:added: 3.0.0-pre -:END: -**** disable-packages! -:PROPERTIES: -:added: 3.0.0-pre -:END: -#+begin_src emacs-lisp :eval no -;; Disable packages enabled by DOOM -(disable-packages! some-package second-package) -#+end_src - -**** file-exists-p! -:PROPERTIES: -:added: 3.0.0-pre -:END: -#+begin_src emacs-lisp -(file-exists-p! "init.el" doom-emacs-dir) -#+end_src - -#+RESULTS: -: /home/hlissner/.emacs.d/init.el - -#+begin_src emacs-lisp -(file-exists-p! (and (or "doesnotexist" "init.el") - "LICENSE") - doom-emacs-dir) -#+end_src - -#+RESULTS: -: /home/hlissner/.emacs.d/LICENSE - -**** cmd! -:PROPERTIES: -:added: 3.0.0-pre -:END: -#+begin_src emacs-lisp :eval no -(map! "C-j" (cmd! (newline) (indent-according-to-mode))) -#+end_src - -**** cmd!! -:PROPERTIES: -:added: 3.0.0-pre -:END: -When ~newline~ is passed a numerical prefix argument (=C-u 5 M-x newline=), it -inserts N newlines. We can use ~cmd!!~ to easily create a keybinds that bakes in -the prefix arg into the command call: - -#+begin_src emacs-lisp :eval no -(map! "C-j" (cmd!! #'newline 5)) -#+end_src - -Or to create aliases for functions that behave differently: - -#+begin_src emacs-lisp :eval no -(fset 'insert-5-newlines (cmd!! #'newline 5)) - -;; The equivalent of C-u M-x org-global-cycle, which resets the org document to -;; its startup visibility settings. -(fset 'org-reset-global-visibility (cmd!! #'org-global-cycle '(4)) -#+end_src - -**** cmds! -:PROPERTIES: -:added: 3.0.0-pre -:END: -#+begin_src emacs-lisp :eval no -(map! :i [tab] (cmds! (and (modulep! :editor snippets) - (bound-and-true-p yas-minor-mode) - (yas-maybe-expand-abbrev-key-filter 'yas-expand)) - #'yas-expand - (modulep! :completion company +tng) - #'company-indent-or-complete-common) - :m [tab] (cmds! (and (bound-and-true-p yas-minor-mode) - (evil-visual-state-p) - (or (eq evil-visual-selection 'line) - (not (memq (char-after) (list ?\( ?\[ ?\{ ?\} ?\] ?\)))))) - #'yas-insert-snippet - (and (modulep! :editor fold) - (save-excursion (end-of-line) (invisible-p (point)))) - #'+fold/toggle - (fboundp 'evil-jump-item) - #'evil-jump-item)) -#+end_src - -**** kbd! -:PROPERTIES: -:added: 3.0.0-pre -:END: -#+begin_src emacs-lisp :eval no -(map! "," (kbd! "SPC") - ";" (kbd! ":")) -#+end_src - -**** lambda! -#+begin_src emacs-lisp -(mapcar (lambda! ((&key foo bar baz)) - (list foo bar baz)) - '((:foo 10 :bar 25) - (:baz hello :boop nil) - (:bar 42))) -#+end_src - -**** fn! -#+begin_src emacs-lisp -(mapcar (fn! (symbol-name %)) '(hello world)) -#+end_src - -#+begin_src emacs-lisp -(seq-sort (fn! (string-lessp (symbol-name %1) - (symbol-name %2))) - '(bonzo foo bar buddy doomguy baz zombies)) -#+end_src - -#+begin_src emacs-lisp -(format "You passed %d arguments to this function" - (funcall (fn! (length %*)) :foo :bar :baz "hello" 123 t)) -#+end_src - -**** load! -:PROPERTIES: -:added: 3.0.0-pre -:END: -#+begin_src emacs-lisp :eval no -;;; Lets say we're in ~/.doom.d/config.el -(load! "lisp/module") ; loads ~/.doom.d/lisp/module.el -(load! "somefile" doom-emacs-dir) ; loads ~/.emacs.d/somefile.el -(load! "anotherfile" doom-user-dir) ; loads ~/.doom.d/anotherfile.el - -;; If you don't want a `load!' call to throw an error if the file doesn't exist: -(load! "~/.maynotexist" nil t) -#+end_src - -**** map! -:PROPERTIES: -:added: 3.0.0-pre -:END: -#+begin_src emacs-lisp :eval no -(map! :map magit-mode-map - :m "C-r" 'do-something ; C-r in motion state - :nv "q" 'magit-mode-quit-window ; q in normal+visual states - "C-x C-r" 'a-global-keybind - :g "C-x C-r" 'another-global-keybind ; same as above - - (:when (featurep :system 'macos) - :n "M-s" 'some-fn - :i "M-o" (cmd! (message "Hi")))) - -(map! (:when (modulep! :completion company) ; Conditional loading - :i "C-@" #'+company/complete - (:prefix "C-x" ; Use a prefix key - :i "C-l" #'+company/whole-lines))) - -(map! (:when (modulep! :lang latex) ; local conditional - (:map LaTeX-mode-map - :localleader ; Use local leader - :desc "View" "v" #'TeX-view)) ; Add which-key description - :leader ; Use leader key from now on - :desc "Eval expression" ";" #'eval-expression) -#+end_src - -These are side-by-side comparisons, showing how to bind keys with and without -~map!~: - -#+begin_src emacs-lisp :eval no -;; bind a global key -(global-set-key (kbd "C-x y") #'do-something) -(map! "C-x y" #'do-something) - -;; bind a key on a keymap -(define-key emacs-lisp-mode-map (kbd "C-c p") #'do-something) -(map! :map emacs-lisp-mode-map "C-c p" #'do-something) - -;; unbind a key defined elsewhere -(define-key lua-mode-map (kbd "SPC m b") nil) -(map! :map lua-mode-map "SPC m b" nil) - -;; bind multiple keys -(global-set-key (kbd "C-x x") #'do-something) -(global-set-key (kbd "C-x y") #'do-something-else) -(global-set-key (kbd "C-x z") #'do-another-thing) -(map! "C-x x" #'do-something - "C-x y" #'do-something-else - "C-x z" #'do-another-thing) - -;; bind global keys in normal mode -(evil-define-key* 'normal 'global - (kbd "C-x x") #'do-something - (kbd "C-x y") #'do-something-else - (kbd "C-x z") #'do-another-thing) -(map! :n "C-x x" #'do-something - :n "C-x y" #'do-something-else - :n "C-x z" #'do-another-thing) - -;; or on a deferred keymap -(evil-define-key 'normal emacs-lisp-mode-map - (kbd "C-x x") #'do-something - (kbd "C-x y") #'do-something-else - (kbd "C-x z") #'do-another-thing) -(map! :map emacs-lisp-mode-map - :n "C-x x" #'do-something - :n "C-x y" #'do-something-else - :n "C-x z" #'do-another-thing) - -;; or multiple maps -(dolist (map (list emacs-lisp-mode go-mode-map ivy-minibuffer-map)) - (evil-define-key '(normal insert) map - "a" #'a - "b" #'b - "c" #'c)) -(map! :map (emacs-lisp-mode go-mode-map ivy-minibuffer-map) - :ni "a" #'a - :ni "b" #'b - :ni "c" #'c) - -;; or in multiple states (order of states doesn't matter) -(evil-define-key* '(normal visual) emacs-lisp-mode-map (kbd "C-x x") #'do-something) -(evil-define-key* 'insert emacs-lisp-mode-map (kbd "C-x x") #'do-something-else) -(evil-define-key* '(visual normal insert emacs) emacs-lisp-mode-map (kbd "C-x z") #'do-another-thing) -(map! :map emacs-lisp-mode - :nv "C-x x" #'do-something ; normal+visual - :i "C-x y" #'do-something-else ; insert - :vnie "C-x z" #'do-another-thing) ; visual+normal+insert+emacs - -;; You can nest map! calls: -(evil-define-key* '(normal visual) emacs-lisp-mode-map (kbd "C-x x") #'do-something) -(evil-define-key* 'normal go-lisp-mode-map (kbd "C-x x") #'do-something-else) -(map! (:map emacs-lisp-mode :nv "C-x x" #'do-something) - (:map go-lisp-mode :n "C-x x" #'do-something-else)) -#+end_src - -**** pushnew! -:PROPERTIES: -:added: 3.0.0-pre -:END: -#+begin_src emacs-lisp -(let ((list '(a b c))) - (pushnew! list 'c 'd 'e) - list) -#+end_src - -#+RESULTS: -: (e d a b c) - -**** prependq! -:PROPERTIES: -:added: 3.0.0-pre -:END: -#+begin_src emacs-lisp -(let ((x '(a b c))) - (prependq! x '(c d e)) - x) -#+end_src - -#+RESULTS: -: (c d e a b c) - -#+begin_src emacs-lisp -(let ((x '(a b c)) - (y '(c d e)) - (z '(f g))) - (prependq! x y z '(h)) - x) -#+end_src - -#+RESULTS: -: (c d e f g h a b c) - -**** quiet! -:PROPERTIES: -:added: 3.0.0-pre -:END: -#+begin_src emacs-lisp :eval no -;; Enters recentf-mode without extra output -(quiet! (recentf-mode +1)) -#+end_src -**** remove-hook! -:PROPERTIES: -:added: 3.0.0-pre -:END: -#+begin_src emacs-lisp :eval no -;; With only one hook and one function, this is identical to `remove-hook'. In -;; that case, use that instead. -(remove-hook! 'some-mode-hook #'enable-something) - -;; Removing N functions from M hooks -(remove-hook! some-mode #'enable-something #'and-another) -(remove-hook! some-mode #'(enable-something and-another)) -(remove-hook! '(one-mode-hook second-mode-hook) #'enable-something) -(remove-hook! (one-mode second-mode) #'enable-something) - -;; Removing buffer-local hooks -(remove-hook! (one-mode second-mode) :local #'enable-something) - -;; Removing arbitrary forms (must be exactly the same as the definition) -(remove-hook! (one-mode second-mode) (setq v 5) (setq a 2)) -#+end_src -**** setq! -:PROPERTIES: -:added: 3.0.0-pre -:END: -#+begin_src emacs-lisp -;; Each of these have a setter associated with them, which must be triggered in -;; order for their new values to have an effect. -(setq! evil-want-Y-yank-to-eol nil - evil-want-C-u-scroll nil - evil-want-C-d-scroll nil) -#+end_src -**** setq-hook! -:PROPERTIES: -:added: 3.0.0-pre -:END: -#+begin_src emacs-lisp :eval no -;; Set multiple variables after a hook -(setq-hook! 'markdown-mode-hook - line-spacing 2 - fill-column 80) - -;; Set variables after multiple hooks -(setq-hook! '(eshell-mode-hook term-mode-hook) - hscroll-margin 0) -#+end_src - -**** unsetq-hook! -:PROPERTIES: -:added: 3.0.0-pre -:END: -#+begin_src emacs-lisp :eval no -(unsetq-hook! 'markdown-mode-hook line-spacing) - -;; Removes the following variable hook -(setq-hook! 'markdown-mode-hook line-spacing 2) - -;; Removing N variables from M hooks -(unsetq-hook! some-mode enable-something and-another) -(unsetq-hook! some-mode (enable-something and-another)) -(unsetq-hook! '(one-mode-hook second-mode-hook) enable-something) -(unsetq-hook! (one-mode second-mode) enable-something) -#+end_src -**** versionp! -:PROPERTIES: -:added: 3.0.0-pre -:END: -#+begin_src emacs-lisp -(versionp! "25.3" > "27.1") -#+end_src - -#+RESULTS: -: nil - -#+begin_src emacs-lisp -(versionp! "28.0" <= emacs-version <= "28.1") -#+end_src - -#+RESULTS: -: t - -*** doom-modules -**** doom! -:PROPERTIES: -:added: 3.0.0-pre -:END: -#+begin_src emacs-lisp :eval no -(doom! :completion - company - ivy - ;;helm - - :tools - (:if (featurep :system 'macos) macos) - docker - lsp - - :lang - (cc +lsp) - (:cond ((string= system-name "work-pc") - python - rust - web) - ((string= system-name "writing-pc") - (org +dragndrop) - ruby)) - (:if (featurep :system 'linux) - (web +lsp) - web) - - :config - literate - (default +bindings +smartparens)) -#+end_src - -**** use-package! -:PROPERTIES: -:added: 3.0.0-pre -:END: -#+begin_src emacs-lisp :eval no -;; Use after-call to load package before hook -(use-package! projectile - :after-call (pre-command-hook after-find-file dired-before-readin-hook)) - -;; defer recentf packages one by one -(use-package! recentf - :defer-incrementally easymenu tree-widget timer - :after-call after-find-file) - -;; This is equivalent to :defer-incrementally (abc) -(use-package! abc - :defer-incrementally t) -#+end_src - -**** package! -:PROPERTIES: -:added: 3.0.0-pre -:END: -#+begin_src emacs-lisp :eval no -;; To install a package that can be found on ELPA or any of the sources -;; specified in `straight-recipe-repositories': -(package! evil) -(package! js2-mode) -(package! rainbow-delimiters) - -;; To disable a package included with Doom (which will no-op all its `after!' -;; and `use-package!' blocks): -(package! evil :disable t) -(package! rainbow-delimiters :disable t) - -;; To install a package from a github repo -(package! so-long :recipe (:host github :repo "hlissner/emacs-so-long")) - -;; If a package is particularly big and comes with submodules you don't need, -;; you can tell the package manager not to clone the repo recursively: -(package! ansible :recipe (:nonrecursive t)) - -;; To pin a package to a specific commit: -(package! evil :pin "e7bc39de2f9") -;; ...or branch: -(package! evil :recipe (:branch "stable")) -;; To unpin a pinned package: -(package! evil :pin nil) - -;; If you share your config between two computers, and don't want bin/doom -;; refresh to delete packages used only on one system, use :ignore -(package! evil :ignore (not (equal system-name "my-desktop"))) -#+end_src - -*** doom-cli -**** TODO defcli! -**** TODO defcli-alias! -**** TODO defcli-obsolete! -**** TODO defcli-stub! -**** TODO defcli-autoload! -**** TODO defcli-group! -**** TODO exit! -**** TODO call! -**** TODO run! -**** TODO sh! -**** TODO sh!! -**** TODO git! -**** TODO def-cli-context-get -**** TODO def-cli-context-put -**** TODO def-cli-context-find-option -**** TODO def-cli-call -**** TODO def-cli-exit -**** TODO def-cli-load -**** TODO def-cli-load-all -**** TODO doom-cli-find -**** TODO doom-cli-get -**** TODO doom-cli-prop -**** TODO doom-cli-subcommands -**** TODO doom-cli-aliases -*** TODO lib/files.el -**** TODO doom-path -**** TODO doom-glob -**** TODO doom-dir -**** TODO doom-files-in -**** TODO doom-file-cookie-p -**** TODO file-exists-p! -**** TODO doom-file-size -**** TODO doom-file-line-count -**** TODO doom-directory-size -**** TODO doom-file-read -**** TODO doom-file-write -**** TODO with-file-contents! - ** TODO Configuration files *** =profiles.el= :PROPERTIES: @@ -785,7 +109,7 @@ Here is an exhaustive example of all its syntax and capabilities: (profile3 ...)) #+end_src - + *** =.doomprofile= :PROPERTIES: :ID: ac37ac6f-6082-4c34-b98c-962bc1e528c9 diff --git a/lisp/demos.org b/lisp/demos.org new file mode 100644 index 000000000..c79910811 --- /dev/null +++ b/lisp/demos.org @@ -0,0 +1,654 @@ +#+title: Doom Emacs API Demos +#+property: header-args:elisp :results pp :exports both :eval never-export + +This module installs the elisp-demos package, which adds code examples to +documentation buffers (the ones help.el or helpful produces). The built-in demos +are great, but this file exists to add demos for Doom's API and beyond. + +#+begin_quote + 󰐃 Please make sure new additions to this file are arranged alphabetically and + has a :PROPERTIES: drawer that includes in what version of Doom that the + symbol/function was added. +#+end_quote + +#+begin_quote + 󰐃 Please don't add demos for code outside of Doom Emacs. PR those to the parent + project: https://github.com/xuchunyang/elisp-demos. And please don't add + functions from modules, put those in that module's demo.org file, or your + own in $DOOMDIR/demos.org. +#+end_quote + +* add-hook! +:PROPERTIES: +:added: 3.0.0-pre +:END: +#+begin_src emacs-lisp +;; With only one hook and one function, this is identical to `add-hook'. In that +;; case, use that instead. +(add-hook! 'some-mode-hook #'enable-something) + +;; Adding many-to-many functions to hooks +(add-hook! some-mode #'enable-something #'and-another) +(add-hook! some-mode '(enable-something and-another)) +(add-hook! '(one-mode-hook second-mode-hook) #'enable-something) +(add-hook! (one-mode second-mode) #'enable-something) + +;; Appending and local hooks +(add-hook! (one-mode second-mode) :append #'enable-something) +(add-hook! (one-mode second-mode) :local #'enable-something) + +;; With arbitrary forms +(add-hook! (one-mode second-mode) (setq v 5) (setq a 2)) +(add-hook! (one-mode second-mode) :append :local (setq v 5) (setq a 2)) + +;; Inline named hook functions +(add-hook! '(one-mode-hook second-mode-hook) + (defun do-something () + ...) + (defun do-another-thing () + ...)) +#+end_src + +* TODO add-transient-hook! +:PROPERTIES: +:added: 3.0.0-pre +:END: +* after! +:PROPERTIES: +:added: 3.0.0-pre +:END: +#+begin_src emacs-lisp :eval no +;;; `after!' will take: + +;; An unquoted package symbol (the name of a package) +(after! helm ...) + +;; An unquoted list of package symbols (i.e. BODY is evaluated once both magit +;; and git-gutter have loaded) +(after! (magit git-gutter) ...) + +;; An unquoted, nested list of compound package lists, using any combination of +;; :or/:any and :and/:all +(after! (:or package-a package-b ...) ...) +(after! (:and package-a package-b ...) ...) +(after! (:and package-a (:or package-b package-c) ...) ...) +;; (Without :or/:any/:and/:all, :and/:all are implied.) + +;; A common mistake is to pass it the names of major or minor modes, e.g. +(after! rustic-mode ...) +(after! python-mode ...) +;; But the code in them will never run! rustic-mode is in the `rustic' package +;; and python-mode is in the `python' package. This is what you want: +(after! rustic ...) +(after! python ...) +#+end_src +* appendq! +:PROPERTIES: +:added: 3.0.0-pre +:END: +#+begin_src emacs-lisp +(let ((x '(a b c))) + (appendq! x '(c d e)) + x) +#+end_src + +#+RESULTS: +: (a b c c d e) + +#+begin_src emacs-lisp +(let ((x '(a b c)) + (y '(c d e)) + (z '(f g))) + (appendq! x y z '(h)) + x) +#+end_src + +#+RESULTS: +: (a b c c d e f g h) + +* cmd! +:PROPERTIES: +:added: 3.0.0-pre +:END: +#+begin_src emacs-lisp :eval no +(map! "C-j" (cmd! (newline) (indent-according-to-mode))) +#+end_src + +* cmd!! +:PROPERTIES: +:added: 3.0.0-pre +:END: +When ~newline~ is passed a numerical prefix argument (=C-u 5 M-x newline=), it +inserts N newlines. We can use ~cmd!!~ to easily create a keybinds that bakes in +the prefix arg into the command call: + +#+begin_src emacs-lisp :eval no +(map! "C-j" (cmd!! #'newline 5)) +#+end_src + +Or to create aliases for functions that behave differently: + +#+begin_src emacs-lisp :eval no +(fset 'insert-5-newlines (cmd!! #'newline 5)) + +;; The equivalent of C-u M-x org-global-cycle, which resets the org document to +;; its startup visibility settings. +(fset 'org-reset-global-visibility (cmd!! #'org-global-cycle '(4)) +#+end_src + +* cmds! +:PROPERTIES: +:added: 3.0.0-pre +:END: +#+begin_src emacs-lisp :eval no +(map! :i [tab] (cmds! (and (modulep! :editor snippets) + (bound-and-true-p yas-minor-mode) + (yas-maybe-expand-abbrev-key-filter 'yas-expand)) + #'yas-expand + (modulep! :completion company +tng) + #'company-indent-or-complete-common) + :m [tab] (cmds! (and (bound-and-true-p yas-minor-mode) + (evil-visual-state-p) + (or (eq evil-visual-selection 'line) + (not (memq (char-after) (list ?\( ?\[ ?\{ ?\} ?\] ?\)))))) + #'yas-insert-snippet + (and (modulep! :editor fold) + (save-excursion (end-of-line) (invisible-p (point)))) + #'+fold/toggle + (fboundp 'evil-jump-item) + #'evil-jump-item)) +#+end_src + +* custom-set-faces! +:PROPERTIES: +:added: 3.0.0-pre +:END: +#+begin_src emacs-lisp :eval no +(custom-set-faces! + '(outline-1 :weight normal) + '(outline-2 :weight normal) + '(outline-3 :weight normal) + '(outline-4 :weight normal) + '(outline-5 :weight normal) + '(outline-6 :weight normal) + '(default :background "red" :weight bold) + '(region :background "red" :weight bold)) + +(custom-set-faces! + '((outline-1 outline-2 outline-3 outline-4 outline-5 outline-6) + :weight normal) + '((default region) + :background "red" :weight bold)) + +(let ((red-bg-faces '(default region))) + (custom-set-faces! + `(,(cl-loop for i from 0 to 6 collect (intern (format "outline-%d" i))) + :weight normal) + `(,red-bg-faces + :background "red" :weight bold))) + +;; You may utilise `doom-themes's theme API to fetch or tweak colors from their +;; palettes. No need to wait until the theme or package is loaded. e.g. +(custom-set-faces! + `(outline-1 :foreground ,(doom-color 'red)) + `(outline-2 :background ,(doom-color 'blue))) +#+end_src + +* custom-theme-set-faces! +:PROPERTIES: +:added: 3.0.0-pre +:END: +#+begin_src emacs-lisp :eval no +(custom-theme-set-faces! 'doom-one + '(outline-1 :weight normal) + '(outline-2 :weight normal) + '(outline-3 :weight normal) + '(outline-4 :weight normal) + '(outline-5 :weight normal) + '(outline-6 :weight normal) + '(default :background "red" :weight bold) + '(region :background "red" :weight bold)) + +(custom-theme-set-faces! '(doom-one-theme doom-one-light-theme) + '((outline-1 outline-2 outline-3 outline-4 outline-5 outline-6) + :weight normal) + '((default region) + :background "red" :weight bold)) + +(let ((red-bg-faces '(default region))) + (custom-theme-set-faces! '(doom-one-theme doom-one-light-theme) + `(,(cl-loop for i from 0 to 6 collect (intern (format "outline-%d" i))) + :weight normal) + `(,red-bg-faces + :background "red" :weight bold))) + +;; You may utilise `doom-themes's theme API to fetch or tweak colors from their +;; palettes. No need to wait until the theme or package is loaded. e.g. +(custom-theme-set-faces! 'doom-one + `(outline-1 :foreground ,(doom-color 'red)) + `(outline-2 :background ,(doom-color 'blue))) +#+end_src + +* TODO defer-feature! +:PROPERTIES: +:added: 3.0.0-pre +:END: +* TODO defer-until! +:PROPERTIES: +:added: 3.0.0-pre +:END: +* disable-packages! +:PROPERTIES: +:added: 3.0.0-pre +:END: +#+begin_src emacs-lisp :eval no +;; Disable packages enabled by DOOM +(disable-packages! some-package second-package) +#+end_src + +* doom! +:PROPERTIES: +:added: 3.0.0-pre +:END: +#+begin_src emacs-lisp :eval no +(doom! :completion + company + ivy + ;;helm + + :tools + (:if (featurep :system 'macos) macos) + docker + lsp + + :lang + (cc +lsp) + (:cond ((string= system-name "work-pc") + python + rust + web) + ((string= system-name "writing-pc") + (org +dragndrop) + ruby)) + (:if (featurep :system 'linux) + (web +lsp) + web) + + :config + literate + (default +bindings +smartparens)) + +(doom! + (pin "v3.0.0") + + (source "modules/") ; Modules in $DOOMDIR/modules/*/* + (source :name doom :repo "doomemacs/modules" :pin "v21.12.0") ; Doom's default modules + (source :name contrib :repo "doomemacs/contrib-modules" :pin "v21.12.0") ; Community-contributed + ;; Examples: + (source :name my :repo "my/modules" :root "unorthodox/path/to/modules/") + (source :name more :host gitlab :repo "more/modules") + + ;;; To enable (or disable) flags globally, they can be given at top-level: + +lsp -tree-sitter + + ;;;; Examples of explicit and/or remote modules: + :lang + (rust :repo "doomemacs/modules" :branch "somePR" :pin "1a2b3c4d" + :path "lang/rust" + :flags '(-lsp)) + ;; A local, out-of-tree module + (python :path "/nonstandard/location/for/modules/python" + :flags '(+pyenv +conda)) + (cc :source 'doom) ; explicit source + (agda :source '(doom more)) ; multiple sources + + :lang + (clojure +lsp) ; shorthand format still works for flags + nix + + ;; Conditional modules + (:os :if (featurep :system 'macos)) ; category-wide + macos + (tty :if (equal (system-name) "headless-machine")) ; per-module + + ...) +#+end_src + +* file-exists-p! +:PROPERTIES: +:added: 3.0.0-pre +:END: +#+begin_src emacs-lisp +(file-exists-p! "init.el" doom-emacs-dir) +#+end_src + +#+begin_src emacs-lisp +(file-exists-p! (and (or "doesnotexist" "init.el") + "LICENSE") + doom-emacs-dir) +#+end_src + +* fn! +#+begin_src emacs-lisp +(mapcar (fn! (symbol-name %)) '(hello world)) +#+end_src + +#+begin_src emacs-lisp +(seq-sort (fn! (string-lessp (symbol-name %1) + (symbol-name %2))) + '(bonzo foo bar buddy doomguy baz zombies)) +#+end_src + +#+begin_src emacs-lisp +(format "You passed %d arguments to this function" + (funcall (fn! (length %*)) :foo :bar :baz "hello" 123 t)) +#+end_src + +* kbd! +:PROPERTIES: +:added: 3.0.0-pre +:END: +#+begin_src emacs-lisp :eval no +(map! "," (kbd! "SPC") + ";" (kbd! ":")) +#+end_src + +* lambda! +#+begin_src emacs-lisp +(mapcar (lambda! ((&key foo bar baz)) + (list foo bar baz)) + '((:foo 10 :bar 25) + (:baz hello :boop nil) + (:bar 42))) +#+end_src + +* load! +:PROPERTIES: +:added: 3.0.0-pre +:END: +#+begin_src emacs-lisp :eval no +;;; Lets say we're in ~/.doom.d/config.el +(load! "lisp/module") ; loads ~/.doom.d/lisp/module.el +(load! "somefile" doom-emacs-dir) ; loads ~/.emacs.d/somefile.el +(load! "anotherfile" doom-user-dir) ; loads ~/.doom.d/anotherfile.el + +;; If you don't want a `load!' call to throw an error if the file doesn't exist: +(load! "~/.maynotexist" nil t) +#+end_src + +* map! +:PROPERTIES: +:added: 3.0.0-pre +:END: +#+begin_src emacs-lisp :eval no +(map! :map magit-mode-map + :m "C-r" 'do-something ; C-r in motion state + :nv "q" 'magit-mode-quit-window ; q in normal+visual states + "C-x C-r" 'a-global-keybind + :g "C-x C-r" 'another-global-keybind ; same as above + + (:when (featurep :system 'macos) + :n "M-s" 'some-fn + :i "M-o" (cmd! (message "Hi")))) + +(map! (:when (modulep! :completion company) ; Conditional loading + :i "C-@" #'+company/complete + (:prefix "C-x" ; Use a prefix key + :i "C-l" #'+company/whole-lines))) + +(map! (:when (modulep! :lang latex) ; local conditional + (:map LaTeX-mode-map + :localleader ; Use local leader + :desc "View" "v" #'TeX-view)) ; Add which-key description + :leader ; Use leader key from now on + :desc "Eval expression" ";" #'eval-expression) +#+end_src + +These are side-by-side comparisons, showing how to bind keys with and without +~map!~: + +#+begin_src emacs-lisp :eval no +;; bind a global key +(global-set-key (kbd "C-x y") #'do-something) +(map! "C-x y" #'do-something) + +;; bind a key on a keymap +(define-key emacs-lisp-mode-map (kbd "C-c p") #'do-something) +(map! :map emacs-lisp-mode-map "C-c p" #'do-something) + +;; unbind a key defined elsewhere +(define-key lua-mode-map (kbd "SPC m b") nil) +(map! :map lua-mode-map "SPC m b" nil) + +;; bind multiple keys +(global-set-key (kbd "C-x x") #'do-something) +(global-set-key (kbd "C-x y") #'do-something-else) +(global-set-key (kbd "C-x z") #'do-another-thing) +(map! "C-x x" #'do-something + "C-x y" #'do-something-else + "C-x z" #'do-another-thing) + +;; bind global keys in normal mode +(evil-define-key* 'normal 'global + (kbd "C-x x") #'do-something + (kbd "C-x y") #'do-something-else + (kbd "C-x z") #'do-another-thing) +(map! :n "C-x x" #'do-something + :n "C-x y" #'do-something-else + :n "C-x z" #'do-another-thing) + +;; or on a deferred keymap +(evil-define-key 'normal emacs-lisp-mode-map + (kbd "C-x x") #'do-something + (kbd "C-x y") #'do-something-else + (kbd "C-x z") #'do-another-thing) +(map! :map emacs-lisp-mode-map + :n "C-x x" #'do-something + :n "C-x y" #'do-something-else + :n "C-x z" #'do-another-thing) + +;; or multiple maps +(dolist (map (list emacs-lisp-mode go-mode-map ivy-minibuffer-map)) + (evil-define-key '(normal insert) map + "a" #'a + "b" #'b + "c" #'c)) +(map! :map (emacs-lisp-mode go-mode-map ivy-minibuffer-map) + :ni "a" #'a + :ni "b" #'b + :ni "c" #'c) + +;; or in multiple states (order of states doesn't matter) +(evil-define-key* '(normal visual) emacs-lisp-mode-map (kbd "C-x x") #'do-something) +(evil-define-key* 'insert emacs-lisp-mode-map (kbd "C-x x") #'do-something-else) +(evil-define-key* '(visual normal insert emacs) emacs-lisp-mode-map (kbd "C-x z") #'do-another-thing) +(map! :map emacs-lisp-mode + :nv "C-x x" #'do-something ; normal+visual + :i "C-x y" #'do-something-else ; insert + :vnie "C-x z" #'do-another-thing) ; visual+normal+insert+emacs + +;; You can nest map! calls: +(evil-define-key* '(normal visual) emacs-lisp-mode-map (kbd "C-x x") #'do-something) +(evil-define-key* 'normal go-lisp-mode-map (kbd "C-x x") #'do-something-else) +(map! (:map emacs-lisp-mode :nv "C-x x" #'do-something) + (:map go-lisp-mode :n "C-x x" #'do-something-else)) +#+end_src + +* package! +:PROPERTIES: +:added: 3.0.0-pre +:END: +#+begin_src emacs-lisp :eval no +;; To install a package that can be found on ELPA or any of the sources +;; specified in `straight-recipe-repositories': +(package! evil) +(package! js2-mode) +(package! rainbow-delimiters) + +;; To disable a package included with Doom (which will no-op all its `after!' +;; and `use-package!' blocks): +(package! evil :disable t) +(package! rainbow-delimiters :disable t) + +;; To install a package from a github repo +(package! so-long :host 'github :repo "hlissner/emacs-so-long") + +;; If a package is particularly big and comes with submodules you don't need, +;; you can tell the package manager not to clone the repo recursively: +(package! ansible :nonrecursive t) + +;; To pin a package to a specific commit: +(package! evil :pin "e7bc39de2f9") +;; ...or branch: +(package! evil :branch "stable") +;; To unpin a pinned package: +(package! evil :pin nil) + +;; If you share your config between two computers, and don't want bin/doom +;; refresh to delete packages used only on one system, use :ignore +(package! evil :ignore (not (equal system-name "my-desktop"))) +#+end_src +* prependq! +:PROPERTIES: +:added: 3.0.0-pre +:END: +#+begin_src emacs-lisp +(let ((x '(a b c))) + (prependq! x '(c d e)) + x) +#+end_src + +#+RESULTS: +: (c d e a b c) + +#+begin_src emacs-lisp +(let ((x '(a b c)) + (y '(c d e)) + (z '(f g))) + (prependq! x y z '(h)) + x) +#+end_src + +#+RESULTS: +: (c d e f g h a b c) + +* pushnew! +:PROPERTIES: +:added: 3.0.0-pre +:END: +#+begin_src emacs-lisp +(let ((list '(a b c))) + (pushnew! list 'c 'd 'e) + list) +#+end_src + +#+RESULTS: +: (e d a b c) + +* quiet! +:PROPERTIES: +:added: 3.0.0-pre +:END: +#+begin_src emacs-lisp :eval no +;; Enters recentf-mode without extra output +(quiet! (recentf-mode +1)) +#+end_src +* remove-hook! +:PROPERTIES: +:added: 3.0.0-pre +:END: +#+begin_src emacs-lisp :eval no +;; With only one hook and one function, this is identical to `remove-hook'. In +;; that case, use that instead. +(remove-hook! 'some-mode-hook #'enable-something) + +;; Removing N functions from M hooks +(remove-hook! some-mode #'enable-something #'and-another) +(remove-hook! some-mode #'(enable-something and-another)) +(remove-hook! '(one-mode-hook second-mode-hook) #'enable-something) +(remove-hook! (one-mode second-mode) #'enable-something) + +;; Removing buffer-local hooks +(remove-hook! (one-mode second-mode) :local #'enable-something) + +;; Removing arbitrary forms (must be exactly the same as the definition) +(remove-hook! (one-mode second-mode) (setq v 5) (setq a 2)) +#+end_src +* setq! +:PROPERTIES: +:added: 3.0.0-pre +:END: +#+begin_src emacs-lisp +;; Each of these have a setter associated with them, which must be triggered in +;; order for their new values to have an effect. +(setq! evil-want-Y-yank-to-eol nil + evil-want-C-u-scroll nil + evil-want-C-d-scroll nil) +#+end_src +* setq-hook! +:PROPERTIES: +:added: 3.0.0-pre +:END: +#+begin_src emacs-lisp :eval no +;; Set multiple variables after a hook +(setq-hook! 'markdown-mode-hook + line-spacing 2 + fill-column 80) + +;; Set variables after multiple hooks +(setq-hook! '(eshell-mode-hook term-mode-hook) + hscroll-margin 0) +#+end_src + +* unsetq-hook! +:PROPERTIES: +:added: 3.0.0-pre +:END: +#+begin_src emacs-lisp :eval no +(unsetq-hook! 'markdown-mode-hook line-spacing) + +;; Removes the following variable hook +(setq-hook! 'markdown-mode-hook line-spacing 2) + +;; Removing N variables from M hooks +(unsetq-hook! some-mode enable-something and-another) +(unsetq-hook! some-mode (enable-something and-another)) +(unsetq-hook! '(one-mode-hook second-mode-hook) enable-something) +(unsetq-hook! (one-mode second-mode) enable-something) +#+end_src +* use-package! +:PROPERTIES: +:added: 3.0.0-pre +:END: +#+begin_src emacs-lisp :eval no +;; Use after-call to load package before hook +(use-package! projectile + :after-call (pre-command-hook after-find-file dired-before-readin-hook)) + +;; defer recentf packages one by one +(use-package! recentf + :defer-incrementally easymenu tree-widget timer + :after-call after-find-file) + +;; This is equivalent to :defer-incrementally (abc) +(use-package! abc + :defer-incrementally t) +#+end_src + +* versionp! +:PROPERTIES: +:added: 3.0.0-pre +:END: +#+begin_src emacs-lisp +(versionp! "25.3" > "27.1") +#+end_src + +#+RESULTS: +: nil + +#+begin_src emacs-lisp +(versionp! "28.0" <= emacs-version <= "28.1") +#+end_src + +#+RESULTS: +: t diff --git a/modules/lang/emacs-lisp/autoload.el b/modules/lang/emacs-lisp/autoload.el index a9cbffc48..8076a5cb2 100644 --- a/modules/lang/emacs-lisp/autoload.el +++ b/modules/lang/emacs-lisp/autoload.el @@ -469,31 +469,6 @@ library/userland functions" ;; ;;; Advice -;;;###autoload -(defun +emacs-lisp--add-doom-elisp-demos-a (fn symbol) - "Add Doom's own demos to `elisp-demos'. - -Intended as :around advice for `elisp-demos--search'." - (let ((org-inhibit-startup t) - enable-dir-local-variables - org-mode-hook) - (or (funcall fn symbol) - (with-file-contents! (doom-path doom-docs-dir "examples.org") - (save-excursion - (when (re-search-forward - (format "^\\*+[ \t]+\\(?:TODO \\)?%s$" - (regexp-quote (symbol-name symbol))) - nil t) - (forward-line 1) - (let ((demos - (string-trim - (buffer-substring-no-properties - (point) (if (re-search-forward "^\\*+ " nil t) - (line-beginning-position) - (point-max)))))) - (unless (string-blank-p demos) - demos)))))))) - ;;;###autoload (put 'map! 'indent-plists-as-data t) ;;;###autoload (defun +emacs-lisp--calculate-lisp-indent-a (&optional parse-start) diff --git a/modules/lang/emacs-lisp/config.el b/modules/lang/emacs-lisp/config.el index 3cabce3b6..4d8ff38f5 100644 --- a/modules/lang/emacs-lisp/config.el +++ b/modules/lang/emacs-lisp/config.el @@ -217,7 +217,26 @@ See `+emacs-lisp-non-package-mode' for details.") (advice-add #'describe-function-1 :after #'elisp-demos-advice-describe-function-1) (advice-add #'helpful-update :after #'elisp-demos-advice-helpful-update) :config - (advice-add #'elisp-demos--search :around #'+emacs-lisp--add-doom-elisp-demos-a)) + ;; Add Doom's core and module demo files, so additional demos can be specified + ;; by end-users (in $DOOMDIR/demos.org), by modules (modules/X/Y/demos.org), + ;; or Doom's core (lisp/demos.org). + (dolist (file (doom-module-locate-paths (doom-module-list) "demos.org")) + (add-to-list 'elisp-demos-user-files file)) + + ;; HACK: These functions open Org files non-interactively without any + ;; performance optimizations. Given how prone org-mode is to being tied to + ;; expensive functionality, this will often introduce unexpected freezes + ;; without this advice. + ;; TODO: PR upstream? + (defadvice! +emacs-lisp--optimize-org-init-a (fn &rest args) + "Disable unrelated functionality to optimize calls to `org-mode'." + :around #'elisp-demos--export-json-file + :around #'elisp-demos--symbols + :around #'elisp-demos--syntax-highlight + (let ((org-inhibit-startup t) + enable-dir-local-variables + org-mode-hook) + (apply fn args)))) (use-package! buttercup From 4c89262a6b51d391f6e57f510d30845b06aca42b Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Sat, 3 Feb 2024 17:05:52 -0500 Subject: [PATCH 13/49] nit(emacs-lisp): reformat/revise comments --- modules/lang/emacs-lisp/config.el | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/lang/emacs-lisp/config.el b/modules/lang/emacs-lisp/config.el index 4d8ff38f5..a07ae55e3 100644 --- a/modules/lang/emacs-lisp/config.el +++ b/modules/lang/emacs-lisp/config.el @@ -76,10 +76,10 @@ See `+emacs-lisp-non-package-mode' for details.") face warning mouse-face mode-line-highlight))))) - ;; Fixed indenter that intends plists sensibly. + ;; Introduces logic to improve plist indentation in emacs-lisp-mode. (advice-add #'calculate-lisp-indent :override #'+emacs-lisp--calculate-lisp-indent-a) - ;; variable-width indentation is superior in elisp. Otherwise, `dtrt-indent' + ;; Variable-width indentation is superior in elisp. Otherwise, `dtrt-indent' ;; and `editorconfig' would force fixed indentation on elisp. (add-to-list 'doom-detect-indentation-excluded-modes 'emacs-lisp-mode) @@ -96,10 +96,10 @@ See `+emacs-lisp-non-package-mode' for details.") #'+emacs-lisp-init-straight-maybe-h) ;; UX: Both Flycheck's and Flymake's two emacs-lisp checkers produce a *lot* - ;; of false positives in non-packages (like Emacs configs or elisp - ;; scripts), so I disable `checkdoc' (`emacs-lisp-checkdoc', - ;; `elisp-flymake-checkdoc') and set `byte-compile-warnings' to a subset - ;; that makes more sense (see `+emacs-lisp-linter-warnings') + ;; of false positives in non-packages (like Emacs configs or elisp scripts), + ;; so I disable `checkdoc' (`emacs-lisp-checkdoc', `elisp-flymake-checkdoc') + ;; and set `byte-compile-warnings' to a subset that makes more sense (see + ;; `+emacs-lisp-linter-warnings') (add-hook! '(flycheck-mode-hook flymake-mode-hook) #'+emacs-lisp-non-package-mode) (defadvice! +syntax--fix-elisp-flymake-load-path (orig-fn &rest args) From 66d70c38a6c567ca06c26de46a68500b9f6e29fc Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Sun, 4 Feb 2024 17:48:04 -0500 Subject: [PATCH 14/49] docs: bump supported Emacs version to 29.2 --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 9a01c856d..40f5211b8 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ [Install](#install) • [Documentation] • [FAQ] • [Screenshots] • [Contribute](#contribute) ![Made with Doom Emacs](https://img.shields.io/github/tag/doomemacs/doomemacs.svg?style=flat-square&label=release&color=58839b) -![Supports Emacs 27.1–29.1](https://img.shields.io/badge/Supports-Emacs_27.1–29.1-blueviolet.svg?style=flat-square&logo=GNU%20Emacs&logoColor=white) +![Supports Emacs 27.1–29.2](https://img.shields.io/badge/Supports-Emacs_27.1–29.2-blueviolet.svg?style=flat-square&logo=GNU%20Emacs&logoColor=white) ![Latest commit](https://img.shields.io/github/last-commit/doomemacs/doomemacs/master?style=flat-square) ![Build status: master](https://img.shields.io/github/workflow/status/doomemacs/doomemacs/CI/master?style=flat-square) [![Discord Server](https://img.shields.io/discord/406534637242810369?color=738adb&label=Discord&logo=discord&logoColor=white&style=flat-square)][Discord] @@ -99,7 +99,7 @@ Check out [the FAQ][FAQ] for answers to common questions about the project. # Prerequisites - Git 2.23+ -- Emacs 27.1–29.1 (**Recommended: 29.1 + +- Emacs 27.1–29.2 (**Recommended: 29.2 + [native-comp](https://www.emacswiki.org/emacs/GccEmacs)**) - [ripgrep] 11.0+ - GNU `find` From b4f39e53698eaeb43a4277a057db91e418b0c590 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Sun, 4 Feb 2024 17:55:07 -0500 Subject: [PATCH 15/49] nit: doom-modules: reformat & declare obsolete variables defs --- lisp/doom-modules.el | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/lisp/doom-modules.el b/lisp/doom-modules.el index 0d0c5fd9b..cf9ebe471 100644 --- a/lisp/doom-modules.el +++ b/lisp/doom-modules.el @@ -8,6 +8,7 @@ (defvar doom-modules (make-hash-table :test 'equal) "A hash table of enabled modules. Set by `doom-initialize-modules'.") +(define-obsolete-variable-alias 'doom-modules-dirs 'doom-module-load-path "3.0.0") (defvar doom-module-load-path (list (file-name-concat doom-user-dir "modules") (file-name-concat doom-emacs-dir "modules")) @@ -49,12 +50,8 @@ NOT IMPLEMENTED YET. This file contains a module's metadata: their version, maintainers, checks, features, submodules, debug information, etc. And are used to locate modules in the user's file tree.") - -;; -;;; Obsolete variables - -(define-obsolete-variable-alias 'doom-modules-dirs 'doom-module-load-path "3.0.0") - +;; DEPRECATED: Module warnings will be rewritten in v3, and this variable will no longer be needed. +(make-obsolete-variable 'doom-obsolete-modules nil "3.0.0") (defconst doom-obsolete-modules '((:feature (version-control (:emacs vc) (:ui vc-gutter)) (spellcheck (:checkers spell)) @@ -97,6 +94,7 @@ syntax-checker modules obsolete. e.g. If :feature version-control is found in your `doom!' block, a warning is emitted before replacing it with :emacs vc and :ui vc-gutter.") +(make-obsolete-variable 'doom-inhibit-module-warnings nil "3.0.0") (defvar doom-inhibit-module-warnings (not noninteractive) "If non-nil, don't emit deprecated or missing module warnings at startup.") From 51dcb4dc997aca2d754d2df9b81e40ba1ae3f029 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Sun, 4 Feb 2024 17:59:31 -0500 Subject: [PATCH 16/49] nit: fix s/make/bake typo --- lisp/doom-profiles.el | 2 +- lisp/doom.el | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lisp/doom-profiles.el b/lisp/doom-profiles.el index f60531174..668eccb24 100644 --- a/lisp/doom-profiles.el +++ b/lisp/doom-profiles.el @@ -343,7 +343,7 @@ Defaults to the profile at `doom-profile-default'." ";; This file was autogenerated; do not edit it by hand!\n") ;; Doom needs to be synced/rebuilt if either Doom or Emacs has been ;; up/downgraded. This is because byte-code isn't backwards - ;; compatible, and many packages (including Doom), make in absolute + ;; compatible, and many packages (including Doom), bake in absolute ;; paths into their caches that need to be refreshed. (prin1 `(unless (equal doom-version ,doom-version) (error ,(concat diff --git a/lisp/doom.el b/lisp/doom.el index d6812e6f2..5f9835224 100644 --- a/lisp/doom.el +++ b/lisp/doom.el @@ -99,7 +99,7 @@ ;; Doom needs to be synced/rebuilt if either Doom or Emacs has been ;; up/downgraded. This is because byte-code isn't backwards compatible, and many -;; packages (including Doom), make in absolute paths into their caches that need +;; packages (including Doom), bake in absolute paths into their caches that need ;; to be refreshed. (let ((old-version (eval-when-compile emacs-version))) (unless (equal emacs-version old-version) From 7654262cdca57e6cddcf1d5c6acb9381ddbd3bc6 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Sun, 4 Feb 2024 18:00:16 -0500 Subject: [PATCH 17/49] tweak(lib): doom-info: show $EMACS/$EMACSDIR --- lisp/lib/debug.el | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lisp/lib/debug.el b/lisp/lib/debug.el index 2ee08c149..d43d593f7 100644 --- a/lisp/lib/debug.el +++ b/lisp/lib/debug.el @@ -260,7 +260,8 @@ ready to be pasted in a bug report on github." (bound-and-true-p emacs-repository-branch) (and (stringp emacs-repository-version) (substring emacs-repository-version 0 9)) - (symlink-path doom-emacs-dir)))) + (format "EMACSDIR=%s" (symlink-path doom-emacs-dir)) + (format "EMACS=%s" (expand-file-name invocation-name invocation-directory))))) (doom . ,(list doom-version (if doom-profile (format "PROFILE=%s@%s" From e0c9ef6ad681548d27943f0a1b98cd790b347e16 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Sun, 4 Feb 2024 18:50:33 -0500 Subject: [PATCH 18/49] bump: :lang ocaml OCamlPro/ocp-indent@7c4d434132ce -> OCamlPro/ocp-indent@f38578c25d62 diml/utop@ace481388a54 -> diml/utop@8cc563282597 ocaml-ppx/ocamlformat@1ad4bdba9e1f -> ocaml-ppx/ocamlformat@7db948a8946e ocaml/dune@f5a5a9c17be6 -> ocaml/dune@360b00027166 ocaml/merlin@306af713e268 -> ocaml/merlin@8404f9669372 ocaml/tuareg@53ce2fdfdd37 -> ocaml/tuareg@1d53723e39f2 Fix: #7412 --- modules/lang/ocaml/packages.el | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/modules/lang/ocaml/packages.el b/modules/lang/ocaml/packages.el index b24f1fc9b..dfc50c3e8 100644 --- a/modules/lang/ocaml/packages.el +++ b/modules/lang/ocaml/packages.el @@ -1,26 +1,26 @@ ;; -*- no-byte-compile: t; -*- ;;; lang/ocaml/packages.el -(package! tuareg :pin "53ce2fdfdd372d52f3a6547c33b687e7d403357a") +(package! tuareg :pin "1d53723e39f22ab4ab76d31f2b188a2879305092") (unless (modulep! +lsp) - (package! merlin :pin "306af713e268d810ea0dc80bdf8e98265f96bd51") + (package! merlin :pin "8404f96693727f7b0edc0d0b14db57843d79e27b") (package! merlin-eldoc :pin "bf8edc63d85b35e4def352fa7ce4ea39f43e1fd8") - (package! merlin-company :pin "306af713e268d810ea0dc80bdf8e98265f96bd51") + (package! merlin-company :pin "8404f96693727f7b0edc0d0b14db57843d79e27b") (when (and (modulep! :checkers syntax) (not (modulep! :checkers syntax +flymake))) (package! flycheck-ocaml :pin "77f8ddbd9bfc3a11957ac7ec7e45d5fa9179b192"))) -(package! ocp-indent :pin "7c4d434132cebc15a8213c8be9e7323692eb0a2b") +(package! ocp-indent :pin "f38578c25d62701847b1bcb45099a9020e2032fe") (when (modulep! :tools eval) - (package! utop :pin "ace481388a54fdf89244a76497fbdedb4ff15207")) + (package! utop :pin "8cc563282597abdb8f5cca64df41166c5ebca6b5")) (when (modulep! :editor format) (package! ocamlformat :recipe (:host github :repo "ocaml-ppx/ocamlformat" :files ("emacs/*.el")) - :pin "1ad4bdba9e1fd4a0bd73e22f75b3079c70cdba53")) + :pin "7db948a8946e589edd11334dda56505f8d826dca")) (package! dune :recipe (:host github :repo "ocaml/dune" :files ("editor-integration/emacs/*.el")) - :pin "f5a5a9c17be60b1cf2ec22fee35d35ccc3bb5e5e") + :pin "360b00027166473a01a9010a04fc30af3ee883a0") From be48f3588b26aa92d7c0b9b8da30f8443a3857c3 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Sun, 4 Feb 2024 18:52:46 -0500 Subject: [PATCH 19/49] bump: :lang org alf/ob-restclient.el@1a127eb0165f -> alf/ob-restclient.el@8183f8af0883 bastibe/org-journal@a306f76ee2b0 -> bastibe/org-journal@605a7eb984a9 emacs-jupyter/jupyter@0a92c0c978ab -> emacs-jupyter/jupyter@da306a6dbda6 emacs-straight/org-mode@57b94f3447b9 -> emacs-straight/org-mode@7a6bb0904d01 emacsmirror/org-contrib@79286861ae3f -> emacsmirror/org-contrib@8fbaceb247a7 emacsorphanage/ox-pandoc@0f758517f512 -> emacsorphanage/ox-pandoc@399d787b6e21 hakimel/reveal.js@d5896c968b24 -> hakimel/reveal.js@16f663301467 magit/orgit-forge@f595a30aa75a -> magit/orgit-forge@f2ff9e5ad68b magit/orgit@b60efabc4a1b -> magit/orgit@84bcb5c318f0 oer/org-re-reveal@e7895dae9807 -> oer/org-re-reveal@7c39d15b841c org-noter/org-noter@a4296d8338d4 -> org-noter/org-noter@8be376384772 org-roam/org-roam@5c06471c3a11 -> org-roam/org-roam@8667e441876c Fix: #7392 --- modules/lang/org/packages.el | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/modules/lang/org/packages.el b/modules/lang/org/packages.el index e91a6defd..ce2e1d785 100644 --- a/modules/lang/org/packages.el +++ b/modules/lang/org/packages.el @@ -31,11 +31,11 @@ (format "(defun org-git-version (&rest _) \"%s-??-%s\")\n" version (cdr (doom-call-process "git" "rev-parse" "--short" "HEAD"))) "(provide 'org-version)\n"))))) - :pin "57b94f3447b9046dac2f9238e24ad902510056cc") + :pin "7a6bb0904d01b50680f9028f7c0f3cfc6ae3aa6e") (package! org-contrib :recipe (:host github :repo "emacsmirror/org-contrib") - :pin "79286861ae3f4a47fbc66ce97cd527196f60c4a8") + :pin "8fbaceb247a775ad1534af97859c740e82cc955a") (package! avy) (package! htmlize :pin "dd27bc3f26efd728f2b1f01f9e4ac4f61f2ffbf9") @@ -71,9 +71,9 @@ (when (modulep! :tools pdf) (package! org-pdftools :pin "4e420233a153a9c4ab3d1a7e1d7d3211c836f0ac")) (when (modulep! :tools magit) - (package! orgit :pin "b60efabc4a1b15d7eacaabc5bdfe6f3c20fee161") + (package! orgit :pin "84bcb5c318f01b9ffc8d5aa18a7c393fe9c714b2") (when (modulep! :tools magit +forge) - (package! orgit-forge :pin "f595a30aa75af55522b1203cd29198fb9aa3a0a5"))) + (package! orgit-forge :pin "f2ff9e5ad68b3e860379a1d368ad6d8a9696b719"))) (when (modulep! +brain) (package! org-brain :pin "2bad7732aae1a3051e2a14de2e30f970bbe43c25")) (when (modulep! +dragndrop) @@ -84,11 +84,11 @@ (when (modulep! +ipython) ; DEPRECATED (package! ob-ipython :pin "7147455230841744fb5b95dcbe03320313a77124")) (when (modulep! +jupyter) - (package! jupyter :pin "0a92c0c978ab12bd31a50a7e8b1295f5d1767e20")) + (package! jupyter :pin "da306a6dbda6f1e285281765a311938a1d9db022")) (when (modulep! +journal) - (package! org-journal :pin "a306f76ee2b0292946a20530bd9114aefc85a263")) + (package! org-journal :pin "605a7eb984a95fc6ec122df800632bf56ff59514")) (when (modulep! +noter) - (package! org-noter :pin "a4296d8338d46b5c863d3d339b50e201172f218c")) + (package! org-noter :pin "8be376384772c1f053cb2ce907ddf4d484b390dd")) (when (modulep! +pomodoro) (package! org-pomodoro :pin "3f5bcfb80d61556d35fc29e5ddb09750df962cc6")) (when (modulep! +pretty) @@ -100,11 +100,11 @@ :recipe (:host github :repo "anler/centered-window-mode") :pin "80965f6c6afe8d918481433984b493de72af5399") (package! org-tree-slide :pin "e2599a106a26ce5511095e23df4ea04be6687a8a") - (package! org-re-reveal :pin "e7895dae9807df38b6e17b6c24e1e824caad6c46") + (package! org-re-reveal :pin "7c39d15b841c7a8d197a24c89e5fef5d54e271aa") (package! revealjs :recipe (:host github :repo "hakimel/reveal.js" :files ("css" "dist" "js" "plugin")) - :pin "d5896c968b2406126ca0beafecdffe219230b6b4")) + :pin "16f6633014672567de85aefd1f4639ffea0dde56")) (cond ((modulep! +roam) (package! org-roam @@ -115,7 +115,7 @@ ;; FIXME A :recipe isn't strictly necessary, but without it, our package ;; bumper fails to distinguish between org-roam v1 and v2. :recipe (:host github :repo "org-roam/org-roam") - :pin "5c06471c3a11348342719fd9011486455adeb701"))) + :pin "8667e441876cd2583fbf7282a65796ea149f0e5f"))) ;;; Babel (package! ob-async :pin "9aac486073f5c356ada20e716571be33a350a982") @@ -152,13 +152,13 @@ :recipe (:host github :repo "DEADB17/ob-racket") :pin "d8fd51bddb019b0eb68755255f88fc800cfe03cb")) (when (modulep! :lang rest) - (package! ob-restclient :pin "1a127eb0165f10bb9d33606aa8529051118805e7")) + (package! ob-restclient :pin "8183f8af08838854cf145ca4855b373f3e7c44b0")) (when (modulep! :lang scala) (package! ob-ammonite :pin "39937dff395e70aff76a4224fa49cf2ec6c57cca")) ;;; Export (when (modulep! +pandoc) - (package! ox-pandoc :pin "0f758517f512e375825679541b5d905be40342eb")) + (package! ox-pandoc :pin "399d787b6e2124bd782615338b845c3724a47718")) (when (modulep! +hugo) (package! ox-hugo :recipe (:host github :repo "kaushalmodi/ox-hugo" :nonrecursive t) From 615a77fafcd5ca85c117cc7c91ea4f9a23c3739c Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Sun, 4 Feb 2024 18:54:21 -0500 Subject: [PATCH 20/49] bump: :config magnars/expand-region.el@b70feaa64431 -> magnars/expand-region.el@e8f4e0fe9c9a noctuid/link-hint.el@36ce929331f2 -> noctuid/link-hint.el@9153eafc7765 --- modules/config/default/packages.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/config/default/packages.el b/modules/config/default/packages.el index 10310fd9d..99bdda060 100644 --- a/modules/config/default/packages.el +++ b/modules/config/default/packages.el @@ -3,7 +3,7 @@ (package! avy :pin "be612110cb116a38b8603df367942e2bb3d9bdbe") (package! drag-stuff :pin "6d06d846cd37c052d79acd0f372c13006aa7e7c8") -(package! link-hint :pin "36ce929331f2838213bcaa1145ece4b73ce84afe") +(package! link-hint :pin "9153eafc776549376bb85d9ff555fef83aca8285") (unless (modulep! :editor evil) - (package! expand-region :pin "b70feaa644310dc2d599dc277cd20a1f2b6446ac")) + (package! expand-region :pin "e8f4e0fe9c9a80a6a26e2b438502aba9a799d580")) From 210a5d416209d4f4a0866786935775c66d3e8a23 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Sun, 4 Feb 2024 18:58:53 -0500 Subject: [PATCH 21/49] bump: :ui Alexander-Miller/treemacs@56691a530abb -> Alexander-Miller/treemacs@df26b6ab9a0f Bad-ptr/persp-mode.el@df95ea710e2a -> Bad-ptr/persp-mode.el@345baaa520ab dgutov/diff-hl@b5651f1c57b4 -> dgutov/diff-hl@b8b2727a72fd edkolev/evil-goggles@0070c9d8447e -> edkolev/evil-goggles@34ca276a85f6 emacs-lsp/lsp-treemacs@e66ae2196503 -> emacs-lsp/lsp-treemacs@e54e74deb815 emacsorphanage/anzu@5abb37455ea4 -> emacsorphanage/anzu@26fb50b429ee joostkremers/writeroom-mode@1fd52848eb58 -> joostkremers/writeroom-mode@f4d035e91d20 mickeynp/ligature.el@0e5d0a855462 -> mickeynp/ligature.el@6ac1634612db rolandwalker/unicode-fonts@44d0a22420c3 -> rolandwalker/unicode-fonts@6245b97d8dda tarsius/hl-todo@70ce48470c85 -> tarsius/hl-todo@f1fef158f99a --- modules/ui/hl-todo/packages.el | 2 +- modules/ui/ligatures/packages.el | 2 +- modules/ui/modeline/packages.el | 2 +- modules/ui/ophints/packages.el | 2 +- modules/ui/treemacs/packages.el | 4 ++-- modules/ui/unicode/packages.el | 2 +- modules/ui/vc-gutter/packages.el | 2 +- modules/ui/workspaces/packages.el | 2 +- modules/ui/zen/packages.el | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/modules/ui/hl-todo/packages.el b/modules/ui/hl-todo/packages.el index c0f5daa24..36d220441 100644 --- a/modules/ui/hl-todo/packages.el +++ b/modules/ui/hl-todo/packages.el @@ -1,4 +1,4 @@ ;; -*- no-byte-compile: t; -*- ;;; ui/hl-todo/packages.el -(package! hl-todo :pin "70ce48470c85f1441de2c9428a240c3287995846") +(package! hl-todo :pin "f1fef158f99a70746926ef52c59f4863a29b7ed7") diff --git a/modules/ui/ligatures/packages.el b/modules/ui/ligatures/packages.el index 813e08649..c14ec65da 100644 --- a/modules/ui/ligatures/packages.el +++ b/modules/ui/ligatures/packages.el @@ -2,4 +2,4 @@ (string-match-p "HARFBUZZ" system-configuration-features)) (featurep 'composite)) (package! ligature - :pin "0e5d0a8554622bcb0ec634e364795650ff4f2457")) + :pin "6ac1634612dbd42f7eb81ecaf022bd239aabb954")) diff --git a/modules/ui/modeline/packages.el b/modules/ui/modeline/packages.el index c95d740be..8bdce9b70 100644 --- a/modules/ui/modeline/packages.el +++ b/modules/ui/modeline/packages.el @@ -3,6 +3,6 @@ (unless (modulep! +light) (package! doom-modeline :pin "bf880ae56f3f6aab7bd334de9bd9b455c63a24c0")) -(package! anzu :pin "5abb37455ea44fa401d5f4c1bdc58adb2448db67") +(package! anzu :pin "26fb50b429ee968eb944b0615dd0aed1dd66172c") (when (modulep! :editor evil) (package! evil-anzu :pin "d1e98ee6976437164627542909a25c6946497899")) diff --git a/modules/ui/ophints/packages.el b/modules/ui/ophints/packages.el index 67f3bc377..ccd75d1da 100644 --- a/modules/ui/ophints/packages.el +++ b/modules/ui/ophints/packages.el @@ -2,5 +2,5 @@ ;;; ui/ophints/packages.el (if (modulep! :editor evil) - (package! evil-goggles :pin "0070c9d8447e1696f8713d0c13ff64ef0979d580") + (package! evil-goggles :pin "34ca276a85f615d2b45e714c9f8b5875bcb676f3") (package! volatile-highlights :pin "fcf6e2778454ce514c189a7d1fe70e03ad81c325")) diff --git a/modules/ui/treemacs/packages.el b/modules/ui/treemacs/packages.el index 97c87198d..59c5fbdea 100644 --- a/modules/ui/treemacs/packages.el +++ b/modules/ui/treemacs/packages.el @@ -1,7 +1,7 @@ ;; -*- no-byte-compile: t; -*- ;;; ui/treemacs/packages.el -(package! treemacs :pin "56691a530abb61564c8df0456a18ff0f301c2055") +(package! treemacs :pin "df26b6ab9a0f467e5ff99f7ed97551ccf756e06c") (package! treemacs-nerd-icons :pin "9876cb478145a0ec4e36f64ff6583f3de7126216") ;; These packages have no :pin because they're in the same repo (when (modulep! :editor evil +everywhere) @@ -13,4 +13,4 @@ (package! treemacs-persp)) (when (and (modulep! +lsp) (not (modulep! :tools lsp +eglot))) - (package! lsp-treemacs :pin "e66ae2196503d4e84334519e56b4388feffa5060")) + (package! lsp-treemacs :pin "e54e74deb8150964e3c3024e1ec14295a34e2a3b")) diff --git a/modules/ui/unicode/packages.el b/modules/ui/unicode/packages.el index f8ad47ea6..29d8b16b5 100644 --- a/modules/ui/unicode/packages.el +++ b/modules/ui/unicode/packages.el @@ -1,4 +1,4 @@ ;; -*- no-byte-compile: t; -*- ;;; ui/unicode/packages.el -(package! unicode-fonts :pin "44d0a22420c39709d1e1fa659a3f135facf3c986") +(package! unicode-fonts :pin "6245b97d8ddaeaf1de4dbe2cd85ca0f3b20ef81b") diff --git a/modules/ui/vc-gutter/packages.el b/modules/ui/vc-gutter/packages.el index 8bcf90ecf..2651562a6 100644 --- a/modules/ui/vc-gutter/packages.el +++ b/modules/ui/vc-gutter/packages.el @@ -2,5 +2,5 @@ ;;; ui/vc-gutter/packages.el (if (modulep! +diff-hl) - (package! diff-hl :pin "b5651f1c57b42e0f38e01a8fc8c7df9bc76d5d38") + (package! diff-hl :pin "b8b2727a72fdf64ac98e6cfa136a43cb0cacf72f") (package! git-gutter-fringe :pin "648cb5b57faec55711803cdc9434e55a733c3eba")) diff --git a/modules/ui/workspaces/packages.el b/modules/ui/workspaces/packages.el index 9440eae48..8ed2e3c33 100644 --- a/modules/ui/workspaces/packages.el +++ b/modules/ui/workspaces/packages.el @@ -1,4 +1,4 @@ ;; -*- no-byte-compile: t; -*- ;;; ui/workspaces/packages.el -(package! persp-mode :pin "df95ea710e2a72f7a88293b72137acb0ca024d90") +(package! persp-mode :pin "345baaa520ab2d62205f85cc5f29d57d6063c141") diff --git a/modules/ui/zen/packages.el b/modules/ui/zen/packages.el index f4c07b585..c743c252c 100644 --- a/modules/ui/zen/packages.el +++ b/modules/ui/zen/packages.el @@ -1,5 +1,5 @@ ;; -*- no-byte-compile: t; -*- ;;; ui/zen/packages.el -(package! writeroom-mode :pin "1fd52848eb58301c864712fd26c4ec37a938cc19") +(package! writeroom-mode :pin "f4d035e91d20bf1dd3f2857b9cc344f844979a78") (package! mixed-pitch :pin "519e05f74825abf04b7d2e0e38ec040d013a125a") From b070a801ed3d95e896cf87044223d24dfb0a7b19 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Sun, 4 Feb 2024 19:02:33 -0500 Subject: [PATCH 22/49] bump: :tools collab https://code.librehq.com/qhong/crdt.el@3ba890658d65 -> emacs-straight/crdt@4a18cd8539c8 Moved to github mirror since old source was unreliable. --- modules/tools/collab/packages.el | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/modules/tools/collab/packages.el b/modules/tools/collab/packages.el index 326af8b39..a81b7f6b0 100644 --- a/modules/tools/collab/packages.el +++ b/modules/tools/collab/packages.el @@ -1,6 +1,4 @@ ;; -*- no-byte-compile: t; -*- ;;; tools/collab/packages.el -(package! crdt - :recipe (:host nil :repo "https://code.librehq.com/qhong/crdt.el") - :pin "3ba890658d657db5d6aaedd5c2a78b6f93a5f139") +(package! crdt :pin "4a18cd8539c8f3364e3ae903580328dd8b05fa78") From 1a05e2fa6429adf3e4c0efbfda8fdee9e9279600 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Sun, 4 Feb 2024 19:07:25 -0500 Subject: [PATCH 23/49] bump: :tools NicolasPetton/pass@c721604b3bd0 -> NicolasPetton/pass@ed7031c5c33a Silex/docker.el@6997c86a24d4 -> Silex/docker.el@d5255a65b724 alphapapa/magit-todos@cadf29d1cc41 -> alphapapa/magit-todos@debb77b3589f andras-simonyi/citeproc-el@290320fc579f -> andras-simonyi/citeproc-el@c61c98b9d230 doomelpa/code-review@26f426e99221 -> doomelpa/code-review@c34ff1ee64c7 editorconfig/editorconfig-emacs@2fed9599bcfe -> editorconfig/editorconfig-emacs@4b81a5992858 emacs-citar/citar-org-roam@761eed66782f -> emacs-citar/citar-org-roam@7d67dccf8006 emacs-citar/citar@2c0547db57f2 -> emacs-citar/citar@885b86f6733f emacs-lsp/lsp-mode@02c5ba59ce3d -> emacs-lsp/lsp-mode@fb88cc6b8bca emacs-straight/eglot@f73594f58989 -> emacs-straight/eglot@cd4e45b700b1 emacs-straight/rainbow-mode@24437ec2c66a -> emacs-straight/rainbow-mode@70ed10d410ef emacs-tree-sitter/tree-sitter-langs@5eb24557f542 -> emacs-tree-sitter/tree-sitter-langs@20fbbb85735a emacsorphanage/quickrun@6f963189305e -> emacsorphanage/quickrun@248149b02610 hcl-emacs/terraform-mode@39d2fd5bfc86 -> hcl-emacs/terraform-mode@e8b57df8c2a3 jacktasia/dumb-jump@d9503c157ab8 -> jacktasia/dumb-jump@ede6a04187e7 magit/forge@ba35ffc9bafc -> magit/forge@b16b6ec4f761 magit/magit@48818355728c -> magit/magit@54d37dc14c3f meain/evil-textobj-tree-sitter@9a9edd42a2dc -> meain/evil-textobj-tree-sitter@220ceae06585 purcell/envrc@33d01388ce7f -> purcell/envrc@1385e72a7309 rejeep/prodigy.el@a3be00d3b90a -> rejeep/prodigy.el@cc68fa9d604a tmalsburg/helm-bibtex@ef07adfeda1e -> tmalsburg/helm-bibtex@bf184cc311c9 xuchunyang/osx-dictionary.el@0715e5a3ac65 -> xuchunyang/osx-dictionary.el@1f5a74f3e5d7 yoshiki/yaml-mode@3fcb36d6039b -> yoshiki/yaml-mode@5b58248ab255 zx2c4/password-store@28cec11f1dbe -> zx2c4/password-store@b5e965a838bb --- modules/tools/ansible/packages.el | 2 +- modules/tools/biblio/packages.el | 16 ++++++++-------- modules/tools/direnv/packages.el | 2 +- modules/tools/docker/packages.el | 2 +- modules/tools/editorconfig/packages.el | 2 +- modules/tools/eval/packages.el | 2 +- modules/tools/lookup/config.el | 4 ++++ modules/tools/lookup/packages.el | 4 ++-- modules/tools/lsp/packages.el | 4 ++-- modules/tools/magit/packages.el | 16 +++++++--------- modules/tools/pass/packages.el | 4 ++-- modules/tools/prodigy/packages.el | 2 +- modules/tools/rgb/packages.el | 2 +- modules/tools/terraform/packages.el | 2 +- modules/tools/tree-sitter/packages.el | 4 ++-- 15 files changed, 35 insertions(+), 33 deletions(-) diff --git a/modules/tools/ansible/packages.el b/modules/tools/ansible/packages.el index 23d38139d..a9f9837b7 100644 --- a/modules/tools/ansible/packages.el +++ b/modules/tools/ansible/packages.el @@ -4,7 +4,7 @@ (package! ansible :recipe (:nonrecursive t) :pin "d89ac0ee57742cca0f0e0a3453d9dcc521575690") (package! ansible-doc :pin "86083a7bb2ed0468ca64e52076b06441a2f8e9e0") (package! jinja2-mode :pin "03e5430a7efe1d163a16beaf3c82c5fd2c2caee1") -(package! yaml-mode :pin "3fcb36d6039bef57e2a0f6e24c51f623c0bf5fb7") +(package! yaml-mode :pin "5b58248ab255dff6cfa4c4057a191bc4446ee5b6") (when (modulep! :completion company) (package! company-ansible :pin "79dd421b161efa49fbdffad57fa40edb41f484a3")) diff --git a/modules/tools/biblio/packages.el b/modules/tools/biblio/packages.el index 7d8105bd7..d53e8a994 100644 --- a/modules/tools/biblio/packages.el +++ b/modules/tools/biblio/packages.el @@ -2,16 +2,16 @@ ;;; tools/biblio/packages.el (when (modulep! :completion ivy) - (package! bibtex-completion :pin "ef07adfeda1e25d891875cb9a11983d5e26fc36d") - (package! ivy-bibtex :pin "ef07adfeda1e25d891875cb9a11983d5e26fc36d")) + (package! bibtex-completion :pin "bf184cc311c9e1724f8b2eaf75b9e202c3aedd16") + (package! ivy-bibtex :pin "bf184cc311c9e1724f8b2eaf75b9e202c3aedd16")) (when (modulep! :completion helm) - (package! bibtex-completion :pin "ef07adfeda1e25d891875cb9a11983d5e26fc36d") - (package! helm-bibtex :pin "ef07adfeda1e25d891875cb9a11983d5e26fc36d")) + (package! bibtex-completion :pin "bf184cc311c9e1724f8b2eaf75b9e202c3aedd16") + (package! helm-bibtex :pin "bf184cc311c9e1724f8b2eaf75b9e202c3aedd16")) (when (modulep! :completion vertico) - (package! citar :pin "2c0547db57f2fb30ff071d126b256287a4e9452c") - (package! citar-embark :pin "2c0547db57f2fb30ff071d126b256287a4e9452c") + (package! citar :pin "885b86f6733fd70f42c32dd7791d3447f93db990") + (package! citar-embark :pin "885b86f6733fd70f42c32dd7791d3447f93db990") (when (modulep! :lang org +roam2) - (package! citar-org-roam :pin "761eed66782fdbb6d65749098caa42ba43e8441d"))) + (package! citar-org-roam :pin "7d67dccf80065a88cb86ce9a8274383a9e8269c1"))) (package! parsebib :pin "ace9df707108b17759c004c7387655277122d4c1") -(package! citeproc :pin "290320fc579f886255f00d7268600df7fa5cc7e8") +(package! citeproc :pin "c61c98b9d230ea28b2ca49498134803e1f8ea526") diff --git a/modules/tools/direnv/packages.el b/modules/tools/direnv/packages.el index 2b955547d..4f474b5ee 100644 --- a/modules/tools/direnv/packages.el +++ b/modules/tools/direnv/packages.el @@ -1,4 +1,4 @@ ;; -*- no-byte-compile: t; -*- ;;; tools/direnv/packages.el -(package! envrc :pin "33d01388ce7ff14cb209015ce6f0d1a5bda6eb07") +(package! envrc :pin "1385e72a730924664697a0961d43516a47a977d7") diff --git a/modules/tools/docker/packages.el b/modules/tools/docker/packages.el index 22f158c64..77f353589 100644 --- a/modules/tools/docker/packages.el +++ b/modules/tools/docker/packages.el @@ -1,7 +1,7 @@ ;; -*- no-byte-compile: t; -*- ;;; tools/docker/packages.el -(package! docker :pin "6997c86a24d440fa04035aa8c9499a52df6e655d") +(package! docker :pin "d5255a65b7240d0038cc417f301b43df05a27922") ;; tramp-container (included with Emacs 29+) replaces docker-tramp (when (< emacs-major-version 29) (package! docker-tramp :pin "19d0771db4e6b89e19c00af5806438e315779c15")) diff --git a/modules/tools/editorconfig/packages.el b/modules/tools/editorconfig/packages.el index e991a7e1e..022f9f75f 100644 --- a/modules/tools/editorconfig/packages.el +++ b/modules/tools/editorconfig/packages.el @@ -3,4 +3,4 @@ (package! editorconfig :recipe (:nonrecursive t) - :pin "2fed9599bcfea5d1aa9fb57dc9118d0f82b6c999") + :pin "4b81a5992858cbf03bcd7ed6ef31e4be0b55a7c1") diff --git a/modules/tools/eval/packages.el b/modules/tools/eval/packages.el index c03341c3d..560920a2d 100644 --- a/modules/tools/eval/packages.el +++ b/modules/tools/eval/packages.el @@ -1,6 +1,6 @@ ;; -*- no-byte-compile: t; -*- ;;; tools/eval/packages.el -(package! quickrun :pin "6f963189305e8311c8193ba774f4244eb1315f57") +(package! quickrun :pin "248149b0261051bd9eec8bdbc21c22d18d7b1b11") (when (modulep! +overlay) (package! eros :pin "a9a92bdc6be0521a6a06eb464be55ed61946639c")) diff --git a/modules/tools/lookup/config.el b/modules/tools/lookup/config.el index 3a778332a..726ad117c 100644 --- a/modules/tools/lookup/config.el +++ b/modules/tools/lookup/config.el @@ -31,6 +31,10 @@ ("MDN" "https://developer.mozilla.org/en-US/search?q=%s") ("Internet archive" "https://web.archive.org/web/*/%s") ("Sourcegraph" "https://sourcegraph.com/search?q=context:global+%s&patternType=literal")) + (when (modulep! +yandex) + '(("Yandex" "https://yandex.com/search/?text=%s") + ("Yandex images" "https://yandex.com/images/search?text=%s") + ("Yandex maps" "https://yandex.com/maps?text=%s"))) (when (modulep! :lang rust) '(("Rust Docs" "https://doc.rust-lang.org/std/?search=%s")))) "An alist that maps online resources to either: diff --git a/modules/tools/lookup/packages.el b/modules/tools/lookup/packages.el index 98cff03a9..d1abb858a 100644 --- a/modules/tools/lookup/packages.el +++ b/modules/tools/lookup/packages.el @@ -8,7 +8,7 @@ (package! helm)) ;; -(package! dumb-jump :pin "d9503c157ab88f0ed2fa1301aeb57e95ac564760") +(package! dumb-jump :pin "ede6a04187e79a29ef31d14760ac0d8d4c5f4cc5") (when (modulep! :completion ivy) (package! ivy-xref :pin "a82e8e117d2dd62c28b6a3e3d6e4cfb11c0bda38")) (when (modulep! :completion helm) @@ -26,7 +26,7 @@ (when (modulep! +dictionary) (if (featurep :system 'macos) - (package! osx-dictionary :pin "0715e5a3ac659df32a0f0fabfbbeef0228fbd9a9") + (package! osx-dictionary :pin "1f5a74f3e5d7f3c443f07433951512cd99e820a6") (package! define-word :pin "31a8c67405afa99d0e25e7c86a4ee7ef84a808fe") ;; REVIEW: This fork fixes SavchenkoValeriy/emacs-powerthesaurus#40. (package! powerthesaurus diff --git a/modules/tools/lsp/packages.el b/modules/tools/lsp/packages.el index 19fda1523..a0adf1a2d 100644 --- a/modules/tools/lsp/packages.el +++ b/modules/tools/lsp/packages.el @@ -3,13 +3,13 @@ (if (modulep! +eglot) (progn - (package! eglot :pin "f73594f58989fd2fd3bc6b2c1775c74e65a9eaa0") + (package! eglot :pin "cd4e45b700b117d360aac24d749c3c4a4be3d2e2") (when (modulep! :completion vertico) (package! consult-eglot :pin "049c6319b8a48ff66189d49592c7759f0b356596")) (when (and (modulep! :checkers syntax) (not (modulep! :checkers syntax +flymake))) (package! flycheck-eglot :pin "9ff8d0068be59b1450964b390349d75a68af21ed"))) - (package! lsp-mode :pin "02c5ba59ce3d1cede4aa689c530f16cccfb5e1d1") + (package! lsp-mode :pin "fb88cc6b8bcad4df5dd1d4e5d785adc7663e5c76") (package! lsp-ui :pin "bc58c6664577d1d79060c6b32b7ad20e70ee19d0") (when (modulep! :completion ivy) (package! lsp-ivy :pin "9ecf4dd9b1207109802bd1882aa621eb1c385106")) diff --git a/modules/tools/magit/packages.el b/modules/tools/magit/packages.el index 58654cade..a3acd6227 100644 --- a/modules/tools/magit/packages.el +++ b/modules/tools/magit/packages.el @@ -1,14 +1,12 @@ ;; -*- no-byte-compile: t; -*- ;;; tools/magit/packages.el -(when (package! magit :pin "48818355728c48d986d74dde8b1e9fba25f0fd53") +(when (package! magit :pin "54d37dc14c3f715dd0328a70bc65d63c54ee9613") (when (modulep! +forge) - (package! forge :pin "ba35ffc9bafc6457cc95633904e53e34e544543f") + (package! forge :pin "b16b6ec4f7612f5a8fc6d50133cc6189f062c183") (package! code-review - :recipe (:files ("graphql" "code-review*.el")) - :pin "26f426e99221a1f9356aabf874513e9105b68140") - ; HACK closql c3b34a6ec438 breaks code-review wandersoncferreira/code-review#245, - ; and the current forge commit (but forge does have an upstream fix), - ; pinned as a temporary measure to prevent user breakages - (package! closql :pin "0a7226331ff1f96142199915c0ac7940bac4afdd")) - (package! magit-todos :pin "cadf29d1cc410c71a0020c7f83999d9f61721b90")) + :recipe (:host github + :repo "doomelpa/code-review" + :files ("graphql" "code-review*.el")) + :pin "c34ff1ee64c7ecb654635bee4e2c147b10c66297")) + (package! magit-todos :pin "debb77b3589f2d83c8b43706edc1f8f90bf1ad91")) diff --git a/modules/tools/pass/packages.el b/modules/tools/pass/packages.el index 5e0816c15..46dbc962f 100644 --- a/modules/tools/pass/packages.el +++ b/modules/tools/pass/packages.el @@ -1,8 +1,8 @@ ;; -*- no-byte-compile: t; -*- ;;; tools/pass/packages.el -(package! pass :pin "c721604b3bd0c7ce7870f1a9fa0aa71f352a1009") -(package! password-store :pin "28cec11f1dbe6c4273d30370af45b69c9f408386") +(package! pass :pin "ed7031c5c33a384d07da2d15c9d5f854027a26a2") +(package! password-store :pin "b5e965a838bb68c1227caa2cdd874ba496f10149") (package! password-store-otp :pin "be3a00a981921ed1b2f78012944dc25eb5a0beca") (when (modulep! :completion ivy) diff --git a/modules/tools/prodigy/packages.el b/modules/tools/prodigy/packages.el index 2f86f6f26..d8e0b7d5c 100644 --- a/modules/tools/prodigy/packages.el +++ b/modules/tools/prodigy/packages.el @@ -1,4 +1,4 @@ ;; -*- no-byte-compile: t; -*- ;;; tools/prodigy/packages.el -(package! prodigy :pin "a3be00d3b90a77118c2d7d9f5a2f26151091fa07") +(package! prodigy :pin "cc68fa9d604a0739a63247237a801b03a184aca6") diff --git a/modules/tools/rgb/packages.el b/modules/tools/rgb/packages.el index 587095dc8..ef8a2dbf4 100644 --- a/modules/tools/rgb/packages.el +++ b/modules/tools/rgb/packages.el @@ -1,5 +1,5 @@ ;; -*- no-byte-compile: t; -*- ;;; tools/rgb/packages.el -(package! rainbow-mode :pin "24437ec2c66a889643c5c5b3fbd27c239a68976c") +(package! rainbow-mode :pin "70ed10d410ef00c82c49b2ba41647930626d6218") (package! kurecolor :pin "fbf98e1e384dd11bbb5764ae54b36353f0691d1e") diff --git a/modules/tools/terraform/packages.el b/modules/tools/terraform/packages.el index 8283ef173..8409d4229 100644 --- a/modules/tools/terraform/packages.el +++ b/modules/tools/terraform/packages.el @@ -1,6 +1,6 @@ ;; -*- no-byte-compile: t; -*- ;;; tools/terraform/packages.el -(package! terraform-mode :pin "39d2fd5bfc86c6bf1c7bc38e6f0016d714f2d79d") +(package! terraform-mode :pin "e8b57df8c2a3d3171f3768f60eb84067f553289c") (when (modulep! :completion company) (package! company-terraform :pin "8d5a16d1bbeeb18ca49a8fd57b5d8cd30c8b8dc7")) diff --git a/modules/tools/tree-sitter/packages.el b/modules/tools/tree-sitter/packages.el index 6be4f7141..db244eba5 100644 --- a/modules/tools/tree-sitter/packages.el +++ b/modules/tools/tree-sitter/packages.el @@ -2,9 +2,9 @@ ;;; tools/tree-sitter/packages.el (package! tree-sitter :pin "3cfab8a0e945db9b3df84437f27945746a43cc71") -(package! tree-sitter-langs :pin "5eb24557f542d5fa18e7baaf07969cf7f297bfcd") +(package! tree-sitter-langs :pin "20fbbb85735a9196ba3e7fb33f99b3a904b363ba") (package! tree-sitter-indent :pin "4ef246db3e4ff99f672fe5e4b416c890f885c09e") (when (modulep! :editor evil +everywhere) (package! evil-textobj-tree-sitter - :pin "9a9edd42a2dca9dfd0bc6026d47f689fa117b90f")) + :pin "220ceae065852ef4f717fa41efd1ab51ca2346d3")) From 53998a024965ddb328e9deea38c1e4089a1e5bb2 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Sun, 4 Feb 2024 19:11:29 -0500 Subject: [PATCH 24/49] module: remove :tools gist This module had been deprecated for some years, because it's central package (gist.el) has been non-functional and unmaintained for years. This will later be replaced with a more general module (powered by webpaste.el or similar) for interacting with pastebin services (including gist). --- modules/tools/gist/README.org | 55 ----------------------------- modules/tools/gist/autoload/evil.el | 19 ---------- modules/tools/gist/config.el | 31 ---------------- modules/tools/gist/packages.el | 4 --- templates/init.example.el | 1 - 5 files changed, 110 deletions(-) delete mode 100644 modules/tools/gist/README.org delete mode 100644 modules/tools/gist/autoload/evil.el delete mode 100644 modules/tools/gist/config.el delete mode 100644 modules/tools/gist/packages.el diff --git a/modules/tools/gist/README.org b/modules/tools/gist/README.org deleted file mode 100644 index c2f09021a..000000000 --- a/modules/tools/gist/README.org +++ /dev/null @@ -1,55 +0,0 @@ -#+title: :tools gist -#+subtitle: A pastebin for Githubsters -#+created: May 07, 2017 -#+since: 2.0.3 - -#+begin_quote -  *This module is deprecated.* gist.el has been abandoned and is generally - buggy. This may be replaced by a more general pastebin module that - interfaces with various pastebin servers. -#+end_quote - -* Description :unfold: -Adds the ability to manage, pull from, or push to your [[https://gist.github.com][Gists]] from within Emacs. - -** Maintainers -/This module has no dedicated maintainers./ [[doom-contrib-maintainer:][Become a maintainer?]] - -** Module flags -/This module has no flags./ - -** Packages -- [[doom-package:gist]] - -** Hacks -/No hacks documented for this module./ - -** TODO Changelog -# This section will be machine generated. Don't edit it by hand. -/This module does not have a changelog yet./ - -* Installation -[[id:01cffea4-3329-45e2-a892-95a384ab2338][Enable this module in your ~doom!~ block.]] - -/This module has no external requirements./ - -* TODO Usage -#+begin_quote - 󱌣 This module has no usage documentation yet. [[doom-contrib-module:][Write some?]] -#+end_quote - -* TODO Configuration -#+begin_quote - 󱌣 This module has no configuration documentation yet. [[doom-contrib-module:][Write some?]] -#+end_quote - -* Troubleshooting -/There are no known problems with this module./ [[doom-report:][Report one?]] - -* Frequently asked questions -/This module has no FAQs yet./ [[doom-suggest-faq:][Ask one?]] - -* TODO Appendix -#+begin_quote - 󱌣 This module has no appendix yet. [[doom-contrib-module:][Write one?]] -#+end_quote diff --git a/modules/tools/gist/autoload/evil.el b/modules/tools/gist/autoload/evil.el deleted file mode 100644 index 654d658ee..000000000 --- a/modules/tools/gist/autoload/evil.el +++ /dev/null @@ -1,19 +0,0 @@ -;;; tools/gist/autoload/evil.el -*- lexical-binding: t; -*- -;;;###if (modulep! :editor evil) - -;;;###autoload (autoload '+gist:send "tools/gist/autoload/evil" nil t) -(evil-define-operator +gist:send (bang) - "Create a private gist from the buffer. If BANG then make it public." - :type inclusive :repeat nil - (interactive "") - (if bang - (gist-region-or-buffer) - (gist-region-or-buffer-private))) - -;;;###autoload (autoload '+gist:list "tools/gist/autoload/evil" nil t) -(evil-define-command +gist:list (&optional username) - "Pop up a listing of gists." - (interactive "") - (if username - (gist-list-user username) - (gist-list))) diff --git a/modules/tools/gist/config.el b/modules/tools/gist/config.el deleted file mode 100644 index cd902c213..000000000 --- a/modules/tools/gist/config.el +++ /dev/null @@ -1,31 +0,0 @@ -;;; tools/gist/config.el -*- lexical-binding: t; -*- - -;; NOTE On occasion, the cache gets corrupted, causing wrong-type-argument -;; errors. If that happens, try `+gist/kill-cache'. You may have to restart -;; Emacs. - -(after! gist - (set-evil-initial-state! 'gist-list-mode 'normal) - - (set-popup-rule! "^\\*gist-" :ignore t) - - (defadvice! +gist--open-in-popup-a (fn &rest args) - :around #'gist-list-render - (funcall fn (car args) t) - (unless (cadr args) - (pop-to-buffer (current-buffer)))) - - (map! :map gist-list-menu-mode-map - :n "RET" #'gist-fetch-current - :n "TAB" #'gist-fetch-current - :n [tab] #'gist-fetch-current-noselect - :n "go" #'gist-browse-current-url - :n "gr" #'gist-list-reload - :n "c" #'gist-add-buffer - :n "d" #'gist-kill-current - :n "e" #'gist-edit-current-description - :n "f" #'gist-fork - :n "q" #'kill-current-buffer - :n "s" #'gist-star - :n "S" #'gist-unstar - :n "y" #'gist-print-current-url)) diff --git a/modules/tools/gist/packages.el b/modules/tools/gist/packages.el deleted file mode 100644 index f8a971d9f..000000000 --- a/modules/tools/gist/packages.el +++ /dev/null @@ -1,4 +0,0 @@ -;; -*- no-byte-compile: t; -*- -;;; tools/gist/packages.el - -(package! gist :pin "314fe6ab80fae35b95f0734eceb82f72813b6f41") diff --git a/templates/init.example.el b/templates/init.example.el index 169604c3b..7a5e4e6c7 100644 --- a/templates/init.example.el +++ b/templates/init.example.el @@ -94,7 +94,6 @@ ;;editorconfig ; let someone else argue about tabs vs spaces ;;ein ; tame Jupyter notebooks with emacs (eval +overlay) ; run code, run (also, repls) - ;;gist ; interacting with github gists lookup ; navigate your code and its documentation ;;lsp ; M-x vscode magit ; a git porcelain for Emacs From 151b67baf27bc17e2cfaf47253f66f7ffd43c5df Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Sun, 4 Feb 2024 19:17:18 -0500 Subject: [PATCH 25/49] bump: :editor evil TheBB/evil-indent-plus@b4dacbfdb57f -> TheBB/evil-indent-plus@f392696e4813 emacs-evil/evil-collection@8be4b75c86bc -> emacs-evil/evil-collection@8c84f9bc89fe emacs-evil/evil-surround@8fad8540c490 -> emacs-evil/evil-surround@c7116cdc774b emacs-evil/evil@5fc16776c5eb -> emacs-evil/evil@5995f6f21f66 --- modules/editor/evil/init.el | 4 +++- modules/editor/evil/packages.el | 8 ++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/modules/editor/evil/init.el b/modules/editor/evil/init.el index fb8cc330a..146d59406 100644 --- a/modules/editor/evil/init.el +++ b/modules/editor/evil/init.el @@ -99,6 +99,7 @@ variable for an explanation of the defaults (in comments). See bm bookmark (buff-menu "buff-menu") + bufler calc calendar cider @@ -112,8 +113,8 @@ variable for an explanation of the defaults (in comments). See crdt (custom cus-edit) cus-theme - daemons dashboard + daemons deadgrep debbugs debug @@ -197,6 +198,7 @@ variable for an explanation of the defaults (in comments). See markdown-mode monky mpc + mpdel mu4e mu4e-conversation neotree diff --git a/modules/editor/evil/packages.el b/modules/editor/evil/packages.el index 20c2c832e..b38f6ebe4 100644 --- a/modules/editor/evil/packages.el +++ b/modules/editor/evil/packages.el @@ -1,7 +1,7 @@ ;; -*- no-byte-compile: t; -*- ;;; editor/evil/packages.el -(package! evil :pin "5fc16776c5eb00c956ec7e9d83facb6a38dd868d") +(package! evil :pin "5995f6f21f662484440ed67a28ce59e365feb9ad") (package! evil-args :pin "2671071a4a57eaee7cc8c27b9e4b6fc60fd2ccd3") (package! evil-easymotion :pin "f96c2ed38ddc07908db7c3c11bcd6285a3e8c2e9") (package! evil-embrace :pin "3081d37811b6a3dfaaf01d578c7ab7a746c6064d") @@ -9,12 +9,12 @@ :recipe (:host github :repo "hlissner/evil-escape") :pin "819f1ee1cf3f69a1ae920e6004f2c0baeebbe077") (package! evil-exchange :pin "5f0a2d41434c17c6fb02e4f744043775de1c63a2") -(package! evil-indent-plus :pin "b4dacbfdb57f474f798bfbf5026d434d549eb65c") +(package! evil-indent-plus :pin "f392696e4813f1d3a92c7eeed333248914ba6dae") (package! evil-lion :pin "1e838a53b8f18a3c8bdf3e952186abc2ee9cb98e") (package! evil-nerd-commenter :pin "3b197a2b559b06a7cf39978704b196f53dac802a") (package! evil-numbers :pin "7a1b62afc12da2b582bf84d722e7b10ca8b97065") (package! evil-snipe :pin "c2108d3932fcd2f75ac3e48250d6badd668f5b4f") -(package! evil-surround :pin "8fad8540c490d94a820004f227552ca08e3e3857") +(package! evil-surround :pin "c7116cdc774b1e259eaf3e9e7a318a6c99c2da17") (package! evil-textobj-anyblock :recipe (:host github :repo "willghatch/evil-textobj-anyblock" @@ -35,4 +35,4 @@ (package! neotree) (autoload 'neotree-make-executor "neotree" nil nil 'macro)) - (package! evil-collection :pin "8be4b75c86bc637dbcd14be7522d6da06df1747e")) + (package! evil-collection :pin "8c84f9bc89fe56e71b56519f886085ddcbc671cf")) From e701522d680b54299d43f03bd0d8d00c19bfe28a Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Sun, 4 Feb 2024 19:18:11 -0500 Subject: [PATCH 26/49] bump: :editor doomemacs/snippets@d490cba6d762 -> doomemacs/snippets@f022984ee131 emacs-straight/adaptive-wrap@fc9f0306f14c -> emacs-straight/adaptive-wrap@70005d2012ab emacs-tree-sitter/ts-fold@75e72c658ad8 -> emacs-tree-sitter/ts-fold@0627723e5f96 joaotavora/yasnippet@5cbdbf0d2015 -> joaotavora/yasnippet@297546f0853a joostkremers/visual-fill-column@695a59789209 -> joostkremers/visual-fill-column@db7c7c236555 justinbarclay/parinfer-rust-mode@6e6bdeeba325 -> justinbarclay/parinfer-rust-mode@8df117a3b54d raxod502/apheleia@56651724ad22 -> raxod502/apheleia@96a9805ecb75 --- modules/editor/file-templates/packages.el | 2 +- modules/editor/fold/packages.el | 2 +- modules/editor/format/packages.el | 2 +- modules/editor/parinfer/packages.el | 2 +- modules/editor/snippets/packages.el | 4 ++-- modules/editor/word-wrap/packages.el | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/modules/editor/file-templates/packages.el b/modules/editor/file-templates/packages.el index 247da6b7e..20195a6bd 100644 --- a/modules/editor/file-templates/packages.el +++ b/modules/editor/file-templates/packages.el @@ -1,4 +1,4 @@ ;; -*- no-byte-compile: t; -*- ;;; editor/file-templates/packages.el -(package! yasnippet :pin "5cbdbf0d2015540c59ed8ee0fcf4788effdf75b6") +(package! yasnippet :pin "297546f0853a6a51f5b05e954d0c6aea8caa5ec2") diff --git a/modules/editor/fold/packages.el b/modules/editor/fold/packages.el index 032d3ed72..ebb3a4768 100644 --- a/modules/editor/fold/packages.el +++ b/modules/editor/fold/packages.el @@ -7,5 +7,5 @@ (when (modulep! :editor evil) (package! evil-vimish-fold :pin "b6e0e6b91b8cd047e80debef1a536d9d49eef31a")) (when (modulep! :tools tree-sitter) - (package! ts-fold :pin "75e72c658ad8d8aac3af554a6b51b3c5c22dd0aa" + (package! ts-fold :pin "0627723e5f962fc72b238d4cf99a7f217e72aa3e" :recipe (:host github :repo "emacs-tree-sitter/ts-fold"))) diff --git a/modules/editor/format/packages.el b/modules/editor/format/packages.el index da69e9682..842765725 100644 --- a/modules/editor/format/packages.el +++ b/modules/editor/format/packages.el @@ -1,4 +1,4 @@ ;; -*- no-byte-compile: t; -*- ;;; editor/format/packages.el -(package! apheleia :pin "56651724ad22f2769bbdaccf54cbe75c1cb35c91") +(package! apheleia :pin "96a9805ecb75aac2adde7568d26b3e3b3ffc19af") diff --git a/modules/editor/parinfer/packages.el b/modules/editor/parinfer/packages.el index 65ae55b11..30ecb21fc 100644 --- a/modules/editor/parinfer/packages.el +++ b/modules/editor/parinfer/packages.el @@ -1,4 +1,4 @@ ;; -*- no-byte-compile: t; -*- ;;; editor/parinfer/packages.el -(package! parinfer-rust-mode :pin "6e6bdeeba32534acca5928fe4201ce013094988d") +(package! parinfer-rust-mode :pin "8df117a3b54d9e01266a3905b132a1d082944702") diff --git a/modules/editor/snippets/packages.el b/modules/editor/snippets/packages.el index 798e65cf9..3b3b46387 100644 --- a/modules/editor/snippets/packages.el +++ b/modules/editor/snippets/packages.el @@ -1,10 +1,10 @@ ;; -*- no-byte-compile: t; -*- ;;; editor/snippets/packages.el -(package! yasnippet :pin "76e1eee654ea9479ba1441f9c17567694e6a2096") +(package! yasnippet :pin "297546f0853a6a51f5b05e954d0c6aea8caa5ec2") (package! auto-yasnippet :pin "6a9e406d0d7f9dfd6dff7647f358cb05a0b1637e") (package! doom-snippets :recipe (:host github :repo "doomemacs/snippets" :files (:defaults "*")) - :pin "d490cba6d762e69b483be308bc387c1f785742f0") + :pin "f022984ee1318a4015d5d081b3c3dab5a60dc6ff") diff --git a/modules/editor/word-wrap/packages.el b/modules/editor/word-wrap/packages.el index 635b6f4be..5b0f9317c 100644 --- a/modules/editor/word-wrap/packages.el +++ b/modules/editor/word-wrap/packages.el @@ -1,5 +1,5 @@ ;; -*- no-byte-compile: t; -*- ;;; editor/word-wrap/packages.el -(package! adaptive-wrap :pin "fc9f0306f14c3859c9903b0a0336478bf070c943") -(package! visual-fill-column :pin "695a59789209c42fa08a5bce92963ee32f4455be") +(package! adaptive-wrap :pin "70005d2012ab57c20be03c05aebd49318fe49c99") +(package! visual-fill-column :pin "db7c7c236555c9c684e1294a277efefdc25fa5c4") From 2f7d8f41e1ceeb38bec25113e1c50e6245be9c67 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Mon, 1 Jan 2024 12:30:06 -0600 Subject: [PATCH 27/49] feat(lookup): add Kagi --- modules/tools/lookup/config.el | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/tools/lookup/config.el b/modules/tools/lookup/config.el index 726ad117c..5d48d1529 100644 --- a/modules/tools/lookup/config.el +++ b/modules/tools/lookup/config.el @@ -20,6 +20,7 @@ ("Google" +lookup--online-backend-google "https://google.com/search?q=%s") ("Google images" "https://www.google.com/images?q=%s") ("Google maps" "https://maps.google.com/maps?q=%s") + ("Kagi" "https://kagi.com/search?q=%s") ("Project Gutenberg" "http://www.gutenberg.org/ebooks/search/?query=%s") ("DuckDuckGo" +lookup--online-backend-duckduckgo "https://duckduckgo.com/?q=%s") ("DevDocs.io" "https://devdocs.io/#q=%s") From 2ace90233cd6cc93fd82777b42e85ee4fe8e2bba Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Mon, 1 Jan 2024 12:32:33 -0600 Subject: [PATCH 28/49] feat(org): add Kagi custom link type --- modules/lang/org/README.org | 1 + modules/lang/org/config.el | 1 + 2 files changed, 2 insertions(+) diff --git a/modules/lang/org/README.org b/modules/lang/org/README.org index 1c923dd34..031bcd0f5 100644 --- a/modules/lang/org/README.org +++ b/modules/lang/org/README.org @@ -234,6 +234,7 @@ They are (with examples): - ~github:hlissner/doom-emacs~ - ~gmap:Toronto, Ontario~ (Google Maps) - ~google:search terms~ +- ~kagi:search terms~ - ~org:todo.org~ -> ={org-directory}/%s= - ~wolfram:sin(x^3)~ - ~wikipedia:Emacs~ diff --git a/modules/lang/org/config.el b/modules/lang/org/config.el index 0fda370f9..c7f7a422f 100644 --- a/modules/lang/org/config.el +++ b/modules/lang/org/config.el @@ -519,6 +519,7 @@ relative to `org-directory', unless it is an absolute path." '("google" . "https://google.com/search?q=") '("gimages" . "https://google.com/images?q=%s") '("gmap" . "https://maps.google.com/maps?q=%s") + '("kagi" . "https://kagi.com/search?q=%s") '("duckduckgo" . "https://duckduckgo.com/?q=%s") '("wikipedia" . "https://en.wikipedia.org/wiki/%s") '("wolfram" . "https://wolframalpha.com/input/?i=%s") From 343c3a82b06a666da34a885a81a0c525529887fa Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Mon, 5 Feb 2024 03:33:22 -0500 Subject: [PATCH 29/49] refactor: s/doom-modules-dirs/doom-module-load-path/ Ref: fc6934c24073 --- lisp/cli/compile.el | 2 +- lisp/doom-modules.el | 10 +++++----- lisp/doom-profiles.el | 2 +- lisp/lib/autoloads.el | 2 +- lisp/lib/debug.el | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/lisp/cli/compile.el b/lisp/cli/compile.el index 5dd251d45..88cfed2d9 100644 --- a/lisp/cli/compile.el +++ b/lisp/cli/compile.el @@ -199,7 +199,7 @@ module. This does not include your byte-compiled, third party packages.'" in (append (doom-glob doom-emacs-dir "*.elc") (doom-files-in doom-user-dir :match "\\.elc$" :depth 1) (doom-files-in doom-core-dir :match "\\.elc$") - (doom-files-in doom-modules-dirs :match "\\.elc$" :depth 4)) + (doom-files-in doom-module-load-path :match "\\.elc$" :depth 4)) if (file-exists-p path) do (delete-file path) and do (print! (success "\033[KDeleted %s%s") (relpath path) esc) diff --git a/lisp/doom-modules.el b/lisp/doom-modules.el index cf9ebe471..24e8f70f8 100644 --- a/lisp/doom-modules.el +++ b/lisp/doom-modules.el @@ -267,7 +267,7 @@ If PLIST consists of a single nil, the module is purged from memory instead." PATHS-OR-ALL can either be a non-nil value or a list of directories. If given a list of directories, return a list of module keys for all modules present -underneath it. If non-nil, return the same, but search `doom-modules-dirs' +underneath it. If non-nil, return the same, but search `doom-module-load-path' (includes :core and :user). Modules that are enabled are sorted first by their :depth, followed by disabled modules in lexicographical order (unless a :depth is specified in their .doommodule). @@ -279,7 +279,7 @@ configdepth. See `doom-module-set' for details." (append (seq-remove #'cdr (doom-module-list nil initorder?)) (doom-files-in (if (listp paths-or-all) paths-or-all - doom-modules-dirs) + doom-modules-load-path) :map #'doom-module-from-path :type 'dirs :mindepth 1 @@ -309,7 +309,7 @@ If the category isn't enabled this returns nil. For finding disabled modules use path))) (defun doom-module-locate-path (category &optional module file) - "Searches `doom-modules-dirs' to find the path to a module. + "Searches `doom-module-load-path' to find the path to a module. CATEGORY is a keyword (e.g. :lang) and MODULE is a symbol (e.g. 'python). FILE is a string that will be appended to the resulting path. If no path exists, this @@ -325,8 +325,8 @@ returns nil, otherwise an absolute path." (if file ;; PERF: locate-file-internal is a little faster for finding files, ;; but its interface for finding directories is clumsy. - (locate-file-internal path doom-modules-dirs '("" ".elc" ".el")) - (cl-loop for default-directory in doom-modules-dirs + (locate-file-internal path doom-module-load-path '("" ".elc" ".el")) + (cl-loop for default-directory in doom-module-load-path if (file-exists-p path) return (expand-file-name path))))))) diff --git a/lisp/doom-profiles.el b/lisp/doom-profiles.el index 668eccb24..94dd3dd09 100644 --- a/lisp/doom-profiles.el +++ b/lisp/doom-profiles.el @@ -439,7 +439,7 @@ Defaults to the profile at `doom-profile-default'." (doom-autoloads--scan (append (doom-glob doom-core-dir "lib/*.el") (cl-loop for dir - in (append (doom-module-load-path doom-modules-dirs) + in (append (doom-module-load-path) (list doom-user-dir)) if (doom-glob dir "autoload.el") collect (car it) if (doom-glob dir "autoload/*.el") append it) diff --git a/lisp/lib/autoloads.el b/lisp/lib/autoloads.el index 958db1c8d..9dec16be5 100644 --- a/lisp/lib/autoloads.el +++ b/lisp/lib/autoloads.el @@ -186,7 +186,7 @@ non-nil, treat FILES as pre-generated autoload files instead." (let ((load-file-name file) (load-path (append (list doom-user-dir) - doom-modules-dirs + doom-module-load-path load-path))) (condition-case _ (while t diff --git a/lisp/lib/debug.el b/lisp/lib/debug.el index d43d593f7..741e59ff3 100644 --- a/lisp/lib/debug.el +++ b/lisp/lib/debug.el @@ -301,7 +301,7 @@ ready to be pasted in a bug report on github." 'compiled-user-config) (if (doom-files-in doom-core-dir :type 'files :match "\\.elc$") 'compiled-core) - (if (doom-files-in doom-modules-dirs :type 'files :match "\\.elc$") + (if (doom-files-in doom-module-load-path :type 'files :match "\\.elc$") 'compiled-modules))))) (custom ,@(when (and (stringp custom-file) From f14e7907f63bfade786d930dcbe452069cab7587 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Mon, 5 Feb 2024 15:22:31 -0500 Subject: [PATCH 30/49] fix: doom-module-locate-paths: remove file-name-sans-extension call This was preventing its usage in :lang emacs-lisp from finding demos.org files in modules. Amend: 3bea4f66a844 --- lisp/doom-modules.el | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lisp/doom-modules.el b/lisp/doom-modules.el index 24e8f70f8..bafce77a3 100644 --- a/lisp/doom-modules.el +++ b/lisp/doom-modules.el @@ -335,8 +335,7 @@ returns nil, otherwise an absolute path." MODULE-LIST is a list of cons cells (GROUP . NAME). See `doom-module-list' for an example." - (cl-loop with file = (file-name-sans-extension file) - for (group . name) in module-list + (cl-loop for (group . name) in (or module-list (doom-module-list)) if (doom-module-locate-path group name file) collect it)) From ce6ea7d85f35813dca9202e29346faed98bbfb53 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Mon, 5 Feb 2024 16:36:41 -0500 Subject: [PATCH 31/49] bump: :lang Andersbakken/rtags@ee1ab7b9a6c8 -> Andersbakken/rtags@05117a9a293a FStarLang/fstar-mode.el@ab0697b9474f -> FStarLang/fstar-mode.el@7d353de89248 Fanael/edit-indirect@f80f63822ffa -> Fanael/edit-indirect@82a28d8a8527 ProofGeneral/PG@8416875696cb -> ProofGeneral/PG@a38857a6a099 Sarcasm/irony-mode@870d1576fb27 -> Sarcasm/irony-mode@40e0ce19eb85 aaronjensen/flycheck-credo@e88f11ead538 -> aaronjensen/flycheck-credo@e285bd042a53 agda/agda@bb7603d19781 -> agda/agda@fbf9d159c3c8 amake/flutter.el@edd3f5eb3f46 -> amake/flutter.el@004c91e070a9 ananthakumaran/exunit.el@e0a8c2b81f3d -> ananthakumaran/exunit.el@e008c89e01e5 ananthakumaran/tide@29475d9eee26 -> ananthakumaran/tide@b38dfc3f8fb7 arthurnn/minitest-emacs@ddd152c990a5 -> arthurnn/minitest-emacs@5999c45c0472 babashka/neil@40993873bb4e -> babashka/neil@a1db63d420b8 beancount/beancount-mode@0f1e33067e50 -> beancount/beancount-mode@546163fd2ccc borkdude/flycheck-clj-kondo@ff7bed231575 -> borkdude/flycheck-clj-kondo@9089ade9e01b cdominik/cdlatex@ac024ce29318 -> cdominik/cdlatex@33770dec7313 clojure-emacs/cider@120fd885d37c -> clojure-emacs/cider@aa26d62ac599 clojure-emacs/clj-refactor.el@0a2a6cbc2e29 -> clojure-emacs/clj-refactor.el@fa3efe18e715 clojure-emacs/clojure-mode@25d713a67d8e -> clojure-emacs/clojure-mode@222fdafa2add clojure-emacs/parseclj@74ff7d63fed9 -> clojure-emacs/parseclj@6af22372e0fe clojure-emacs/parseedn@c8f07926a688 -> clojure-emacs/parseedn@3407e4530a36 crystal-lang-tools/emacs-crystal-mode@9bfb9f0f566e -> crystal-lang-tools/emacs-crystal-mode@ea89b108fa42 davazp/graphql-mode@1437b790060f -> davazp/graphql-mode@49a391b5290e dgutov/robe@912ae2ba1f46 -> dgutov/robe@4ecd868da9ad dominikh/go-mode.el@166dfb1e0902 -> dominikh/go-mode.el@8dce1e3ba1cd elixir-editors/emacs-elixir@7641373f0563 -> elixir-editors/emacs-elixir@00d6580a040a emacs-geiser/geiser@49d12a14482c -> emacs-geiser/geiser@bb77719c2583 emacs-geiser/guile@ee33af6b4ef8 -> emacs-geiser/guile@6e0811c75d13 emacs-lsp/emacs-ccls@dd33da8ed74e -> emacs-lsp/emacs-ccls@9b4a47e0418d emacs-lsp/lsp-dart@3db9f93c8305 -> emacs-lsp/lsp-dart@e7ee6afc2e16 emacs-lsp/lsp-java@449673da7221 -> emacs-lsp/lsp-java@c962a3b3ac2b emacs-php/composer.el@5af1707fefbd -> emacs-php/composer.el@91945f1bdb65 emacs-php/php-mode@fb11df8268b7 -> emacs-php/php-mode@a0bcafbe3049 emacs-php/phpactor.el@9440005814c4 -> emacs-php/phpactor.el@8733fef84b45 emacs-php/psysh.el@796b26a5cd75 -> emacs-php/psysh.el@c7dde979d9fd emacs-straight/adaptive-wrap@0d5b4a07de76 -> emacs-straight/adaptive-wrap@70005d2012ab emacs-straight/auctex@3929d5408b1e -> emacs-straight/auctex@86b2397abdc2 emacs-straight/csv-mode@d190a479b4f3 -> emacs-straight/csv-mode@81c1a9febd2a emacs-straight/rainbow-mode@8e96388fb4d6 -> emacs-straight/rainbow-mode@70ed10d410ef emacs-straight/sml-mode@5426ff473824 -> emacs-straight/sml-mode@e5354371f361 emacsmirror/cmake-mode@f9c7a21254a8 -> emacsmirror/cmake-mode@b08b5d904530 emacsorphanage/dart-mode@9c846769abd3 -> emacsorphanage/dart-mode@dffc0209a19f erlang/otp@be7109f43bee -> erlang/otp@0ca7e064f5a9 factor/factor@76ac65649d61 -> factor/factor@23fcfc70753a flycheck/flycheck-cask@4b2ede6362de -> flycheck/flycheck-cask@0eeec5197e9d fxbois/web-mode@57856ba64b93 -> fxbois/web-mode@82847071ce93 gcv/julia-snail@18b891b45690 -> gcv/julia-snail@d36653bb9380 gdkrmr/lsp-julia@c584f79c7fee -> gdkrmr/lsp-julia@c869b2f6c05a godotengine/emacs-gdscript-mode@d392e8aa7e7c -> godotengine/emacs-gdscript-mode@8a28276daaa2 greghendershott/racket-mode@947d9806ee27 -> greghendershott/racket-mode@d3ab936af109 haskell/haskell-mode@79eaf444a721 -> haskell/haskell-mode@43b4036bf02b hhvm/hack-mode@26f06ffe8257 -> hhvm/hack-mode@278e4cc4032b hvesalai/emacs-scala-mode@5d7cf21c37e3 -> hvesalai/emacs-scala-mode@4c6d636b86e3 idris-hackers/idris-mode@c96f45d1b8fa -> idris-hackers/idris-mode@37c6b8199031 immerrr/lua-mode@7eb8eaa420c2 -> immerrr/lua-mode@d074e4134b1b iyefrat/evil-tex@3e0a26b91a1a -> iyefrat/evil-tex@2a3177c818f1 jrblevin/markdown-mode@b1a862f0165b -> jrblevin/markdown-mode@e096bb97a91f json-emacs/json-mode@eedb4560034f -> json-emacs/json-mode@bfd1557aaa20 jwiegley/emacs-async@71cc50f27ffc -> jwiegley/emacs-async@d040f72cb0be ledger/ledger-mode@4b32f701736b -> ledger/ledger-mode@11e748d4838d ljos/jq-mode@071c1c29bac3 -> ljos/jq-mode@37028e120041 nex3/haml-mode@fe83c65c1f00 -> nex3/haml-mode@a64d58df8f09 nlamirault/phpunit.el@4a36906344c0 -> nlamirault/phpunit.el@650a50898de1 nonsequitur/inf-ruby@03475ac1cca4 -> nonsequitur/inf-ruby@dac615c7fdbb ocaml-ppx/ocamlformat@7db948a8946e -> ocaml-ppx/ocamlformat@b8b09566904c ocaml/dune@360b00027166 -> ocaml/dune@64d19876ad6d pashky/restclient.el@0ba72816f92f -> pashky/restclient.el@e2a2b13482d7 psibi/dhall-mode@c77f1c1e75b6 -> psibi/dhall-mode@87ab69fe765d purescript-emacs/emacs-psci@9bb6a3253254 -> purescript-emacs/emacs-psci@ef31045295f2 purescript-emacs/psc-ide-emacs@ce97d719458e -> purescript-emacs/psc-ide-emacs@4e614df553fb s-kostyaev/go-gen-test@f84f4177af7f -> s-kostyaev/go-gen-test@af00a9abbaba seagle0128/grip-mode@5809fb62f6dd -> seagle0128/grip-mode@e145adb22593 senny/rbenv.el@2ea1a5bdc126 -> senny/rbenv.el@588b817d5107 technomancy/fennel-mode@8f721285e123 -> technomancy/fennel-mode@5965c8fc693a tpapp/julia-repl@9503ef711073 -> tpapp/julia-repl@4947319bc948 weijiangan/flycheck-golangci-lint@8e446c683110 -> weijiangan/flycheck-golangci-lint@9def093e416e wwwjfy/emacs-fish@6869efbc05cd -> wwwjfy/emacs-fish@2526b1803b58 yoshiki/yaml-mode@3fcb36d6039b -> yoshiki/yaml-mode@5b58248ab255 Close: #7648 --- modules/lang/agda/packages.el | 4 ++-- modules/lang/beancount/packages.el | 2 +- modules/lang/cc/packages.el | 8 ++++---- modules/lang/clojure/packages.el | 14 +++++++------- modules/lang/coq/packages.el | 2 +- modules/lang/crystal/packages.el | 4 ++-- modules/lang/dart/packages.el | 6 +++--- modules/lang/data/packages.el | 2 +- modules/lang/dhall/packages.el | 2 +- modules/lang/elixir/packages.el | 6 +++--- modules/lang/emacs-lisp/packages.el | 2 +- modules/lang/erlang/packages.el | 2 +- modules/lang/factor/packages.el | 2 +- modules/lang/fstar/packages.el | 2 +- modules/lang/gdscript/packages.el | 2 +- modules/lang/go/packages.el | 8 ++++---- modules/lang/graphql/packages.el | 2 +- modules/lang/haskell/packages.el | 2 +- modules/lang/idris/packages.el | 2 +- modules/lang/java/packages.el | 2 +- modules/lang/javascript/packages.el | 2 +- modules/lang/json/packages.el | 2 +- modules/lang/julia/packages.el | 6 +++--- modules/lang/latex/packages.el | 8 ++++---- modules/lang/ledger/packages.el | 2 +- modules/lang/lua/packages.el | 4 ++-- modules/lang/markdown/packages.el | 6 +++--- modules/lang/ocaml/packages.el | 4 ++-- modules/lang/php/packages.el | 16 ++++++++-------- modules/lang/purescript/packages.el | 4 ++-- modules/lang/racket/packages.el | 2 +- modules/lang/rest/packages.el | 6 +++--- modules/lang/ruby/packages.el | 8 ++++---- modules/lang/scala/packages.el | 2 +- modules/lang/scheme/packages.el | 4 ++-- modules/lang/sh/packages.el | 2 +- modules/lang/sml/packages.el | 2 +- modules/lang/web/packages.el | 6 +++--- modules/lang/yaml/packages.el | 2 +- 39 files changed, 82 insertions(+), 82 deletions(-) diff --git a/modules/lang/agda/packages.el b/modules/lang/agda/packages.el index 1f9656286..25cc82dd4 100644 --- a/modules/lang/agda/packages.el +++ b/modules/lang/agda/packages.el @@ -6,11 +6,11 @@ :recipe (:host github :repo "agda/agda" :files ("src/data/emacs-mode/agda-input.el") :nonrecursive t) - :pin "bb7603d19781e4da2dc702a5a1611fd59e5325f2") + :pin "fbf9d159c3c874b8328ccdc78a0d57d57a310234") (package! agda2-mode :recipe (:host github :repo "agda/agda" :files ("src/data/emacs-mode/*.el" (:exclude "agda-input.el")) :nonrecursive t) - :pin "bb7603d19781e4da2dc702a5a1611fd59e5325f2")) + :pin "fbf9d159c3c874b8328ccdc78a0d57d57a310234")) diff --git a/modules/lang/beancount/packages.el b/modules/lang/beancount/packages.el index dc731fb8b..aa54f0fb7 100644 --- a/modules/lang/beancount/packages.el +++ b/modules/lang/beancount/packages.el @@ -4,4 +4,4 @@ (package! beancount :recipe (:host github :repo "beancount/beancount-mode") - :pin "0f1e33067e5032382f425b5280169f50aa7dd497") + :pin "546163fd2ccc007f28812faf5170eb954d3ca979") diff --git a/modules/lang/cc/packages.el b/modules/lang/cc/packages.el index 67bc7bb2b..817c2acd2 100644 --- a/modules/lang/cc/packages.el +++ b/modules/lang/cc/packages.el @@ -3,7 +3,7 @@ (package! cmake-mode :recipe (:host github :repo "emacsmirror/cmake-mode" :files (:defaults "*")) - :pin "f9c7a21254a82a8d44b623bdfded6d21b4ea33ef") + :pin "b08b5d9045308362a623a4f576896d55ffecfd52") (package! cuda-mode :pin "7f593518fd135fc6af994024bcb47986dfa502d2") (package! demangle-mode :pin "04f545adab066708d6151f13da65aaf519f8ac4e") (package! disaster :pin "16bba9afb92aacf06c088c29ba47813b65a80d87") @@ -19,8 +19,8 @@ (if (modulep! +lsp) (unless (modulep! :tools lsp +eglot) ;; ccls package is necessary only for lsp-mode. - (package! ccls :pin "dd33da8ed74ea3936c1ac969fe1be02879825e86")) - (when (package! irony :pin "870d1576fb279bb93f776a71e65f45283c423a9e") + (package! ccls :pin "9b4a47e0418de8cc2fc93317e27cbdde75286df1")) + (when (package! irony :pin "40e0ce19eb850bdf1f77225f11713cc816250d95") (package! irony-eldoc :pin "73e79a89fad982a2ba072f2fcc1b4e41f0aa2978") (when (and (modulep! :checkers syntax) (not (modulep! :checkers syntax +flymake))) @@ -28,7 +28,7 @@ (when (modulep! :completion company) (package! company-irony :pin "b44711dfce445610c1ffaec4951c6ff3882b216a") (package! company-irony-c-headers :pin "72c386aeb079fb261d9ec02e39211272f76bbd97"))) - (when (package! rtags :pin "ee1ab7b9a6c88dc05282d9e3c64c0d380bf53c11") + (when (package! rtags :pin "05117a9a293a729e30013a586c9e3437d9b856c0") (when (modulep! :completion ivy) (package! ivy-rtags)) (when (modulep! :completion helm) diff --git a/modules/lang/clojure/packages.el b/modules/lang/clojure/packages.el index 33c4f5fe9..0712af7ef 100644 --- a/modules/lang/clojure/packages.el +++ b/modules/lang/clojure/packages.el @@ -10,17 +10,17 @@ ;; HACK Forward declare these clj-refactor/cider deps so that their deps are ;; byte-compiled first. -(package! parseclj :pin "74ff7d63fed92a3c859e474ae85f011e794b751a") -(package! parseedn :pin "c8f07926a688bfe995fde4460103915d401a1aff") +(package! parseclj :pin "6af22372e0fe14df882dd300b22b12ba2d7e00b0") +(package! parseedn :pin "3407e4530a367b6c2b857dae261cdbb67a440aaa") ;;; Core packages -(package! clojure-mode :pin "25d713a67d8e0209ee74bfc0153fdf677697b43f") -(package! clj-refactor :pin "0a2a6cbc2e29177f4f55730637a357433a03fa38") -(package! cider :pin "120fd885d37c07137f1c162e8d522ab3eed1ac3f") +(package! clojure-mode :pin "222fdafa2add56a171ded245339a383e5e3078ec") +(package! clj-refactor :pin "fa3efe18e7150df5153a7d05c54e96d59398a0a8") +(package! cider :pin "aa26d62ac59930079e47e652ccd73e8e447defd5") (when (and (modulep! :checkers syntax) (not (modulep! :checkers syntax +flymake))) - (package! flycheck-clj-kondo :pin "ff7bed2315755cfe02ef471edf522e27b78cd5ca")) + (package! flycheck-clj-kondo :pin "9089ade9e01b091139321c78ad75946944ff845d")) (package! jet :pin "7d5157aac692fc761d8ed7a9f820fa6522136254") (package! neil :recipe (:host github :repo "babashka/neil" :files ("*.el")) - :pin "40993873bb4ef6d88af450e8a96d03275e266f6b") + :pin "a1db63d420b85db814207113ca4a0b4b959073cc") diff --git a/modules/lang/coq/packages.el b/modules/lang/coq/packages.el index b9533c0ad..d7b60edf9 100644 --- a/modules/lang/coq/packages.el +++ b/modules/lang/coq/packages.el @@ -1,5 +1,5 @@ ;; -*- no-byte-compile: t; -*- ;;; lang/coq/packages.el -(package! proof-general :pin "8416875696cb0c4283e96fe721d343277882ecea") +(package! proof-general :pin "a38857a6a099d0d94184a50093ea6ad331c5c52e") (package! company-coq :pin "5affe7a96a25df9101f9e44bac8a828d8292c2fa") diff --git a/modules/lang/crystal/packages.el b/modules/lang/crystal/packages.el index 6fa5ef803..351e72eb6 100644 --- a/modules/lang/crystal/packages.el +++ b/modules/lang/crystal/packages.el @@ -1,9 +1,9 @@ ;; -*- no-byte-compile: t; -*- ;;; lang/crystal/packages.el -(package! crystal-mode :pin "9bfb9f0f566e937cc6a2f2913d1b56978b81dc99") +(package! crystal-mode :pin "ea89b108fa4222df94ffb99e6e7eaec5d7aa4fea") (package! inf-crystal :pin "02007b2a2a3bea44902d7c83c4acba1e39d278e3") (when (and (modulep! :checkers syntax) (not (modulep! :checkers syntax +flymake))) - (package! flycheck-crystal :pin "9bfb9f0f566e937cc6a2f2913d1b56978b81dc99") + (package! flycheck-crystal :pin "ea89b108fa4222df94ffb99e6e7eaec5d7aa4fea") (package! flycheck-ameba :pin "0c4925ae0e998818326adcb47ed27ddf9761c7dc")) diff --git a/modules/lang/dart/packages.el b/modules/lang/dart/packages.el index 5a7c93395..19830a9b3 100644 --- a/modules/lang/dart/packages.el +++ b/modules/lang/dart/packages.el @@ -1,12 +1,12 @@ ;; -*- no-byte-compile: t; -*- ;;; lang/dart/packages.el -(package! dart-mode :pin "9c846769abd37f7fdc7ba8388d1f3a2b844b75e3") +(package! dart-mode :pin "dffc0209a19fdfac72b861d6adb445c1b6b464f7") (when (and (modulep! +lsp) (not (modulep! :tools lsp +eglot))) - (package! lsp-dart :pin "3db9f93c83052d6a8976c92d67d2b24473930760")) + (package! lsp-dart :pin "e7ee6afc2e165291360fd35d16648307920837c7")) (when (modulep! +flutter) - (package! flutter :pin "edd3f5eb3f4603142f45c5890ee70b0dfb10772b") + (package! flutter :pin "004c91e070a9b4a2a5042f5bb20015ec65453acf") (package! hover :pin "4ca0638a14a8b304ac2b46e7b342b8d8732ad199")) diff --git a/modules/lang/data/packages.el b/modules/lang/data/packages.el index 3131a9369..70b3b96c7 100644 --- a/modules/lang/data/packages.el +++ b/modules/lang/data/packages.el @@ -1,4 +1,4 @@ ;; -*- no-byte-compile: t; -*- ;;; lang/data/packages.el -(package! csv-mode :pin "d190a479b4f36806b604da527e5d5a50909d3ceb") +(package! csv-mode :pin "81c1a9febd2adf79cfbdf939081ef7bf3a41ffd6") diff --git a/modules/lang/dhall/packages.el b/modules/lang/dhall/packages.el index a1313046a..1ed5f8d99 100644 --- a/modules/lang/dhall/packages.el +++ b/modules/lang/dhall/packages.el @@ -1,4 +1,4 @@ ;; -*- no-byte-compile: t; -*- ;;; lang/dhall/packages.el -(package! dhall-mode :pin "c77f1c1e75b6d2725019c5275fc102ae98d25628") +(package! dhall-mode :pin "87ab69fe765d87b3bb1604a306a8c44d6887681d") diff --git a/modules/lang/elixir/packages.el b/modules/lang/elixir/packages.el index 6521fcd40..fb6541bdd 100644 --- a/modules/lang/elixir/packages.el +++ b/modules/lang/elixir/packages.el @@ -2,8 +2,8 @@ ;;; lang/elixir/packages.el ;; +elixir.el -(package! elixir-mode :pin "7641373f0563cab67cc5459c34534a8176b5e676") -(package! exunit :pin "e0a8c2b81f3d53885ed753b911b3cb6ee9229bec") +(package! elixir-mode :pin "00d6580a040a750e019218f9392cf9a4c2dac23a") +(package! exunit :pin "e008c89e01e5680473278c7e7bab42842e294e4d") (when (and (modulep! :checkers syntax) (not (modulep! :checkers syntax +flymake))) - (package! flycheck-credo :pin "e88f11ead53805c361ec7706e44c3dfee1daa19f")) + (package! flycheck-credo :pin "e285bd042a535d0f13e0b4c5226df404cdda4033")) diff --git a/modules/lang/emacs-lisp/packages.el b/modules/lang/emacs-lisp/packages.el index 1e7bf2f93..d3894e575 100644 --- a/modules/lang/emacs-lisp/packages.el +++ b/modules/lang/emacs-lisp/packages.el @@ -14,7 +14,7 @@ (when (and (modulep! :checkers syntax) (not (modulep! :checkers syntax +flymake))) (package! flycheck-package :pin "75efa098cf17dc14c363e2ca9b68afdac7766b5b") - (package! flycheck-cask :pin "4b2ede6362ded4a45678dfbef1876faa42edbd58")) + (package! flycheck-cask :pin "0eeec5197e9d31bfcfc39380b262d65259a87d91")) ;; Libraries (package! buttercup :pin "24d43b2ce262faf59e5ff9f72466efb293aa6154") diff --git a/modules/lang/erlang/packages.el b/modules/lang/erlang/packages.el index 05c465987..092a55b3e 100644 --- a/modules/lang/erlang/packages.el +++ b/modules/lang/erlang/packages.el @@ -1,4 +1,4 @@ ;; -*- no-byte-compile: t; -*- ;;; lang/erlang/packages.el -(package! erlang :pin "be7109f43beeeea199ae74a42393927d013f75d9") +(package! erlang :pin "0ca7e064f5a948d68db12b5d9f9cfa2faf0f0ea3") diff --git a/modules/lang/factor/packages.el b/modules/lang/factor/packages.el index b14d8b3af..f6b4aff31 100644 --- a/modules/lang/factor/packages.el +++ b/modules/lang/factor/packages.el @@ -1,4 +1,4 @@ ;; -*- no-byte-compile: t; -*- ;;; lang/factor/packages.el -(package! fuel :pin "76ac65649d61975899070cf043447a995bf76c97") +(package! fuel :pin "23fcfc70753abbbdc0e86af06330d63da6e4ea64") diff --git a/modules/lang/fstar/packages.el b/modules/lang/fstar/packages.el index edb6dc9cd..ae0877453 100644 --- a/modules/lang/fstar/packages.el +++ b/modules/lang/fstar/packages.el @@ -1,4 +1,4 @@ ;; -*- no-byte-compile: t; -*- ;;; lang/fstar/packages.el -(package! fstar-mode :pin "ab0697b9474f36942a12a4b2a75251c247c18e9e") +(package! fstar-mode :pin "7d353de89248f1df6edd1f5672ab4d39f5d1353d") diff --git a/modules/lang/gdscript/packages.el b/modules/lang/gdscript/packages.el index 6d6ee074e..582c9d6dc 100644 --- a/modules/lang/gdscript/packages.el +++ b/modules/lang/gdscript/packages.el @@ -1,4 +1,4 @@ ;; -*- no-byte-compile: t; -*- ;;; lang/gdscript/packages.el -(package! gdscript-mode :pin "d392e8aa7e7c6dd79ce52fb55d78f7acfa443194") +(package! gdscript-mode :pin "8a28276daaa23f10e986367b80dc751c5d26829e") diff --git a/modules/lang/go/packages.el b/modules/lang/go/packages.el index 026a9b938..fc019527b 100644 --- a/modules/lang/go/packages.el +++ b/modules/lang/go/packages.el @@ -2,15 +2,15 @@ ;;; lang/go/packages.el (package! go-eldoc :pin "cbbd2ea1e94a36004432a9ac61414cb5a95a39bd") -(package! go-guru :pin "166dfb1e090233c4609a50c2ec9f57f113c1da72") -(package! go-mode :pin "166dfb1e090233c4609a50c2ec9f57f113c1da72") +(package! go-guru :pin "8dce1e3ba1cdc34a856ad53c8421413cfe33660e") +(package! go-mode :pin "8dce1e3ba1cdc34a856ad53c8421413cfe33660e") (package! gorepl-mode :pin "6a73bf352e8d893f89cad36c958c4db2b5e35e07") (package! go-tag :pin "33f2059551d5298ca228d90f525b99d1a8d70364") -(package! go-gen-test :pin "f84f4177af7fcbe10ce2116d5417ad5f0485034b") +(package! go-gen-test :pin "af00a9abbaba2068502327ecdef574fd894a884b") (when (modulep! :completion company) (package! company-go :pin "31948b463f2fc18f8801e5a8fe511fef300eb3dd")) (when (and (modulep! :checkers syntax) (not (modulep! :checkers syntax +flymake))) - (package! flycheck-golangci-lint :pin "8e446c68311048f0b87febf8ef0379e29d358851")) + (package! flycheck-golangci-lint :pin "9def093e416e9a6ddd3cae8590dbb7ff6314925a")) diff --git a/modules/lang/graphql/packages.el b/modules/lang/graphql/packages.el index f41bc1c74..bb9a771f0 100644 --- a/modules/lang/graphql/packages.el +++ b/modules/lang/graphql/packages.el @@ -1,7 +1,7 @@ ;; -*- no-byte-compile: t; -*- ;;; lang/graphql/packages.el -(package! graphql-mode :pin "1437b790060f6ce4a8dc57df2023443645b899e5") +(package! graphql-mode :pin "49a391b5290e3354b07f7b77ded97a154c084f46") (package! graphql-doc :pin "d37140267e0c426c7c18aff31900aa1650257394") (unless (modulep! +lsp) (package! company-graphql diff --git a/modules/lang/haskell/packages.el b/modules/lang/haskell/packages.el index 6eecc104d..a4b5961c5 100644 --- a/modules/lang/haskell/packages.el +++ b/modules/lang/haskell/packages.el @@ -1,7 +1,7 @@ ;; -*- no-byte-compile: t; -*- ;;; lang/haskell/packages.el -(package! haskell-mode :pin "79eaf444a72109f93f552abb53f834cc63bbf9f2") +(package! haskell-mode :pin "43b4036bf02b02de75643a1a2a31e28efac1c50b") (when (and (modulep! +lsp) (not (modulep! :tools lsp +eglot))) diff --git a/modules/lang/idris/packages.el b/modules/lang/idris/packages.el index 5eac5d034..92c502de1 100644 --- a/modules/lang/idris/packages.el +++ b/modules/lang/idris/packages.el @@ -1,4 +1,4 @@ ;; -*- no-byte-compile: t; -*- ;;; lang/idris/packages.el -(package! idris-mode :pin "c96f45d1b8fad193f09fb6139da17092003b5e74") +(package! idris-mode :pin "37c6b819903191acd85c56ef6f7ccf579b57eea4") diff --git a/modules/lang/java/packages.el b/modules/lang/java/packages.el index e9ec41e84..8e84b5088 100644 --- a/modules/lang/java/packages.el +++ b/modules/lang/java/packages.el @@ -14,4 +14,4 @@ (when (modulep! +lsp) (unless (modulep! :tools lsp +eglot) - (package! lsp-java :pin "449673da7221a30f1b1756cedcc48b9a2b52a51e"))) + (package! lsp-java :pin "c962a3b3ac2beabdf1ce83b815396d6c38e3cefa"))) diff --git a/modules/lang/javascript/packages.el b/modules/lang/javascript/packages.el index d9fbc635d..1196c229f 100644 --- a/modules/lang/javascript/packages.el +++ b/modules/lang/javascript/packages.el @@ -14,6 +14,6 @@ (package! skewer-mode :pin "e5bed351939c92a1f788f78398583c2f83f1bb3c") ;; Programming environment -(package! tide :pin "29475d9eee26f4101322209e9b6b199df5386094") +(package! tide :pin "b38dfc3f8fb754e64e48e76fc92d472cb3d1a3dc") (when (modulep! :tools lookup) (package! xref-js2 :pin "fd6b723e7f1f9793d189a815e1904364dc026b03")) diff --git a/modules/lang/json/packages.el b/modules/lang/json/packages.el index e4b0ff3f8..7cad731fa 100644 --- a/modules/lang/json/packages.el +++ b/modules/lang/json/packages.el @@ -1,7 +1,7 @@ ;; -*- no-byte-compile: t; -*- ;;; lang/json/packages.el -(package! json-mode :pin "eedb4560034f795a7950fa07016bd4347c368873") +(package! json-mode :pin "bfd1557aaa20b7518b808fdc869f094b52205234") (package! json-snatcher :pin "b28d1c0670636da6db508d03872d96ffddbc10f2") (when (modulep! :completion ivy) (package! counsel-jq :pin "8cadd2e96470402ede4881b4e955872976443689")) diff --git a/modules/lang/julia/packages.el b/modules/lang/julia/packages.el index 50f36c8fe..5892896be 100644 --- a/modules/lang/julia/packages.el +++ b/modules/lang/julia/packages.el @@ -2,12 +2,12 @@ ;;; lang/julia/packages.el (package! julia-mode :pin "7a8c868e0d3e51ba4a2c621ee22ca9599e0e4bbb") -(package! julia-repl :pin "9503ef7110732e444e686e815c5b2ae8228d274d") +(package! julia-repl :pin "4947319bc948b3f80d61b0d65a719737275949b8") (when (modulep! +lsp) (if (modulep! :tools lsp +eglot) (package! eglot-jl :pin "7dc604fe42a459a987853d065cd6d0f3c4cbc02a") - (package! lsp-julia :pin "c584f79c7fee6176bbb6120f4cb0f1001bcf8113"))) + (package! lsp-julia :pin "c869b2f6c05a97e5495ed3cc6710a33b4faf41a2"))) (when (modulep! +snail) - (package! julia-snail :pin "18b891b4569096d541e996cf7e24da01efdf2e03")) + (package! julia-snail :pin "d36653bb938050cfabbe3c1ea6d4575071085577")) diff --git a/modules/lang/latex/packages.el b/modules/lang/latex/packages.el index dac796910..112fee398 100644 --- a/modules/lang/latex/packages.el +++ b/modules/lang/latex/packages.el @@ -4,11 +4,11 @@ (package! auctex :recipe (:files ("*.el" "*.info" "dir" "doc" "etc" "images" "latex" "style")) - :pin "3929d5408b1e0d68cadeef7536a26ce29b1d36ea") -(package! adaptive-wrap :pin "0d5b4a07de76d87dd64333a566a8a0a845f2b9f0") + :pin "86b2397abdc20a638e5751251026727bc6282022") +(package! adaptive-wrap :pin "70005d2012ab57c20be03c05aebd49318fe49c99") (package! latex-preview-pane :pin "5297668a89996b50b2b62f99cba01cc544dbed2e") (when (modulep! :editor evil +everywhere) - (package! evil-tex :pin "3e0a26b91a1a56b0f35cbd450d01431057551750")) + (package! evil-tex :pin "2a3177c818f106e6c11032ac261f8691f5e11f74")) ;; Optional module features. @@ -16,7 +16,7 @@ (package! auctex-latexmk :pin "b00a95e6b34c94987fda5a57c20cfe2f064b1c7a")) (when (modulep! +cdlatex) - (package! cdlatex :pin "ac024ce29318cab812a743ad132a531c855c27a5")) + (package! cdlatex :pin "33770dec73138909714711b05a63e79da5a19ccd")) ;; Features according to other user selected options. diff --git a/modules/lang/ledger/packages.el b/modules/lang/ledger/packages.el index da9ff31a6..47b1ef2bf 100644 --- a/modules/lang/ledger/packages.el +++ b/modules/lang/ledger/packages.el @@ -1,7 +1,7 @@ ;; -*- no-byte-compile: t; -*- ;;; lang/ledger/packages.el -(package! ledger-mode :pin "4b32f701736b37f99048be79583b0bde7cc14c85") +(package! ledger-mode :pin "11e748d4838d51772f531a75849349ed8cd939ed") (when (modulep! :editor evil) (package! evil-ledger :pin "7a9f9f5d39c42fffdba8004f8982642351f2b233")) diff --git a/modules/lang/lua/packages.el b/modules/lang/lua/packages.el index b4250fa65..c5a16f5fd 100644 --- a/modules/lang/lua/packages.el +++ b/modules/lang/lua/packages.el @@ -1,7 +1,7 @@ ;; -*- no-byte-compile: t; -*- ;;; lang/lua/packages.el -(package! lua-mode :pin "7eb8eaa420c25477c830623b830fd18dc350cdfb") +(package! lua-mode :pin "d074e4134b1beae9ed4c9b512af741ca0d852ba3") (when (modulep! +moonscript) (package! moonscript :pin "56f90471e2ced2b0a177aed4d8c2f854797e9cc7") @@ -12,7 +12,7 @@ :pin "fcb99e5efcf31db05f236f02eaa575986a57172d"))) (when (modulep! +fennel) - (package! fennel-mode :pin "8f721285e12382b72c2f7a769d21fd332461eb2a")) + (package! fennel-mode :pin "5965c8fc693a49e65237a087e693690cf8c9fcb3")) (when (modulep! :completion company) (package! company-lua :pin "29f6819de4d691e5fd0b62893a9f4fbc1c6fcb52")) diff --git a/modules/lang/markdown/packages.el b/modules/lang/markdown/packages.el index cc59bb7fc..c6566899d 100644 --- a/modules/lang/markdown/packages.el +++ b/modules/lang/markdown/packages.el @@ -1,12 +1,12 @@ ;; -*- no-byte-compile: t; -*- ;;; lang/markdown/packages.el -(package! markdown-mode :pin "b1a862f0165b7bafe0f874738a55be1b1720dd7d") +(package! markdown-mode :pin "e096bb97a91fcd4dc2b46d8b6e093194b03b7364") (package! markdown-toc :pin "3d724e518a897343b5ede0b976d6fb46c46bcc01") -(package! edit-indirect :pin "f80f63822ffae78de38dbe72cacaeb1aaa96c732") +(package! edit-indirect :pin "82a28d8a85277cfe453af464603ea330eae41c05") (when (modulep! +grip) - (package! grip-mode :pin "5809fb62f6dd7b4bfa7685203aaa1474fca70f4e")) + (package! grip-mode :pin "e145adb22593a88249d964f77174207bcf755493")) (when (modulep! :editor evil +everywhere) (package! evil-markdown diff --git a/modules/lang/ocaml/packages.el b/modules/lang/ocaml/packages.el index dfc50c3e8..97c85b0f1 100644 --- a/modules/lang/ocaml/packages.el +++ b/modules/lang/ocaml/packages.el @@ -19,8 +19,8 @@ (when (modulep! :editor format) (package! ocamlformat :recipe (:host github :repo "ocaml-ppx/ocamlformat" :files ("emacs/*.el")) - :pin "7db948a8946e589edd11334dda56505f8d826dca")) + :pin "b8b09566904cf290cca294d3bf06a4f51793dfb7")) (package! dune :recipe (:host github :repo "ocaml/dune" :files ("editor-integration/emacs/*.el")) - :pin "360b00027166473a01a9010a04fc30af3ee883a0") + :pin "64d19876ad6d2ca8b36d6158d5ac58c6eae8bc9a") diff --git a/modules/lang/php/packages.el b/modules/lang/php/packages.el index 95ef51a9c..149b7f5bf 100644 --- a/modules/lang/php/packages.el +++ b/modules/lang/php/packages.el @@ -1,27 +1,27 @@ ;; -*- no-byte-compile: t; -*- ;;; lang/php/packages.el -(package! psysh :pin "796b26a5cd75df9d2ecb206718b310ff21787063") +(package! psysh :pin "c7dde979d9fd3ce59771f050bd38b2796cace446") (package! php-extras :recipe (:host github :repo "arnested/php-extras") :pin "d410c5af663c30c01d461ac476d1cbfbacb49367") -(package! php-mode :pin "fb11df8268b7099766264cd53836ef159746adbd") +(package! php-mode :pin "a0bcafbe30494b2c5a70c2fe05f2bb0859e83645") (package! php-refactor-mode :pin "7a794b0618df2882b1bd586fdd698dba0bc5130d") -(package! phpunit :pin "4a36906344c0abc11f48cc08cd8d50a9f46963f8") -(package! composer :pin "5af1707fefbd9d7db1102afdaeb8f2da893fea37") +(package! phpunit :pin "650a50898de1fa4eeb47360b12aeb1126b2448c2") +(package! composer :pin "91945f1bdb655be272320d14dab306b661a128a1") (when (modulep! +hack) (package! hack-mode :recipe (:host github :repo "hhvm/hack-mode") - :pin "26f06ffe82574f98e7da381e48202eceb8ef0793")) + :pin "278e4cc4032bff92060496cf1179643cfc6f9c0f")) (unless (modulep! +lsp) - (package! phpactor :pin "9440005814c4858880ad45afdaa7d2e637a9d280") + (package! phpactor :pin "8733fef84b458457c1bfd188cfb861fc3150ee1c") (when (modulep! :completion company) - (package! company-phpactor :pin "9440005814c4858880ad45afdaa7d2e637a9d280"))) + (package! company-phpactor :pin "8733fef84b458457c1bfd188cfb861fc3150ee1c"))) (when (modulep! :editor format) (package! php-cs-fixer :pin "efe4368d891f1eec6311363cfd6be3e9eadb5e0a")) ;; For building php-extras -(package! async :pin "71cc50f27ffc598a89aeaa593488d87818647d02") +(package! async :pin "d040f72cb0be5265d50ac541ddb09ebbc68b7908") diff --git a/modules/lang/purescript/packages.el b/modules/lang/purescript/packages.el index 27b083e9f..505b163b6 100644 --- a/modules/lang/purescript/packages.el +++ b/modules/lang/purescript/packages.el @@ -1,6 +1,6 @@ ;; -*- no-byte-compile: t; -*- ;;; lang/purescript/packages.el -(package! psc-ide :pin "ce97d719458ea099b40c02f05b6609601c727e66") +(package! psc-ide :pin "4e614df553fb315d32ee9dac085109ee7786a3cf") (package! purescript-mode :pin "eacc61aaafe6055b5f278c9843558f220f18b153") -(package! psci :pin "9bb6a325325480be704130c9c69731631d2cf3a6") +(package! psci :pin "ef31045295f29485fc697892fba53390fe193595") diff --git a/modules/lang/racket/packages.el b/modules/lang/racket/packages.el index 1c2a9a8b6..70987d450 100644 --- a/modules/lang/racket/packages.el +++ b/modules/lang/racket/packages.el @@ -1,4 +1,4 @@ ;; -*- no-byte-compile: t; -*- ;;; lang/racket/packages.el -(package! racket-mode :pin "947d9806ee27ef241643f978c7901fd1f9e10c98") +(package! racket-mode :pin "d3ab936af10909874443cadb2e6c952faf2f536f") diff --git a/modules/lang/rest/packages.el b/modules/lang/rest/packages.el index 937f62784..6ff464d43 100644 --- a/modules/lang/rest/packages.el +++ b/modules/lang/rest/packages.el @@ -1,10 +1,10 @@ ;; -*- no-byte-compile: t; -*- ;;; lang/rest/packages.el -(package! restclient :pin "0ba72816f92f3d5906cdf76f418fd0a3ee72809b") +(package! restclient :pin "e2a2b13482d72634f8e49864cd9e5c907a5fe137") (when (modulep! :completion company) (package! company-restclient :pin "e5a3ec54edb44776738c13e13e34c85b3085277b")) (when (modulep! +jq) - (package! jq-mode :pin "071c1c29bac30351ad338136f2b625e5601365cd") - (package! restclient-jq :pin "0ba72816f92f3d5906cdf76f418fd0a3ee72809b")) + (package! jq-mode :pin "37028e120041a489eff352b79202361cb232377e") + (package! restclient-jq :pin "e2a2b13482d72634f8e49864cd9e5c907a5fe137")) diff --git a/modules/lang/ruby/packages.el b/modules/lang/ruby/packages.el index 274775c9f..70869493e 100644 --- a/modules/lang/ruby/packages.el +++ b/modules/lang/ruby/packages.el @@ -6,13 +6,13 @@ (package! yard-mode :pin "de1701753a64544c3376b015805f3661136d8038") ;; REPL -(package! inf-ruby :pin "03475ac1cca410ee63a523f5c63f859cfafe1aeb") +(package! inf-ruby :pin "dac615c7fdbb57587465b1c497f8be4c979439e1") (when (modulep! :completion company) (package! company-inf-ruby :pin "fe3e4863bc971fbb81edad447efad5795ead1b17")) ;; Programming environment (package! rubocop :pin "f5fd18aa810c3d3269188cbbd731ddc09006f8f5") -(package! robe :pin "912ae2ba1f467bd55b2da64bfec9db3f8a723916") +(package! robe :pin "4ecd868da9adb8565b42976b6035e36bd928acfe") ;; Project tools (package! bundler :pin "43efb6be4ed118b06d787ce7fbcffd68a31732a7") @@ -20,7 +20,7 @@ ;; Environment management (when (modulep! +rbenv) - (package! rbenv :pin "2ea1a5bdc1266caef1dd77700f2c8f42429b03f1")) + (package! rbenv :pin "588b817d510737b9d6afd6d1ecddd517d96b78e5")) (when (modulep! +rvm) (package! rvm :pin "e1e83b5466c132c066142ac63729ba833c530c83")) (when (modulep! +chruby) @@ -28,7 +28,7 @@ ;; Testing frameworks (package! rspec-mode :pin "29df3d081c6a1cbdf840cd13d45ea1c100c5bbaa") -(package! minitest :pin "ddd152c990a528ad09a696bfad23afa4330ea4d7") +(package! minitest :pin "5999c45c047212cee15a2be67e78787776a79c35") ;; Rails (when (modulep! +rails) diff --git a/modules/lang/scala/packages.el b/modules/lang/scala/packages.el index ba727aef4..ac9483e98 100644 --- a/modules/lang/scala/packages.el +++ b/modules/lang/scala/packages.el @@ -2,7 +2,7 @@ ;;; lang/scala/packages.el (package! sbt-mode :pin "9fe1e8807c22cc1dc56a6233e000969518907f4d") -(package! scala-mode :pin "5d7cf21c37e345c49f921fe5111a49fd54efd1e0") +(package! scala-mode :pin "4c6d636b86e3bb1d95de819dc48dda92abdfbcf4") (when (and (modulep! +lsp) (not (modulep! :tools lsp +eglot))) diff --git a/modules/lang/scheme/packages.el b/modules/lang/scheme/packages.el index 5486dba71..14ac588d6 100644 --- a/modules/lang/scheme/packages.el +++ b/modules/lang/scheme/packages.el @@ -6,7 +6,7 @@ :recipe (:host gitlab :repo "flatwhatson/scheme-mode") :pin "51e586e5f1ddb5ea71d2cac8d401faf718c4627e")) -(when (package! geiser :pin "49d12a14482ce9a193c049a5ccdd2fed90b0bdbe") +(when (package! geiser :pin "bb77719c25831b11d9357786efd6cc016fcdf6f7") (package! macrostep-geiser :pin "f6a2d5bb96ade4f23df557649af87ebd0cc45125") (when (modulep! +chez) (package! geiser-chez :pin "605a81ff7b2d2b275a3ec68e3ce7e5b50f85014d")) @@ -19,7 +19,7 @@ (when (modulep! +gauche) (package! geiser-gauche :pin "8ff743f6416f00751e24aef8b9791501a40f5421")) (when (modulep! +guile) - (package! geiser-guile :pin "ee33af6b4ef8fdaccbdf93c62b50fe17c07a1ade") + (package! geiser-guile :pin "6e0811c75d13c3c8488e7a11a018e1ea2ae3288a") (when (and (modulep! :checkers syntax) (not (modulep! :checkers syntax +flymake))) (package! flycheck-guile diff --git a/modules/lang/sh/packages.el b/modules/lang/sh/packages.el index faa47fc2e..0780c17b9 100644 --- a/modules/lang/sh/packages.el +++ b/modules/lang/sh/packages.el @@ -5,7 +5,7 @@ (package! company-shell :pin "5f959a63a6e66eb0cbdac3168cad523a62cc2ccd")) (when (modulep! +fish) - (package! fish-mode :pin "6869efbc05cdb628209338bf57fe52742e53d956")) + (package! fish-mode :pin "2526b1803b58cf145bc70ff6ce2adb3f6c246f89")) (when (modulep! +powershell) (package! powershell :pin "f2da15857e430206e215a3c65289b4058ae3c976")) diff --git a/modules/lang/sml/packages.el b/modules/lang/sml/packages.el index 0bd58437e..9e57bd6c5 100644 --- a/modules/lang/sml/packages.el +++ b/modules/lang/sml/packages.el @@ -1,7 +1,7 @@ ;; -*- no-byte-compile: t; -*- ;;; lang/sml/packages.el -(package! sml-mode :pin "5426ff47382441cf079a75ab7fa0a1c90730bf09") +(package! sml-mode :pin "e5354371f361fb6b60e53d0e6743baf6088ad810") (when (modulep! :completion company) (package! company-mlton :recipe (:host github :repo "MatthewFluet/company-mlton" :files ("*.el" "*.basis")) diff --git a/modules/lang/web/packages.el b/modules/lang/web/packages.el index 53eeab9b6..53b0f1a35 100644 --- a/modules/lang/web/packages.el +++ b/modules/lang/web/packages.el @@ -3,10 +3,10 @@ ;; +html.el (package! emmet-mode :pin "63b6932603184956b5ea8919036d2b307b48d7fd") -(package! haml-mode :pin "fe83c65c1f002f7c36480b758727c1afbad9a1b2") +(package! haml-mode :pin "a64d58df8f098f858c6c11fa1629a90969f9c7e8") (package! pug-mode :pin "73f8c2f95eba695f701df20c8436f49abadebdc1") (package! slim-mode :pin "3636d18ab1c8b316eea71c4732eb44743e2ded87") -(when (package! web-mode :pin "57856ba64b9382811b35df0d9ab0a24aede0c1f0") +(when (package! web-mode :pin "82847071ce93293bdb7945db08d970f13fd883cf") (when (modulep! :completion company) (package! company-web :pin "863fb84b81ed283474e50330cd8d27b1ca0d74f1"))) @@ -17,7 +17,7 @@ (package! sass-mode :pin "247a0d4b509f10b28e4687cd8763492bca03599b") (package! stylus-mode :pin "1ad7c51f3c6a6ae64550d9510c5e4e8470014375") (package! sws-mode :pin "1ad7c51f3c6a6ae64550d9510c5e4e8470014375") -(package! rainbow-mode :pin "8e96388fb4d616a9dde23e712bad0d9cd048fbf0") +(package! rainbow-mode :pin "70ed10d410ef00c82c49b2ba41647930626d6218") (when (modulep! :completion ivy) (package! counsel-css :pin "8e9c0515fc952452eee786d8ebb43d48ea86c9f8")) (when (modulep! :completion helm) diff --git a/modules/lang/yaml/packages.el b/modules/lang/yaml/packages.el index fdeb4c393..e66cd0864 100644 --- a/modules/lang/yaml/packages.el +++ b/modules/lang/yaml/packages.el @@ -1,4 +1,4 @@ ;; -*- no-byte-compile: t; -*- ;;; lang/yaml/packages.el -(package! yaml-mode :pin "3fcb36d6039bef57e2a0f6e24c51f623c0bf5fb7") +(package! yaml-mode :pin "5b58248ab255dff6cfa4c4057a191bc4446ee5b6") From 75ff47aef03e65cb419c926a77e48635a25c9f5c Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Mon, 5 Feb 2024 16:42:41 -0500 Subject: [PATCH 32/49] bump: :app abo-abo/avy@955c8dedd68c -> abo-abo/avy@be612110cb11 emacs-circe/circe@57fe189d7c0b -> emacs-circe/circe@d374042741cf https://git.savannah.gnu.org/git/emms.git@43c614124922 -> https://git.savannah.gnu.org/git/emms.git@87d0d1fb0566 kidd/org-gcal.el@9bb3720525ad -> kidd/org-gcal.el@a2d16b372e5a remyhonig/elfeed-org@fe59a96969bd -> remyhonig/elfeed-org@d62d23e25c5e tecosaur/emacs-everywhere@b461c4b42093 -> tecosaur/emacs-everywhere@fbeff1982533 --- modules/app/calendar/packages.el | 2 +- modules/app/emms/packages.el | 2 +- modules/app/everywhere/packages.el | 2 +- modules/app/irc/packages.el | 2 +- modules/app/rss/packages.el | 2 +- modules/app/twitter/packages.el | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/app/calendar/packages.el b/modules/app/calendar/packages.el index 9a2cc06fe..d9054fed6 100644 --- a/modules/app/calendar/packages.el +++ b/modules/app/calendar/packages.el @@ -5,4 +5,4 @@ (package! calfw-org :pin "03abce97620a4a7f7ec5f911e669da9031ab9088") (package! calfw-cal :pin "03abce97620a4a7f7ec5f911e669da9031ab9088") (package! calfw-ical :pin "03abce97620a4a7f7ec5f911e669da9031ab9088") -(package! org-gcal :pin "9bb3720525ad1c45823abab8ce910dd1225e7dcd") +(package! org-gcal :pin "a2d16b372e5a5972d8cc343cf999ee5f0ba1eea7") diff --git a/modules/app/emms/packages.el b/modules/app/emms/packages.el index 9a43d1747..60ec5f81c 100644 --- a/modules/app/emms/packages.el +++ b/modules/app/emms/packages.el @@ -1,4 +1,4 @@ ;; -*- no-byte-compile: t; -*- ;;; app/emms/packages.el -(package! emms :pin "43c61412492229eb641fe572c89c826d8fcf64d9") +(package! emms :pin "87d0d1fb0566a80229029d0d8d7c863138d70aae") diff --git a/modules/app/everywhere/packages.el b/modules/app/everywhere/packages.el index 2f1ceee2f..91e7e4040 100644 --- a/modules/app/everywhere/packages.el +++ b/modules/app/everywhere/packages.el @@ -1,4 +1,4 @@ ;; -*- no-byte-compile: t; -*- ;;; app/everywhere/packages.el -(package! emacs-everywhere :pin "b461c4b42093abc42e5ec0f73cb7021c2915cea8") +(package! emacs-everywhere :pin "fbeff19825336777dccaefedf3f376dd622cd294") diff --git a/modules/app/irc/packages.el b/modules/app/irc/packages.el index 97c41033a..299a83fba 100644 --- a/modules/app/irc/packages.el +++ b/modules/app/irc/packages.el @@ -1,5 +1,5 @@ ;; -*- no-byte-compile: t; -*- ;;; app/irc/packages.el -(package! circe :pin "57fe189d7c0b98b9b1b5a59767cea1c7e2c22b13") +(package! circe :pin "d374042741cfd0691135f215d311dca8b7a47d19") (package! circe-notifications :pin "291149ac12877bbd062da993479d3533a26862b0") diff --git a/modules/app/rss/packages.el b/modules/app/rss/packages.el index f486b1729..3e5c373dc 100644 --- a/modules/app/rss/packages.el +++ b/modules/app/rss/packages.el @@ -4,4 +4,4 @@ (package! elfeed :pin "55fb162fa27e71b88effa59a83c57842e262b00f") (package! elfeed-goodies :pin "544ef42ead011d960a0ad1c1d34df5d222461a6b") (when (modulep! +org) - (package! elfeed-org :pin "fe59a96969bd321f5f9ec7317a4bc80943b94c86")) + (package! elfeed-org :pin "d62d23e25c5e3be3d70b7fbe1eaeb6e43f93a061")) diff --git a/modules/app/twitter/packages.el b/modules/app/twitter/packages.el index ccdf1db9a..12533702a 100644 --- a/modules/app/twitter/packages.el +++ b/modules/app/twitter/packages.el @@ -2,4 +2,4 @@ ;;; app/twitter/packages.el (package! twittering-mode :pin "114891e8fdb4f06b1326a6cf795e49c205cf9e29") -(package! avy :pin "955c8dedd68c74f3cf692c1249513f048518c4c9") +(package! avy :pin "be612110cb116a38b8603df367942e2bb3d9bdbe") From 4cb06578fc8341cefe8793b3f370cd22e88ce37f Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Mon, 5 Feb 2024 16:44:07 -0500 Subject: [PATCH 33/49] bump: :completion DarwinAwardWinner/ido-completing-read-plus@49e7967ea8c0 -> DarwinAwardWinner/ido-completing-read-plus@5995b4605b4f company-mode/company-mode@ed46a616ab99 -> company-mode/company-mode@02903bd7088d emacs-helm/helm@96aad023cb12 -> emacs-helm/helm@f34ea6b70264 lewang/flx@7b44a5abb254 -> lewang/flx@4b1346eb9a8a mhayashi1120/Emacs-wgrep@3132abd3750b -> mhayashi1120/Emacs-wgrep@208b9d01cfff minad/consult@e4d371235647 -> minad/consult@9463146ba754 minad/vertico@cf8b2abf5207 -> minad/vertico@4a7da56b02c6 oantolin/embark@33c392cf3ce5 -> oantolin/embark@60139db8794f radian-software/prescient.el@707c25c947a9 -> radian-software/prescient.el@4b875be52e75 tumashu/vertico-posframe@bc0e67cbbba4 -> tumashu/vertico-posframe@2e0e09e5bbd6 --- modules/completion/company/packages.el | 2 +- modules/completion/helm/packages.el | 2 +- modules/completion/ido/packages.el | 4 ++-- modules/completion/ivy/packages.el | 6 +++--- modules/completion/vertico/packages.el | 10 +++++----- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/modules/completion/company/packages.el b/modules/completion/company/packages.el index d594c638b..43c389ea7 100644 --- a/modules/completion/company/packages.el +++ b/modules/completion/company/packages.el @@ -1,7 +1,7 @@ ;; -*- no-byte-compile: t; -*- ;;; completion/company/packages.el -(package! company :pin "ed46a616ab9906fd43a630479b6a6c3f79e606f0") +(package! company :pin "02903bd7088d65a87df0ae0f0d0a7118de147b69") (package! company-dict :pin "cd7b8394f6014c57897f65d335d6b2bd65dab1f4") (when (modulep! +childframe) (package! company-box :pin "b6f53e26adf948aca55c3ff6c22c21a6a6614253")) diff --git a/modules/completion/helm/packages.el b/modules/completion/helm/packages.el index f037a770b..d348d6437 100644 --- a/modules/completion/helm/packages.el +++ b/modules/completion/helm/packages.el @@ -1,7 +1,7 @@ ;; -*- no-byte-compile: t; -*- ;;; completion/helm/packages.el -(package! helm :pin "96aad023cb12e995e92763195086ccee3aa5a141") +(package! helm :pin "f34ea6b702648e5c7535a704bdb6c4d7afb4b3b8") (package! helm-company :pin "4622b82353220ee6cc33468f710fa5b6b253b7f1") (package! helm-c-yasnippet :pin "c5880e740da101fde7a995e94a7b16c330e57583") (package! helm-descbinds :pin "b72515982396b6e336ad7beb6767e95a80fca192") diff --git a/modules/completion/ido/packages.el b/modules/completion/ido/packages.el index 0a7213b07..8951a3ad9 100644 --- a/modules/completion/ido/packages.el +++ b/modules/completion/ido/packages.el @@ -1,8 +1,8 @@ ;; -*- no-byte-compile: t; -*- ;;; completion/ido/packages.el -(package! flx-ido :pin "7b44a5abb254bbfbeca7a29336f7f4ebd8aabbf2") -(package! ido-completing-read+ :pin "49e7967ea8c0ab0a206b40d70fc19be115083fa1") +(package! flx-ido :pin "4b1346eb9a8a76ee9c9dede69738c63ad97ac5b6") +(package! ido-completing-read+ :pin "5995b4605b4f2d568489491704ef21bc49ddecd5") (package! ido-sort-mtime :pin "f638ff0c922af862f5211779f2311a27fde428eb") (package! ido-vertical-mode :pin "b1659e967da0687abceca733b389ace24004fa66") (package! crm-custom :pin "f1aaccf64306a5f99d9bf7ba815d7ea41c15518d") diff --git a/modules/completion/ivy/packages.el b/modules/completion/ivy/packages.el index e170dc7a4..a5dce1fb1 100644 --- a/modules/completion/ivy/packages.el +++ b/modules/completion/ivy/packages.el @@ -10,12 +10,12 @@ (package! amx :pin "5b3aa1aae84f4a225cb8d26ab79a32f97693f023") (package! counsel-projectile :pin "40d1e1d4bb70acb00fddd6f4df9778bf2c52734b") (package! ivy-rich :pin "aff9b6bd53e0fdcf350ab83c90e64e651b47dba4") -(package! wgrep :pin "3132abd3750b8c87cbcf6942db952acfab5edccd") +(package! wgrep :pin "208b9d01cfffa71037527e3a324684b3ce45ddc4") (if (modulep! +prescient) - (package! ivy-prescient :pin "707c25c947a9f17a1d43f97b3b28aba91ec9addb") + (package! ivy-prescient :pin "4b875be52e75f7b81e68a16b62cfbb2f2584042c") (when (modulep! +fuzzy) - (package! flx :pin "7b44a5abb254bbfbeca7a29336f7f4ebd8aabbf2"))) + (package! flx :pin "4b1346eb9a8a76ee9c9dede69738c63ad97ac5b6"))) (when (modulep! +childframe) (package! ivy-posframe :pin "533a8e368fcabfd534761a5c685ce713376fa594")) diff --git a/modules/completion/vertico/packages.el b/modules/completion/vertico/packages.el index 0189e2357..348f43ce7 100644 --- a/modules/completion/vertico/packages.el +++ b/modules/completion/vertico/packages.el @@ -1,17 +1,17 @@ ;; -*- no-byte-compile: t; -*- ;;; completion/vertico/packages.el -(package! vertico :pin "cf8b2abf5207696c054c33214c86e3969d415054") +(package! vertico :pin "4a7da56b02c6aefff8f6b4574a530a7cb54bc21a") (package! orderless :pin "b24748093b00b37c3a572c4909f61c08fa27504f") -(package! consult :pin "e4d371235647a7f4967f093eff2125652796957c") +(package! consult :pin "9463146ba754103db9475ae56e46561366ba4773") (package! consult-dir :pin "3f5f4b71ebe819392cb090cda71bd39a93bd830a") (when (and (modulep! :checkers syntax) (not (modulep! :checkers syntax +flymake))) (package! consult-flycheck :pin "d83f87581af74f7a2739d8b1b90c37da5ae3d310")) -(package! embark :pin "33c392cf3ce5b92ad73ed5c4f44dbca5d0741cde") -(package! embark-consult :pin "33c392cf3ce5b92ad73ed5c4f44dbca5d0741cde") +(package! embark :pin "60139db8794f7e4a08076d9f7597d08f6c8083d1") +(package! embark-consult :pin "60139db8794f7e4a08076d9f7597d08f6c8083d1") (package! marginalia :pin "ea356ebb1ddb8d6da78574b517155475cf52d46f") @@ -23,4 +23,4 @@ (when (modulep! +childframe) (package! vertico-posframe :recipe (:host github :repo "tumashu/vertico-posframe") - :pin "bc0e67cbbba4daaf6ce7b8701a0dc7797d468752")) + :pin "2e0e09e5bbd6ec576ddbe566ab122575ef051fab")) From 792c41f638907e2515956d29c6aaf1f65ec39747 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Mon, 5 Feb 2024 17:16:50 -0500 Subject: [PATCH 34/49] bump: :email mu4e notmuch https://git.notmuchmail.org/git/notmuch@b6f144abe1f5 -> https://git.notmuchmail.org/git/notmuch@2f0320c5f24a jao/consult-notmuch@d0d4129d45cc -> jao/consult-notmuch@d8022e2ddc67 jeremy-compostella/org-msg@055de4abf611 -> jeremy-compostella/org-msg@0b65f0f77a7a org-mime/org-mime@d368bd4119bf -> org-mime/org-mime@9d4584651d89 tarsius/ol-notmuch@781c3518a537 -> tarsius/ol-notmuch@881991d94a1a --- modules/email/mu4e/packages.el | 2 +- modules/email/notmuch/packages.el | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/email/mu4e/packages.el b/modules/email/mu4e/packages.el index 352930640..6e0aa3fda 100644 --- a/modules/email/mu4e/packages.el +++ b/modules/email/mu4e/packages.el @@ -2,6 +2,6 @@ ;;; email/mu4e/packages.el (when (modulep! +org) - (package! org-msg :pin "055de4abf611c5d5e12c770fe149c1861b402817")) + (package! org-msg :pin "0b65f0f77a7a71881ddfce19a8cdc60465bda057")) (package! mu4e-alert :pin "6beda20fc69771f2778f507c4a9e069dbaf1b628") diff --git a/modules/email/notmuch/packages.el b/modules/email/notmuch/packages.el index aacc7e140..2ee3418d6 100644 --- a/modules/email/notmuch/packages.el +++ b/modules/email/notmuch/packages.el @@ -17,15 +17,15 @@ "??"))) (cdr (doom-call-process "git" "rev-parse" "HEAD"))) t t))) - :pin "b6f144abe1f5aa3519240cf52f4cb9907fefcd0e") + :pin "2f0320c5f24adfee026e938ebc379ca90e3045d3") (when (modulep! +org) - (package! org-mime :pin "d368bd4119bfcf2997a6a23bbf5f41e043164d29")) + (package! org-mime :pin "9d4584651d89806b79d5993b286d32d6f70499a9")) (when (modulep! :lang org) - (package! ol-notmuch :pin "781c3518a537da2a8b5e8a4424f9441df463a147")) + (package! ol-notmuch :pin "881991d94a1ad750633fcf1f2d8a9e0616979be3")) (when (modulep! :completion ivy) (package! counsel-notmuch :pin "a4a1562935e4180c42524c51609d1283e9be0688")) (when (modulep! :completion helm) (package! helm-notmuch :pin "97a01497e079a7b6505987e9feba6b603bbec288")) (when (modulep! :completion vertico) - (package! consult-notmuch :pin "d0d4129d45ccceddaeeaa3631eb42d5dd09a758b")) + (package! consult-notmuch :pin "d8022e2ddc67ed4e89cc6f5bbe664fdb04e1e815")) From e242ac9548487ae50857ec1b169a20d946019816 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Mon, 5 Feb 2024 17:17:22 -0500 Subject: [PATCH 35/49] bump: :emacs alexluigit/dirvish@4fe9c0089430 -> alexluigit/dirvish@119f9f59a618 emacs-straight/dired-git-info@9461476a28a5 -> emacs-straight/dired-git-info@6b6f2a5d716d emacs-straight/vundo@24271862a2f7 -> emacs-straight/vundo@10d011fb05a9 emacsmirror/git-timemachine@d8ffd0d7cc4a -> emacsmirror/git-timemachine@ac933e5cd295 ideasman42/emacs-undo-fu-session@a6c4f73bc224 -> ideasman42/emacs-undo-fu-session@2b355c9d39b2 ideasman42/emacs-undo-fu@0e74116fd5c7 -> ideasman42/emacs-undo-fu@04961ba77514 magit/git-modes@f0a0154bf48d -> magit/git-modes@4a61a9b86df9 magit/magit@48818355728c -> magit/magit@54d37dc14c3f purcell/diredfl@f9140b2c4215 -> purcell/diredfl@f6d599c30875 purcell/ibuffer-vc@1388d2ea1828 -> purcell/ibuffer-vc@66d02267334f rainstormstudio/nerd-icons-dired@4a068884bf86 -> rainstormstudio/nerd-icons-dired@c1c73488630c rmuslimov/browse-at-remote@c020975a8914 -> rmuslimov/browse-at-remote@76aa27dfd469 stsquad/dired-rsync@7940d9154d0a -> stsquad/dired-rsync@5bcb851f3bf9 --- modules/emacs/dired/packages.el | 10 +++++----- modules/emacs/ibuffer/packages.el | 2 +- modules/emacs/undo/packages.el | 6 +++--- modules/emacs/vc/packages.el | 8 ++++---- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/modules/emacs/dired/packages.el b/modules/emacs/dired/packages.el index 2bcecf0b9..340f87ceb 100644 --- a/modules/emacs/dired/packages.el +++ b/modules/emacs/dired/packages.el @@ -1,14 +1,14 @@ ;; -*- no-byte-compile: t; -*- ;;; emacs/dired/packages.el -(package! diredfl :pin "f9140b2c42151dca669003d685c9f079b2e3dc37") -(package! dired-git-info :pin "9461476a28a5fec0784260f6e318237c662c3430") -(package! dired-rsync :pin "7940d9154d0a908693999b0e1ea351a6d365c93d") +(package! diredfl :pin "f6d599c30875ab4894c1deab9713ff2faea54e06") +(package! dired-git-info :pin "6b6f2a5d716debba9a7dcac623d5a1e4c799eb62") +(package! dired-rsync :pin "5bcb851f3bf9c4f7c07299fcc25be7c408a68cda") (when (modulep! +ranger) (package! ranger :pin "2498519cb21dcd5791d240607a72a204d1761668")) (when (modulep! +dirvish) - (package! dirvish :pin "4fe9c00894304e99aca22ae4b6b656fe94b8f927")) + (package! dirvish :pin "119f9f59a618bb7b476c93e9ab1d7542c5c1df41")) (when (and (modulep! +icons) (not (modulep! +dirvish))) - (package! nerd-icons-dired :pin "4a068884bf86647d242c3adc8320cd603e15dac3")) + (package! nerd-icons-dired :pin "c1c73488630cc1d19ce1677359f614122ae4c1b9")) (package! fd-dired :pin "458464771bb220b6eb87ccfd4c985c436e57dc7e") diff --git a/modules/emacs/ibuffer/packages.el b/modules/emacs/ibuffer/packages.el index 0a2bc9401..5d8481d72 100644 --- a/modules/emacs/ibuffer/packages.el +++ b/modules/emacs/ibuffer/packages.el @@ -2,4 +2,4 @@ ;;; emacs/ibuffer/packages.el (package! ibuffer-projectile :pin "710ecac1578273bf31debe52870f5844472e3428") -(package! ibuffer-vc :pin "1388d2ea18287c74a79d053619dbdfa9090c26a2") +(package! ibuffer-vc :pin "66d02267334f536e978ed7f384f88bd04a3d4dbb") diff --git a/modules/emacs/undo/packages.el b/modules/emacs/undo/packages.el index a3bb404d6..1dbb71467 100644 --- a/modules/emacs/undo/packages.el +++ b/modules/emacs/undo/packages.el @@ -3,7 +3,7 @@ (if (modulep! +tree) (package! undo-tree :pin "f9e7eac16f674aa7ed8fa065401d26c0258a84f8") - (package! undo-fu :pin "0e74116fd5c7797811a91ba4eadef50d67523eb6") - (package! undo-fu-session :pin "a6c4f73bc22401fd36e0f2fd4fe058bb28566d84") + (package! undo-fu :pin "04961ba775142627c5fa4bb94c3e507afedaecd1") + (package! undo-fu-session :pin "2b355c9d39b2688f859a762f2289f23fd16fadc4") (when (> emacs-major-version 27) ; unsupported in 27 - (package! vundo :pin "24271862a2f746be038306eafe20f5eff55c4566"))) + (package! vundo :pin "10d011fb05a9db0cc2f641e5b5bebe4b5fb81b6f"))) diff --git a/modules/emacs/vc/packages.el b/modules/emacs/vc/packages.el index 39ad6dc4c..c9ddf918b 100644 --- a/modules/emacs/vc/packages.el +++ b/modules/emacs/vc/packages.el @@ -5,10 +5,10 @@ (package! vc-annotate :built-in t) (package! smerge-mode :built-in t) -(package! browse-at-remote :pin "c020975a891438e278ad1855213d4f3d62c9fccb") -(package! git-commit :pin "48818355728c48d986d74dde8b1e9fba25f0fd53") +(package! browse-at-remote :pin "76aa27dfd469fcae75ed7031bb73830831aaccbf") +(package! git-commit :pin "54d37dc14c3f715dd0328a70bc65d63c54ee9613") (package! git-timemachine ;; The original lives on codeberg.org; which has uptime issues. :recipe (:host github :repo "emacsmirror/git-timemachine") - :pin "d8ffd0d7cc4ab3dd7de494c9ea36dfd99e2744fa") -(package! git-modes :pin "f0a0154bf48dd1c0c587596cf4cfd3c90f673a05") + :pin "ac933e5cd29583c131401f3bd991d98129c316df") +(package! git-modes :pin "4a61a9b86df9c824a99c522f42d55e68faf85f91") From 83f5c4f81844364733f09a545807585161036e91 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Mon, 5 Feb 2024 17:18:13 -0500 Subject: [PATCH 36/49] bump: :input cute-jumper/fcitx.el@12dc2638ddd1 -> cute-jumper/fcitx.el@b399482ed8db emacs-jp/migemo@f756cba3d526 -> emacs-jp/migemo@7d78901773da laishulu/evil-pinyin@3e9e501ded86 -> laishulu/evil-pinyin@0fae5ad87614 merrickluo/liberime@8291e22cd099 -> merrickluo/liberime@cc9eb9812fd6 skk-dev/ddskk@c24a624884a3 -> skk-dev/ddskk@8c47f46e38a2 tumashu/posframe@0d23bc5f7cfa -> tumashu/posframe@017deece8836 tumashu/pyim@de7eff2a58d8 -> tumashu/pyim@64067b20ce0e --- modules/input/chinese/packages.el | 10 +++++----- modules/input/japanese/packages.el | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/modules/input/chinese/packages.el b/modules/input/chinese/packages.el index 017036a52..880d648d5 100644 --- a/modules/input/chinese/packages.el +++ b/modules/input/chinese/packages.el @@ -1,15 +1,15 @@ ;; -*- no-byte-compile: t; -*- ;;; input/chinese/packages.el -(package! pyim :pin "de7eff2a58d88b168e35c3c81484ea874991391c") -(package! fcitx :pin "12dc2638ddd15c8f6cfaecb20e1f428ab2bb5624") +(package! pyim :pin "64067b20ce0e964b1342b378180f24a1d4503797") +(package! fcitx :pin "b399482ed8db5893db2701df01db4c38cccda495") (package! ace-pinyin :pin "47662c0b05775ba353464b44c0f1a037c85e746e") (package! pangu-spacing :pin "2303013e5cd7852136f1429162fea0e1c8cb0221") (when (modulep! +rime) - (package! liberime :pin "8291e22cd0990a99cb2f88ca67a9065a157f39af")) + (package! liberime :pin "cc9eb9812fd6f68e78ed6a0c0a85da7a18765753")) (when (modulep! +childframe) - (package! posframe :pin "0d23bc5f7cfac00277d83ae7ba52c48685bcbc68")) + (package! posframe :pin "017deece88360c7297265680d78a0bb316470716")) (when (modulep! :editor evil +everywhere) (package! evil-pinyin :recipe (:build (:not autoloads)) - :pin "3e9e501ded86f88e01a4edec5d526ab0fab879d7")) + :pin "0fae5ad8761417f027b33230382a50f826ad3bfb")) diff --git a/modules/input/japanese/packages.el b/modules/input/japanese/packages.el index fe0d143fa..a90f2e494 100644 --- a/modules/input/japanese/packages.el +++ b/modules/input/japanese/packages.el @@ -1,7 +1,7 @@ ;; -*- no-byte-compile: t; -*- ;;; input/japanese/packages.el -(package! migemo :pin "f756cba3d5268968da361463c2e29b3a659a3de7") +(package! migemo :pin "7d78901773da3b503e5c0d5fa14a53ad6060c97f") (package! avy-migemo :pin "922a6dd82c0bfa316b0fbb56a9d4dd4ffa5707e7") -(package! ddskk :pin "c24a624884a3cfb0c28d6d5b9eb19e01387f0917") +(package! ddskk :pin "8c47f46e38a29a0f3eabcd524268d20573102467") (package! pangu-spacing :pin "2303013e5cd7852136f1429162fea0e1c8cb0221") From 36385091e89206dda7a8453cd90345fdba5442b2 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Mon, 5 Feb 2024 17:18:58 -0500 Subject: [PATCH 37/49] bump: :os tty 7696122/evil-terminal-cursor-changer@12ea9c0438c6 -> 7696122/evil-terminal-cursor-changer@2358f3e27d89 emacs-straight/xclip@a1ac607f75a2 -> emacs-straight/xclip@2dfa5fa17544 - evil-terminal-cursor-changer added kitty support --- modules/os/tty/packages.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/os/tty/packages.el b/modules/os/tty/packages.el index 71638a86e..26b559c0b 100644 --- a/modules/os/tty/packages.el +++ b/modules/os/tty/packages.el @@ -6,8 +6,8 @@ :recipe (:host github :repo "spudlyo/clipetty") :pin "01b39044b9b65fa4ea7d3166f8b1ffab6f740362") ;; Despite its name, this works for macOS as well. - (package! xclip :pin "a1ac607f75a250dddf49866918bb493884451130")) + (package! xclip :pin "2dfa5fa1754470253fc106b8bd55d9b2bd6702fe")) ;; NOTE Despite the evil-* prefix, evil-terminal-cursor-changer does not depend ;; on evil (anymore). -(package! evil-terminal-cursor-changer :pin "12ea9c0438c67e560b3866dc78b5c7d1d93f8cc5") +(package! evil-terminal-cursor-changer :pin "2358f3e27d89128361cf80fcfa092fdfe5b52fd8") From 7afc21a65262cd52b1a35bd2ee8e5d0321a6fbe9 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Mon, 5 Feb 2024 19:13:46 -0500 Subject: [PATCH 38/49] fix(magit): remove lazy emacsqlite build hack This was resolved upstream some time ago and is now a source of errors (void-variable emacsql-sqlite-executable errors) if forge were ever bumped (which it was, yesterday, in 1a05e2f). Ref: magit/forge@398ca3a17a3f Amend: 1a05e2fa6429 --- modules/tools/magit/config.el | 30 +----------------------------- 1 file changed, 1 insertion(+), 29 deletions(-) diff --git a/modules/tools/magit/config.el b/modules/tools/magit/config.el index 988cd2143..10a5d221d 100644 --- a/modules/tools/magit/config.el +++ b/modules/tools/magit/config.el @@ -157,35 +157,7 @@ Only has an effect in GUI Emacs.") :map magit-remote-section-map [remap magit-browse-thing] #'forge-browse-remote :map magit-branch-section-map [remap magit-browse-thing] #'forge-browse-branch)) (set-popup-rule! "^\\*?[0-9]+:\\(?:new-\\|[0-9]+$\\)" :size 0.45 :modeline t :ttl 0 :quit nil) - (set-popup-rule! "^\\*\\(?:[^/]+/[^ ]+ #[0-9]+\\*$\\|Issues\\|Pull-Requests\\|forge\\)" :ignore t) - - (defadvice! +magit--forge-get-repository-lazily-a (&rest _) - "Make `forge-get-repository' return nil if the binary isn't built yet. -This prevents emacsql getting compiled, which appears to come out of the blue -and blocks Emacs for a short while." - :before-while #'forge-get-repository - (file-executable-p emacsql-sqlite-executable)) - - (defadvice! +magit--forge-build-binary-lazily-a (&rest _) - "Make `forge-dispatch' only build emacsql if necessary. -Annoyingly, the binary gets built as soon as Forge is loaded. Since we've -disabled that in `+magit--forge-get-repository-lazily-a', we must manually -ensure it is built when we actually use Forge." - :before #'forge-dispatch - (unless (file-executable-p emacsql-sqlite-executable) - (emacsql-sqlite-compile 2) - (if (not (file-executable-p emacsql-sqlite-executable)) - (message (concat "Failed to build emacsql; forge may not work correctly.\n" - "See *Compile-Log* buffer for details")) - ;; HACK Due to changes upstream, forge doesn't initialize completely if - ;; it doesn't find `emacsql-sqlite-executable', so we have to do it - ;; manually after installing it. - (setq forge--sqlite-available-p t) - (magit-add-section-hook 'magit-status-sections-hook 'forge-insert-pullreqs nil t) - (magit-add-section-hook 'magit-status-sections-hook 'forge-insert-issues nil t) - (after! forge-topic - (dolist (hook forge-bug-reference-hooks) - (add-hook hook #'forge-bug-reference-setup))))))) + (set-popup-rule! "^\\*\\(?:[^/]+/[^ ]+ #[0-9]+\\*$\\|Issues\\|Pull-Requests\\|forge\\)" :ignore t)) (use-package! code-review From d124c7d19c5910ee4b66d2a41ac2fdfe93ed5bd5 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Mon, 5 Feb 2024 19:15:29 -0500 Subject: [PATCH 39/49] bump: code-review doomelpa/code-review@26f426e99221 -> doomelpa/code-review@2670a4beb663 Improves closql compatibility. Ref: doomelpa/code-review#2 --- modules/tools/magit/packages.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/tools/magit/packages.el b/modules/tools/magit/packages.el index a3acd6227..2fe19978f 100644 --- a/modules/tools/magit/packages.el +++ b/modules/tools/magit/packages.el @@ -8,5 +8,5 @@ :recipe (:host github :repo "doomelpa/code-review" :files ("graphql" "code-review*.el")) - :pin "c34ff1ee64c7ecb654635bee4e2c147b10c66297")) + :pin "2670a4beb6636e6ee596c5b7cb5e784cf33d5a98")) (package! magit-todos :pin "debb77b3589f2d83c8b43706edc1f8f90bf1ad91")) From bd6a382b1804e8193932f68ac6a95a6aca0beaa1 Mon Sep 17 00:00:00 2001 From: Filipe Regadas Date: Tue, 6 Feb 2024 00:29:24 +0000 Subject: [PATCH 40/49] fix(dired): void-variable dired-omit-files error Caused by a recent bump to :emacs dired (see e242ac9). Fix: #6562 Amend: e242ac954848 --- modules/emacs/dired/config.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/emacs/dired/config.el b/modules/emacs/dired/config.el index 11eab8a36..b23fc20f2 100644 --- a/modules/emacs/dired/config.el +++ b/modules/emacs/dired/config.el @@ -137,6 +137,7 @@ we have to clean it up ourselves." :init (after! dired (dirvish-override-dired-mode)) :hook (dired-mode . dired-omit-mode) :config + (require 'dired-x) (setq dirvish-cache-dir (concat doom-cache-dir "dirvish/") dirvish-hide-details nil dirvish-attributes '(git-msg) @@ -171,7 +172,6 @@ we have to clean it up ourselves." (use-package! dired-x - :unless (modulep! +dirvish) :unless (modulep! +ranger) :hook (dired-mode . dired-omit-mode) :config From ba09e4323ad629ca0ef86e58f43fab976f88b8c4 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Mon, 5 Feb 2024 20:02:06 -0500 Subject: [PATCH 41/49] bump: :core bbatsov/projectile@9446ea92d284 -> bbatsov/projectile@e45f0b0cc43f domtronn/all-the-icons.el@be9d5dcda9c8 -> domtronn/all-the-icons.el@ee414384938c emacs-compat/compat@ea8de2ea18cf -> emacs-compat/compat@eb8fbfa5582a emacs-straight/project@f64bcf065c07 -> emacs-straight/project@10a6b691e36f jscheid/dtrt-indent@e0630f74f915 -> jscheid/dtrt-indent@0230ec503283 noctuid/general.el@833dea2c4a60 -> noctuid/general.el@bda777cd303d rainstormstudio/nerd-icons.el@e109d09b9570 -> rainstormstudio/nerd-icons.el@c6a4acf19454 --- lisp/packages.el | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/lisp/packages.el b/lisp/packages.el index 07c83ce38..0020e1c61 100644 --- a/lisp/packages.el +++ b/lisp/packages.el @@ -20,8 +20,8 @@ :pin "b3760f5829dba37e855add7323304561eb57a3d4") ;; doom-ui.el -(package! all-the-icons :pin "be9d5dcda9c892e8ca1535e288620eec075eb0be") -(package! nerd-icons :pin "e109d09b95706bb93c821b1229ca09cf00195690") +(package! all-the-icons :pin "ee414384938ccf2ce93c77d717b85dc5538a257d") +(package! nerd-icons :pin "c6a4acf19454b415cba1c43daf4bfca8fccdd9ba") (package! hide-mode-line :pin "bc5d293576c5e08c29e694078b96a5ed85631942") (package! highlight-numbers :pin "8b4744c7f46c72b1d3d599d4fb75ef8183dee307") (package! rainbow-delimiters :pin "f40ece58df8b2f0fb6c8576b527755a552a5e763") @@ -29,7 +29,7 @@ ;; doom-editor.el (package! better-jumper :pin "47622213783ece37d5337dc28d33b530540fc319") -(package! dtrt-indent :pin "e0630f74f915c6cded05f76f66d66e540fcc37c3") +(package! dtrt-indent :pin "0230ec503283b895bd3df6c1e30b35a01aa0b9af") (package! helpful :pin "a32a5b3d959a7fccf09a71d97b3d7c888ac31c69") (package! pcre2el :pin "018531ba0cf8e2b28d1108136a0e031b6a45f1c1") (package! smartparens :pin "0778a8a84064cf2bc3a9857bd0e7a4619cc1e5c3") @@ -40,13 +40,13 @@ :pin "572a10c11b6cb88293de48acbb59a059d36f9ba5") ;; doom-projects.el -(package! projectile :pin "9446ea92d28462aeb37846a8be0a0c97a7bc0cee") -(package! project :pin "f64bcf065c0731caecbdcff5ca1c7f2d711b5b1e") +(package! projectile :pin "e45f0b0cc43fdc066e7971ff3ed3bf4c78015ed0") +(package! project :pin "10a6b691e36ff897fb2a4b48896e08818afa77b0") ;; doom-keybinds.el -(package! general :pin "833dea2c4a60e06fcd552b653dfc8960935c9fb4") +(package! general :pin "bda777cd303db217fd2fbf2087eff40ec4aafda1") (package! which-key :pin "4d20bc852545a2e602f59084a630f888542052b1") (package! compat :recipe (:host github :repo "emacs-compat/compat") - :pin "ea8de2ea18cf7c348aadb6eb2aeb2a9d840bd064") + :pin "eb8fbfa5582a8e5880e2eaa66d15d498bca6a45a") From 5108a79b2567da9b18f5bdbe25716da0ab380351 Mon Sep 17 00:00:00 2001 From: Luigi Sartor Piucco Date: Sat, 24 Sep 2022 17:33:32 -0300 Subject: [PATCH 42/49] module: add :completion corfu This commit's primary goal is allowing use of [minad/corfu](https://github.com/minad/corfu) as an alternative to [company](https://github.com/company-mode/company-mode). It introduces a module under :completion for this purpose, plus some conditionals on other relevant modules to toggle functionality like lsp back-ends and [minad/cape](https://github.com/minad/cape) capfs for certain modes. Other optional or miscellaneous features include: - Support for displaying the completion's documentation on a secondary popup; - Support for terminal display if :os tty; - Support for icons if +icons; - Support for tab-and-go completion if +tng; --- modules/completion/corfu/README.org | 155 +++++++++++++++++++++++++++ modules/completion/corfu/autoload.el | 10 ++ modules/completion/corfu/config.el | 115 ++++++++++++++++++++ modules/completion/corfu/packages.el | 11 ++ modules/tools/lsp/+lsp.el | 5 +- 5 files changed, 295 insertions(+), 1 deletion(-) create mode 100644 modules/completion/corfu/README.org create mode 100644 modules/completion/corfu/autoload.el create mode 100644 modules/completion/corfu/config.el create mode 100644 modules/completion/corfu/packages.el diff --git a/modules/completion/corfu/README.org b/modules/completion/corfu/README.org new file mode 100644 index 000000000..f300bde8c --- /dev/null +++ b/modules/completion/corfu/README.org @@ -0,0 +1,155 @@ +#+title: :completion corfu +#+subtitle: Complete with cap(f), cape and a flying feather +#+created: September 9, 2022 +#+since: 3.0.0 (#7002) + +* Description :unfold: +This module provides code completion, powered by [[doom-package:corfu]]. + +It is recommended to enable either this or [[doom-module::completion company]], in +case you desire pre-configured auto-completion. Corfu is much lighter weight and +focused, plus it's built on native Emacs functionality, whereas company is heavy +and highly non-native, but has some extra features and more maturity. + +** Maintainers +- [[doom-user:][@LuigiPiucco]] + +[[doom-contrib-maintainer:][Become a maintainer?]] + +** Module flags +- +icons :: + Display icons beside completion suggestions. +- +tng :: + Known as Tab'n'Go to Company users, changes behavior to invoke completion on + [[kbd:][TAB]]. When Corfu is active, [[kbd:][TAB]] and [[kbd:][S-TAB]] will navigate the completion + candidates. Arrow keys and evil-style movement are still supported. +- +orderless :: + Pull in [[doom-package:orderless]] if necessary and apply multi-component + completion (still needed if [[doom-module::completion vertico]] is active). + +** Packages +- [[doom-package:corfu]] +- [[doom-package:cape]] +- [[doom-package:nerd-icons-corfu]] if [[doom-module::completion corfu +icons]] +- [[doom-package:orderless]] if [[doom-module::completion corfu +orderless]] +- [[doom-package:corfu-terminal]] if [[doom-module::os tty]] + +** Hacks +/No hacks documented for this module./ + +** TODO Changelog +# This section will be machine generated. Don't edit it by hand. +/This module does not have a changelog yet./ + +* Installation +Enable this module in your ~doom!~ block. + +This module has no direct requirements, but some languages may have their own +requirements to fulfill before you get code completion in them (and some +languages may lack code completion support altogether). Run ~$ doom doctor~ to +find out if you're missing any dependencies. Note that Corfu may have support +for completions in languages that have no development intelligence, since it +supports generic, context insensitive candidates such as file names or recurring +words. + +* TODO Usage +#+begin_quote + 🔨 /This module's usage documentation is incomplete./ [[doom-contrib-module:][Complete it?]] +#+end_quote + +** Code completion +By default, completion gets triggered after typing 2 non-space consecutive +characters, or by means of the [[kbd:][C-SPC]] keybinding at any moment. While the popup +is visible, the following relevant keys are available: + +| Keybind | Description | +|----------+------------------------------------------------------------------| +| [[kbd:][]] | Go to next candidate | +| [[kbd:][]] | Go to previous candidate | +| [[kbd:][C-n]] | Go to next candidate | +| [[kbd:][C-p]] | Go to previous candidate | +| [[kbd:][C-j]] | (evil) Go to next candidate | +| [[kbd:][C-k]] | (evil) Go to previous candidate | +| [[kbd:][C-]] | Go to next doc line | +| [[kbd:][C-]] | Go to previous doc line | +| [[kbd:][C-S-n]] | Go to next doc line | +| [[kbd:][C-S-p]] | Go to previous doc line | +| [[kbd:][C-S-j]] | (evil) Go to next doc line | +| [[kbd:][C-S-k]] | (evil) Go to previous doc line | +| [[kbd:][C-h]] | Toggle documentation (if available) | +| [[kbd:][M-m]] | Export to minibuffer (if [[doom-module::completion vertico]]) | +| [[kbd:][M-S-j]] | (evil) Export to minibuffer (if [[doom-module::completion vertico]]) | +| [[kbd:][RET]] | Insert candidate | +| [[kbd:][SPC]] | (after wildcard) Reset completion | +| [[kbd:][DEL]] | Reset completion | +| [[kbd:][C-SPC]] | Complete (unless [[doom-module::completion corfu +tng]]) | +| [[kbd:][C-SPC]] | (when completing) Insert separator DWIM (see below) | + +If you prefer a [[kbd:][TAB]]-centric completion style, enable the [[doom-module::completion +corfu +tng]] flag so that, instead, you trigger completion with [[kbd:][TAB]], getting the +following additional binds: + +| Keybind | Description | +|---------+-----------------------------------------------| +| [[kbd:][TAB]] | Complete | +| [[kbd:][TAB]] | (when completing) Go to next candidate | +| [[kbd:][S-TAB]] | (when completing) Go to previous candidate | + +** Searching with multiple keywords +If the [[doom-module::completion corfu +orderless]] flag is enabled, users can +perform code completion with multiple search keywords by use of space as the +separator. More information can be found [[https://github.com/oantolin/orderless#company][here]]. Pressing [[kdb:][C-SPC]] again while +completing inserts a space as separator. This allows searching with +space-separated terms; each piece will match individually and in any order, with +smart casing. Pressing just [[kbd:][SPC]] acts as normal and quits completion, so that +when typing sentences it doesn't try to complete the whole sentence instead of +just the word. + +Additionally, for users of evil and regular corfu style, [[kdb:][C-SPC]] is smart +regarding your state. In normal-like states, enter insert then start corfu; in +visual-like states, perform [[help:evil-change][evil-change]] (which leaves you in insert state) then +start corfu; in insert-like states, start corfu immediatelly. + +** Exporting to the minibuffer (requires [[doom-module::completion vertico]]) +When using the [[doom-module::completion vertico]] module, which pulls in the +[[doom-package:consult]] package, the entries shown in the completion popup can be +exported to a consult minibuffer, giving access to all the manipulations the +Vertico suite allows. For instance, one could use this to export with +[[doom-package:embark]] via [[kbd:][C-c C-l]] and get a buffer with all candidates. + +* Configuration +A few variables may be set to change behavior of this module: + +- [[var:corfu-auto-delay]] :: + Number of seconds till completion occurs automatically. Defaults to 0.1. +- [[var:corfu-auto-prefix]] :: + Number of characters till auto-completion starts to happen. Defaults to 2. +- [[var:corfu-on-exact-match]] :: + Configures behavior for exact matches. Its default is nil, and it's + recommended to leave it at that. Otherwise, single matches on snippet keys + expand immediately. + +** Adding CAPFs to a mode +To add other CAPFs on a mode-per-mode basis, put either of the following in your +~config.el~: + +#+begin_src emacs-lisp +(add-hook! some-mode (add-to-list 'completion-at-point-functions #'some-capf)) +;; OR, but note the different call signature +(add-hook 'some-mode-hook (lambda () (add-to-list 'completion-at-point-functions #'some-capf))) +#+end_src + +~DEPTH~ above is an integer between -100, 100, and defaults to 0 of omitted. Also +see ~add-hook!~'s documentation for additional ways to call it. ~add-hook~ only +accepts the quoted arguments form above. + +* Troubleshooting +[[doom-report:][Report an issue?]] + +* Frequently asked questions +/This module has no FAQs yet./ [[doom-suggest-faq:][Ask one?]] + +* TODO Appendix +#+begin_quote + 🔨 This module has no appendix yet. [[doom-contrib-module:][Write one?]] +#+end_quote diff --git a/modules/completion/corfu/autoload.el b/modules/completion/corfu/autoload.el new file mode 100644 index 000000000..c34cb8232 --- /dev/null +++ b/modules/completion/corfu/autoload.el @@ -0,0 +1,10 @@ +;;; completion/corfu/autoload.el -*- lexical-binding: t; -*- + +;;;###autoload +(defun +corfu-move-to-minibuffer () + ;; Taken from corfu's README. + ;; TODO: extend this to other completion front-ends. + (interactive) + (let ((completion-extra-properties corfu--extra) + (completion-cycle-threshold completion-cycling)) + (apply #'consult-completion-in-region completion-in-region--data))) diff --git a/modules/completion/corfu/config.el b/modules/completion/corfu/config.el new file mode 100644 index 000000000..133286642 --- /dev/null +++ b/modules/completion/corfu/config.el @@ -0,0 +1,115 @@ +;;; completion/corfu/config.el -*- lexical-binding: t; -*- + +;; +;;; Packages +(use-package! corfu + :defer t + :hook (doom-first-input . global-corfu-mode) + :config + (setq corfu-auto t + corfu-auto-delay 0.1 + corfu-auto-prefix 2 + global-corfu-modes '((not + erc-mode + circe-mode + help-mode + gud-mode + vterm-mode) + t) + corfu-cycle t + corfu-separator (when (modulep! +orderless) ?\s) + corfu-preselect 'valid + corfu-count 16 + corfu-max-width 120 + corfu-preview-current 'insert + corfu-on-exact-match nil + corfu-quit-at-boundary (if (modulep! +orderless) 'separator t) + corfu-quit-no-match (if (modulep! +orderless) 'separator t) + ;; In the case of +tng, TAB should be smart regarding completion; + ;; However, it should otherwise behave like normal, whatever normal was. + tab-always-indent (if (modulep! +tng) 'complete tab-always-indent)) + (add-to-list 'completion-category-overrides `(lsp-capf (styles ,@completion-styles))) + + (map! :map corfu-mode-map + :e "C-M-i" #'completion-at-point + :i "C-SPC" #'completion-at-point + :n "C-SPC" (cmd! (call-interactively #'evil-insert-state) + (call-interactively #'completion-at-point)) + :v "C-SPC" (cmd! (call-interactively #'evil-change) + (call-interactively #'completion-at-point))) + (map! :unless (modulep! :editor evil) + :map corfu-mode-map + "C-M-i" #'completion-at-point) + + (after! evil + (add-hook 'evil-insert-state-exit-hook #'corfu-quit)) + + (when (modulep! +icons) + (add-to-list 'corfu-margin-formatters #'nerd-icons-corfu-formatter)) + + (map! :map corfu-map + [return] #'corfu-insert + "RET" #'corfu-insert) + (when (modulep! +orderless) + (map! :map corfu-map + "C-SPC" #'corfu-insert-separator)) + (when (modulep! +tng) + (map! :map corfu-map + [tab] #'corfu-next + [backtab] #'corfu-previous + "TAB" #'corfu-next + "S-TAB" #'corfu-previous) + (let ((cmds-del (cmds! (and (modulep! +tng) + (> corfu--index -1) + (eq corfu-preview-current 'insert)) + #'corfu-reset))) + (map! :map corfu-map + [backspace] cmds-del + "DEL" cmds-del))) + + (after! vertico + (map! :map corfu-map + "M-m" #'+corfu-move-to-minibuffer + (:when (modulep! :editor evil) + "M-J" #'+corfu-move-to-minibuffer)))) + +(use-package! cape + :defer t + :init + (add-hook! prog-mode + (defun +corfu-add-cape-file-h () + (add-to-list 'completion-at-point-functions #'cape-file))) + (add-hook! (org-mode markdown-mode) + (defun +corfu-add-cape-elisp-block-h () + (add-to-list 'completion-at-point-functions #'cape-elisp-block))) + (advice-add #'lsp-completion-at-point :around #'cape-wrap-noninterruptible)) + +(use-package! corfu-terminal + :when (not (display-graphic-p)) + :hook ((corfu-mode . corfu-terminal-mode))) + +;; +;;; Extensions + +(use-package! corfu-history + :hook ((corfu-mode . corfu-history-mode)) + :config + (after! savehist (add-to-list 'savehist-additional-variables 'corfu-history))) + + +(use-package! corfu-popupinfo + :hook ((corfu-mode . corfu-popupinfo-mode)) + :config + (setq corfu-popupinfo-delay '(0.5 . 1.0)) + (map! :map corfu-map + "C-" #'corfu-popupinfo-scroll-down + "C-" #'corfu-popupinfo-scroll-up + "C-S-p" #'corfu-popupinfo-scroll-down + "C-S-n" #'corfu-popupinfo-scroll-up + "C-h" #'corfu-popupinfo-toggle) + (map! :when (modulep! :editor evil) + :map corfu-popupinfo-map + ;; Reversed because popupinfo assumes opposite of what feels intuitive + ;; with evil. + "C-S-k" #'corfu-popupinfo-scroll-down + "C-S-j" #'corfu-popupinfo-scroll-up)) diff --git a/modules/completion/corfu/packages.el b/modules/completion/corfu/packages.el new file mode 100644 index 000000000..1620fcf99 --- /dev/null +++ b/modules/completion/corfu/packages.el @@ -0,0 +1,11 @@ +;; -*- no-byte-compile: t; -*- +;;; completion/corfu/packages.el + +(package! corfu :pin "24dccafeea114b1aec7118f2a8405b46aa0051e0") +(package! cape :pin "18a30f48bb8754421cb10dad99e0a406173d4551") +(when (modulep! +icons) + (package! nerd-icons-corfu :pin "7077bb76fefc15aed967476406a19dc5c2500b3c")) +(when (modulep! +orderless) + (package! orderless :pin "b24748093b00b37c3a572c4909f61c08fa27504f")) +(when (modulep! :os tty) + (package! corfu-terminal :pin "501548c3d51f926c687e8cd838c5865ec45d03cc")) diff --git a/modules/tools/lsp/+lsp.el b/modules/tools/lsp/+lsp.el index 5ae4a417d..96361aae4 100644 --- a/modules/tools/lsp/+lsp.el +++ b/modules/tools/lsp/+lsp.el @@ -138,8 +138,11 @@ server getting expensively restarted when reverting buffers." " ")) (add-to-list 'global-mode-string '(t (:eval lsp-modeline-icon)) - 'append)))))) + 'append))))) + (when (modulep! :completion corfu) + (setq lsp-completion-provider :none) + (add-hook 'lsp-mode-hook #'lsp-completion-mode))) (use-package! lsp-ui :hook (lsp-mode . lsp-ui-mode) From 6eda3ed1713702d17af1338f7a2831b6ba74c8d0 Mon Sep 17 00:00:00 2001 From: Luigi Sartor Piucco Date: Wed, 26 Jul 2023 19:57:21 -0300 Subject: [PATCH 43/49] feat(corfu): add snippets Yasnippet is now properly integrated! A previosly-unset default has now been given to `corfu-on-exact-match`. With snippets, it causes immediate expansion upon single match by default, so we set it to nil and recommend against changing it in the README. --- modules/completion/corfu/README.org | 3 ++- modules/completion/corfu/config.el | 8 ++++++++ modules/completion/corfu/packages.el | 2 ++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/modules/completion/corfu/README.org b/modules/completion/corfu/README.org index f300bde8c..534aa04a2 100644 --- a/modules/completion/corfu/README.org +++ b/modules/completion/corfu/README.org @@ -33,6 +33,7 @@ and highly non-native, but has some extra features and more maturity. - [[doom-package:nerd-icons-corfu]] if [[doom-module::completion corfu +icons]] - [[doom-package:orderless]] if [[doom-module::completion corfu +orderless]] - [[doom-package:corfu-terminal]] if [[doom-module::os tty]] +- [[doom-package:yasnippet-capf]] if [[doom-module::editor snippets]] ** Hacks /No hacks documented for this module./ @@ -50,7 +51,7 @@ languages may lack code completion support altogether). Run ~$ doom doctor~ to find out if you're missing any dependencies. Note that Corfu may have support for completions in languages that have no development intelligence, since it supports generic, context insensitive candidates such as file names or recurring -words. +words. Snippets may also appear in the candidate list if available. * TODO Usage #+begin_quote diff --git a/modules/completion/corfu/config.el b/modules/completion/corfu/config.el index 133286642..f3f91beba 100644 --- a/modules/completion/corfu/config.el +++ b/modules/completion/corfu/config.el @@ -84,6 +84,14 @@ (add-to-list 'completion-at-point-functions #'cape-elisp-block))) (advice-add #'lsp-completion-at-point :around #'cape-wrap-noninterruptible)) +(use-package! yasnippet-capf + :when (modulep! :editor snippets) + :defer t + :init + (add-hook! 'yas-minor-mode-hook + (defun +corfu-add-yasnippet-capf-h () + (add-hook 'completion-at-point-functions #'yasnippet-capf 30 t)))) + (use-package! corfu-terminal :when (not (display-graphic-p)) :hook ((corfu-mode . corfu-terminal-mode))) diff --git a/modules/completion/corfu/packages.el b/modules/completion/corfu/packages.el index 1620fcf99..ec9edc23f 100644 --- a/modules/completion/corfu/packages.el +++ b/modules/completion/corfu/packages.el @@ -9,3 +9,5 @@ (package! orderless :pin "b24748093b00b37c3a572c4909f61c08fa27504f")) (when (modulep! :os tty) (package! corfu-terminal :pin "501548c3d51f926c687e8cd838c5865ec45d03cc")) +(when (modulep! :editor snippets) + (package! yasnippet-capf :pin "a0a6b1c2bb6decdad5cf9b74202f0042f494a6ab")) From d26537536854a11790a13979965be234f2aa9b01 Mon Sep 17 00:00:00 2001 From: StrawberryTea Date: Mon, 30 Oct 2023 14:36:19 -0400 Subject: [PATCH 44/49] feat(corfu): more CAPFs and ergonomy changes Add various CAPFs from cape: - `cape-dabbrev`; - `cape-emoji`; - `cape-dict`; Fixed some CAPFs via cape: - Make non-exclusive, purified and silent `pcomplete-completions-at-point`; - Make non-exclusive and non-interruptable `lsp-completion-at-point`; - Make non-exclusive `eglot-completion-at-point`; - Make non-exclusive `comint-completion-at-point`; Fix and improve keybindings: - Smart `DEL`/`backspace` for `+tng`; - Smart `RET`; Add depth to CAPFs, allowing ordering to be adjustable. Enable in minibuffer. --- modules/completion/corfu/README.org | 64 ++++++++++++++++--------- modules/completion/corfu/config.el | 73 +++++++++++++++++++++++++++-- 2 files changed, 113 insertions(+), 24 deletions(-) diff --git a/modules/completion/corfu/README.org b/modules/completion/corfu/README.org index 534aa04a2..64935940e 100644 --- a/modules/completion/corfu/README.org +++ b/modules/completion/corfu/README.org @@ -26,6 +26,14 @@ and highly non-native, but has some extra features and more maturity. - +orderless :: Pull in [[doom-package:orderless]] if necessary and apply multi-component completion (still needed if [[doom-module::completion vertico]] is active). +- +dabbrev :: + Enable and configure [[doom-package:dabbrev]] as a close-to-universal CAPF + fallback. +- +dict :: + Enable and configure dictionary completion for text modes and related regions + in programming modes. +- +emoji :: + Enable and configure emoji completion via the emoji input method. ** Packages - [[doom-package:corfu]] @@ -63,26 +71,25 @@ By default, completion gets triggered after typing 2 non-space consecutive characters, or by means of the [[kbd:][C-SPC]] keybinding at any moment. While the popup is visible, the following relevant keys are available: -| Keybind | Description | -|----------+------------------------------------------------------------------| -| [[kbd:][]] | Go to next candidate | -| [[kbd:][]] | Go to previous candidate | -| [[kbd:][C-n]] | Go to next candidate | -| [[kbd:][C-p]] | Go to previous candidate | -| [[kbd:][C-j]] | (evil) Go to next candidate | -| [[kbd:][C-k]] | (evil) Go to previous candidate | -| [[kbd:][C-]] | Go to next doc line | -| [[kbd:][C-]] | Go to previous doc line | -| [[kbd:][C-S-n]] | Go to next doc line | -| [[kbd:][C-S-p]] | Go to previous doc line | -| [[kbd:][C-S-j]] | (evil) Go to next doc line | -| [[kbd:][C-S-k]] | (evil) Go to previous doc line | -| [[kbd:][C-h]] | Toggle documentation (if available) | +| Keybind | Description | +|----------+---------------------------------------------------------| +| [[kbd:][]] | Go to next candidate | +| [[kbd:][]] | Go to previous candidate | +| [[kbd:][C-n]] | Go to next candidate | +| [[kbd:][C-p]] | Go to previous candidate | +| [[kbd:][C-j]] | (evil) Go to next candidate | +| [[kbd:][C-k]] | (evil) Go to previous candidate | +| [[kbd:][C-]] | Go to next doc line | +| [[kbd:][C-]] | Go to previous doc line | +| [[kbd:][C-S-n]] | Go to next doc line | +| [[kbd:][C-S-p]] | Go to previous doc line | +| [[kbd:][C-S-j]] | (evil) Go to next doc line | +| [[kbd:][C-S-k]] | (evil) Go to previous doc line | +| [[kbd:][C-h]] | Toggle documentation (if available) | | [[kbd:][M-m]] | Export to minibuffer (if [[doom-module::completion vertico]]) | -| [[kbd:][M-S-j]] | (evil) Export to minibuffer (if [[doom-module::completion vertico]]) | -| [[kbd:][RET]] | Insert candidate | -| [[kbd:][SPC]] | (after wildcard) Reset completion | -| [[kbd:][DEL]] | Reset completion | +| [[kbd:][M-j]] | (evil) Export to minibuffer (if [[doom-module::completion vertico]]) | +| [[kbd:][RET]] | Insert candidate | +| [[kbd:][SPC]] | Quit autocompletion after a wildcard or pass-through | | [[kbd:][C-SPC]] | Complete (unless [[doom-module::completion corfu +tng]]) | | [[kbd:][C-SPC]] | (when completing) Insert separator DWIM (see below) | @@ -95,6 +102,7 @@ following additional binds: | [[kbd:][TAB]] | Complete | | [[kbd:][TAB]] | (when completing) Go to next candidate | | [[kbd:][S-TAB]] | (when completing) Go to previous candidate | +| [[kbd:][DEL]] | (when completing) Reset completion DWIM-style | ** Searching with multiple keywords If the [[doom-module::completion corfu +orderless]] flag is enabled, users can @@ -129,15 +137,18 @@ A few variables may be set to change behavior of this module: Configures behavior for exact matches. Its default is nil, and it's recommended to leave it at that. Otherwise, single matches on snippet keys expand immediately. +- [[var:+corfu-buffer-scanning-size-limit]] :: + Sets the maximum buffer size to be scanned by ~cape-dabbrev~. Defaults to 1 + MB. Set this if you are having performance problems using the CAPF. ** Adding CAPFs to a mode To add other CAPFs on a mode-per-mode basis, put either of the following in your ~config.el~: #+begin_src emacs-lisp -(add-hook! some-mode (add-to-list 'completion-at-point-functions #'some-capf)) +(add-hook! some-mode (add-hook 'completion-at-point-functions #'some-capf depth t)) ;; OR, but note the different call signature -(add-hook 'some-mode-hook (lambda () (add-to-list 'completion-at-point-functions #'some-capf))) +(add-hook 'some-mode-hook (lambda () (add-hook 'completion-at-point-functions #'some-capf depth t))) #+end_src ~DEPTH~ above is an integer between -100, 100, and defaults to 0 of omitted. Also @@ -147,6 +158,17 @@ accepts the quoted arguments form above. * Troubleshooting [[doom-report:][Report an issue?]] +If you have performance issues with ~cape-dabbrev~, the first thing I recommend +doing is to look at the list of buffers Dabbrev is scanning: + +#+begin_src emacs-lisp +(dabbrev--select-buffers) ; => (# #> # ...) +(length (dabbrev--select-buffers)) ; => 37 +#+end_src + +... and modify ~dabbrev-ignored-buffer-regexps~ or ~dabbrev-ignored-buffer-modes~ +accordingly. + * Frequently asked questions /This module has no FAQs yet./ [[doom-suggest-faq:][Ask one?]] diff --git a/modules/completion/corfu/config.el b/modules/completion/corfu/config.el index f3f91beba..9743b6946 100644 --- a/modules/completion/corfu/config.el +++ b/modules/completion/corfu/config.el @@ -1,5 +1,8 @@ ;;; completion/corfu/config.el -*- lexical-binding: t; -*- +(defvar +corfu-buffer-scanning-size-limit (* 1 1024 1024) ; 1 MB + "Size limit for a buffer to be scanned by `cape-dabbrev'.") + ;; ;;; Packages (use-package! corfu @@ -18,7 +21,7 @@ t) corfu-cycle t corfu-separator (when (modulep! +orderless) ?\s) - corfu-preselect 'valid + corfu-preselect (if (modulep! +tng) 'prompt 'valid) corfu-count 16 corfu-max-width 120 corfu-preview-current 'insert @@ -41,6 +44,13 @@ :map corfu-mode-map "C-M-i" #'completion-at-point) + (add-hook! 'minibuffer-setup-hook + (defun +corfu-enable-in-minibuffer () + "Enable Corfu in the minibuffer if `completion-at-point' is bound." + (when (where-is-internal #'completion-at-point (list (current-local-map))) + (setq-local corfu-echo-delay nil) + (corfu-mode +1)))) + (after! evil (add-hook 'evil-insert-state-exit-hook #'corfu-quit)) @@ -78,10 +88,67 @@ :init (add-hook! prog-mode (defun +corfu-add-cape-file-h () - (add-to-list 'completion-at-point-functions #'cape-file))) + (add-hook 'completion-at-point-functions #'cape-file -10 t))) (add-hook! (org-mode markdown-mode) (defun +corfu-add-cape-elisp-block-h () - (add-to-list 'completion-at-point-functions #'cape-elisp-block))) + (add-hook 'completion-at-point-functions #'cape-elisp-block 0 t))) + ;; Enable Dabbrev completion basically everywhere as a fallback. + (when (modulep! +dabbrev) + ;; Set up `cape-dabbrev' options. + (defun +dabbrev-friend-buffer-p (other-buffer) + (< (buffer-size other-buffer) +corfu-buffer-scanning-size-limit)) + (after! dabbrev + (setq cape-dabbrev-check-other-buffers t + dabbrev-friend-buffer-function #'+dabbrev-friend-buffer-p + dabbrev-ignored-buffer-regexps + '("^ " + "\\(TAGS\\|tags\\|ETAGS\\|etags\\|GTAGS\\|GRTAGS\\|GPATH\\)\\(<[0-9]+>\\)?") + dabbrev-upcase-means-case-search t) + (add-to-list 'dabbrev-ignored-buffer-modes 'pdf-view-mode) + + (add-hook! (prog-mode text-mode conf-mode comint-mode minibuffer-setup + eshell-mode) + (defun +corfu-add-cape-dabbrev-h () + (add-hook 'completion-at-point-functions #'cape-dabbrev 20 t))))) + ;; Complete emojis :). + (when (and (modulep! +emoji) (> emacs-major-version 28)) + (add-hook! (prog-mode conf-mode) + (defun +corfu-add-cape-emoji-h () + (add-hook 'completion-at-point-functions + (cape-capf-inside-faces + (cape-capf-prefix-length #'cape-emoji 1) + ;; Only call inside comments and docstrings. + 'tree-sitter-hl-face:doc 'font-lock-doc-face + 'font-lock-comment-face 'tree-sitter-hl-face:comment) + 10 t))) + (add-hook! text-mode + (defun +corfu-add-cape-emoji-text-h () + (add-hook 'completion-at-point-functions + (cape-capf-prefix-length #'cape-emoji 1) 10 t)))) + ;; Enable dictionary-based autocompletion. + (when (modulep! +dict) + (add-hook! (prog-mode conf-mode) + (defun +corfu-add-cape-dict-h () + (add-hook 'completion-at-point-functions + (cape-capf-inside-faces + ;; Only call inside comments and docstrings. + #'cape-dict 'tree-sitter-hl-face:doc 'font-lock-doc-face + 'font-lock-comment-face 'tree-sitter-hl-face:comment) + 40 t))) + (add-hook! text-mode + (defun +corfu-add-cape-dict-text-h () + (add-hook 'completion-at-point-functions #'cape-dict 40 t)))) + + ;; Make these capfs composable. + (advice-add #'comint-completion-at-point :around #'cape-wrap-nonexclusive) + (advice-add #'eglot-completion-at-point :around #'cape-wrap-nonexclusive) + (advice-add #'lsp-completion-at-point :around #'cape-wrap-nonexclusive) + (advice-add #'pcomplete-completions-at-point :around #'cape-wrap-nonexclusive) + ;; From the `cape' readme. Without this, Eshell autocompletion is broken on + ;; Emacs28. + (when (< emacs-major-version 29) + (advice-add 'pcomplete-completions-at-point :around #'cape-wrap-silent) + (advice-add 'pcomplete-completions-at-point :around #'cape-wrap-purify)) (advice-add #'lsp-completion-at-point :around #'cape-wrap-noninterruptible)) (use-package! yasnippet-capf From 1787d06a2a8d0b32ae08c68b72573d6941e18538 Mon Sep 17 00:00:00 2001 From: Luigi Sartor Piucco Date: Sun, 29 Oct 2023 14:31:13 -0300 Subject: [PATCH 45/49] feat(corfu, vertico): use equal orderless config This removes the old `&` separator for Vertico (does anyone use that instead of just space?) in favor of escapable space and unifies orderless config with Corfu. Also implements smart separator insert/escape/reset on `C-SPC` Co-authored-by: Liam Hupfer --- modules/completion/corfu/README.org | 39 +++++++++++++++------------- modules/completion/corfu/autoload.el | 15 +++++++++++ modules/completion/corfu/config.el | 33 +++++++++++------------ modules/completion/vertico/config.el | 2 +- 4 files changed, 54 insertions(+), 35 deletions(-) diff --git a/modules/completion/corfu/README.org b/modules/completion/corfu/README.org index 64935940e..fe9b09ee0 100644 --- a/modules/completion/corfu/README.org +++ b/modules/completion/corfu/README.org @@ -71,25 +71,25 @@ By default, completion gets triggered after typing 2 non-space consecutive characters, or by means of the [[kbd:][C-SPC]] keybinding at any moment. While the popup is visible, the following relevant keys are available: -| Keybind | Description | -|----------+---------------------------------------------------------| -| [[kbd:][]] | Go to next candidate | -| [[kbd:][]] | Go to previous candidate | -| [[kbd:][C-n]] | Go to next candidate | -| [[kbd:][C-p]] | Go to previous candidate | -| [[kbd:][C-j]] | (evil) Go to next candidate | -| [[kbd:][C-k]] | (evil) Go to previous candidate | -| [[kbd:][C-]] | Go to next doc line | -| [[kbd:][C-]] | Go to previous doc line | -| [[kbd:][C-S-n]] | Go to next doc line | -| [[kbd:][C-S-p]] | Go to previous doc line | -| [[kbd:][C-S-j]] | (evil) Go to next doc line | -| [[kbd:][C-S-k]] | (evil) Go to previous doc line | -| [[kbd:][C-h]] | Toggle documentation (if available) | +| Keybind | Description | +|----------+------------------------------------------------------------------| +| [[kbd:][]] | Go to next candidate | +| [[kbd:][]] | Go to previous candidate | +| [[kbd:][C-n]] | Go to next candidate | +| [[kbd:][C-p]] | Go to previous candidate | +| [[kbd:][C-j]] | (evil) Go to next candidate | +| [[kbd:][C-k]] | (evil) Go to previous candidate | +| [[kbd:][C-]] | Go to next doc line | +| [[kbd:][C-]] | Go to previous doc line | +| [[kbd:][C-S-n]] | Go to next doc line | +| [[kbd:][C-S-p]] | Go to previous doc line | +| [[kbd:][C-S-j]] | (evil) Go to next doc line | +| [[kbd:][C-S-k]] | (evil) Go to previous doc line | +| [[kbd:][C-h]] | Toggle documentation (if available) | | [[kbd:][M-m]] | Export to minibuffer (if [[doom-module::completion vertico]]) | | [[kbd:][M-j]] | (evil) Export to minibuffer (if [[doom-module::completion vertico]]) | -| [[kbd:][RET]] | Insert candidate | -| [[kbd:][SPC]] | Quit autocompletion after a wildcard or pass-through | +| [[kbd:][RET]] | Insert candidate | +| [[kbd:][SPC]] | Quit autocompletion after a wildcard or pass-through | | [[kbd:][C-SPC]] | Complete (unless [[doom-module::completion corfu +tng]]) | | [[kbd:][C-SPC]] | (when completing) Insert separator DWIM (see below) | @@ -112,7 +112,10 @@ completing inserts a space as separator. This allows searching with space-separated terms; each piece will match individually and in any order, with smart casing. Pressing just [[kbd:][SPC]] acts as normal and quits completion, so that when typing sentences it doesn't try to complete the whole sentence instead of -just the word. +just the word. Pressing [[kdb:][C-SPC]] with point after a separator escapes it with a +backslash, including the space in the search term, and pressing it with an +already escaped separator before point deletes it. Thus, you can cycle back if +you accidentaly press more than needed. Additionally, for users of evil and regular corfu style, [[kdb:][C-SPC]] is smart regarding your state. In normal-like states, enter insert then start corfu; in diff --git a/modules/completion/corfu/autoload.el b/modules/completion/corfu/autoload.el index c34cb8232..618aae42d 100644 --- a/modules/completion/corfu/autoload.el +++ b/modules/completion/corfu/autoload.el @@ -8,3 +8,18 @@ (let ((completion-extra-properties corfu--extra) (completion-cycle-threshold completion-cycling)) (apply #'consult-completion-in-region completion-in-region--data))) + +;;;###autoload +(defun +corfu-smart-sep-toggle-escape () + "Insert `corfu-separator' or toggle escape if it's already there." + (interactive) + (cond ((and (char-equal (char-before) corfu-separator) + (char-equal (char-before (1- (point))) ?\\)) + (save-excursion (delete-char -2))) + ((char-equal (char-before) corfu-separator) + (save-excursion (backward-char 1) + (insert-char ?\\))) + (t + ;; Without this corfu quits immediately. + (setq this-command #'corfu-insert-separator) + (call-interactively #'corfu-insert-separator)))) diff --git a/modules/completion/corfu/config.el b/modules/completion/corfu/config.el index 9743b6946..27caee357 100644 --- a/modules/completion/corfu/config.el +++ b/modules/completion/corfu/config.el @@ -57,26 +57,27 @@ (when (modulep! +icons) (add-to-list 'corfu-margin-formatters #'nerd-icons-corfu-formatter)) - (map! :map corfu-map - [return] #'corfu-insert - "RET" #'corfu-insert) - (when (modulep! +orderless) + (let ((cmds-del (cmds! (and (modulep! +tng) + (> corfu--index -1) + (eq corfu-preview-current 'insert)) + #'corfu-reset))) (map! :map corfu-map - "C-SPC" #'corfu-insert-separator)) - (when (modulep! +tng) - (map! :map corfu-map - [tab] #'corfu-next - [backtab] #'corfu-previous - "TAB" #'corfu-next - "S-TAB" #'corfu-previous) - (let ((cmds-del (cmds! (and (modulep! +tng) - (> corfu--index -1) - (eq corfu-preview-current 'insert)) - #'corfu-reset))) - (map! :map corfu-map + [return] #'corfu-insert + "RET" #'corfu-insert + (:when (modulep! +orderless) + " " #'+corfu-smart-sep-toggle-escape) + (:when (modulep! +tng) + [tab] #'corfu-next + [backtab] #'corfu-previous + "TAB" #'corfu-next + "S-TAB" #'corfu-previous [backspace] cmds-del "DEL" cmds-del))) + (when (modulep! +orderless) + (after! orderless + (setq orderless-component-separator #'orderless-escapable-split-on-space))) + (after! vertico (map! :map corfu-map "M-m" #'+corfu-move-to-minibuffer diff --git a/modules/completion/vertico/config.el b/modules/completion/vertico/config.el index f92bd85a2..f1037741b 100644 --- a/modules/completion/vertico/config.el +++ b/modules/completion/vertico/config.el @@ -107,7 +107,7 @@ orderless." ;; find-file etc. completion-category-overrides '((file (styles +vertico-basic-remote orderless partial-completion))) orderless-style-dispatchers '(+vertico-orderless-dispatch) - orderless-component-separator "[ &]") + orderless-component-separator #'orderless-escapable-split-on-space) ;; ...otherwise find-file gets different highlighting than other commands (set-face-attribute 'completions-first-difference nil :inherit nil)) From 76012e3959eb8231bb9f0f016bb56644284ee16b Mon Sep 17 00:00:00 2001 From: Luigi Sartor Piucco Date: Mon, 11 Dec 2023 19:12:54 -0300 Subject: [PATCH 46/49] fix(corfu): move binds to `:config default` Bindings were moved to the `:config default` module and some keys were adjusted to match Company/other modules. Small formatting issues and some apparently inintended nestings were corrected as well. --- modules/completion/corfu/README.org | 41 +++++++++---------- modules/completion/corfu/config.el | 50 +---------------------- modules/config/default/+emacs-bindings.el | 9 +++- modules/config/default/+evil-bindings.el | 50 ++++++++++++++++++----- modules/config/default/config.el | 49 ++++++++++++++++++++-- 5 files changed, 115 insertions(+), 84 deletions(-) diff --git a/modules/completion/corfu/README.org b/modules/completion/corfu/README.org index fe9b09ee0..ce7464cad 100644 --- a/modules/completion/corfu/README.org +++ b/modules/completion/corfu/README.org @@ -71,27 +71,26 @@ By default, completion gets triggered after typing 2 non-space consecutive characters, or by means of the [[kbd:][C-SPC]] keybinding at any moment. While the popup is visible, the following relevant keys are available: -| Keybind | Description | -|----------+------------------------------------------------------------------| -| [[kbd:][]] | Go to next candidate | -| [[kbd:][]] | Go to previous candidate | -| [[kbd:][C-n]] | Go to next candidate | -| [[kbd:][C-p]] | Go to previous candidate | -| [[kbd:][C-j]] | (evil) Go to next candidate | -| [[kbd:][C-k]] | (evil) Go to previous candidate | -| [[kbd:][C-]] | Go to next doc line | -| [[kbd:][C-]] | Go to previous doc line | -| [[kbd:][C-S-n]] | Go to next doc line | -| [[kbd:][C-S-p]] | Go to previous doc line | -| [[kbd:][C-S-j]] | (evil) Go to next doc line | -| [[kbd:][C-S-k]] | (evil) Go to previous doc line | -| [[kbd:][C-h]] | Toggle documentation (if available) | -| [[kbd:][M-m]] | Export to minibuffer (if [[doom-module::completion vertico]]) | -| [[kbd:][M-j]] | (evil) Export to minibuffer (if [[doom-module::completion vertico]]) | -| [[kbd:][RET]] | Insert candidate | -| [[kbd:][SPC]] | Quit autocompletion after a wildcard or pass-through | -| [[kbd:][C-SPC]] | Complete (unless [[doom-module::completion corfu +tng]]) | -| [[kbd:][C-SPC]] | (when completing) Insert separator DWIM (see below) | +| Keybind | Description | +|----------+-----------------------------------------------------------| +| [[kbd:][]] | Go to next candidate | +| [[kbd:][]] | Go to previous candidate | +| [[kbd:][C-n]] | Go to next candidate | +| [[kbd:][C-p]] | Go to previous candidate | +| [[kbd:][C-j]] | (evil) Go to next candidate | +| [[kbd:][C-k]] | (evil) Go to previous candidate | +| [[kbd:][C-]] | Go to next doc line | +| [[kbd:][C-]] | Go to previous doc line | +| [[kbd:][C-S-n]] | Go to next doc line | +| [[kbd:][C-S-p]] | Go to previous doc line | +| [[kbd:][C-S-j]] | (evil) Go to next doc line | +| [[kbd:][C-S-k]] | (evil) Go to previous doc line | +| [[kbd:][C-h]] | Toggle documentation (if available) | +| [[kbd:][C-S-s]] | Export to minibuffer (if [[doom-module::completion vertico]]) | +| [[kbd:][RET]] | Insert candidate | +| [[kbd:][SPC]] | Quit autocompletion or pass-through after a wildcard | +| [[kbd:][C-SPC]] | Complete (unless [[doom-module::completion corfu +tng]]) | +| [[kbd:][C-SPC]] | (when completing) Insert separator DWIM (see below) | If you prefer a [[kbd:][TAB]]-centric completion style, enable the [[doom-module::completion corfu +tng]] flag so that, instead, you trigger completion with [[kbd:][TAB]], getting the diff --git a/modules/completion/corfu/config.el b/modules/completion/corfu/config.el index 27caee357..e9ecbf69c 100644 --- a/modules/completion/corfu/config.el +++ b/modules/completion/corfu/config.el @@ -33,17 +33,6 @@ tab-always-indent (if (modulep! +tng) 'complete tab-always-indent)) (add-to-list 'completion-category-overrides `(lsp-capf (styles ,@completion-styles))) - (map! :map corfu-mode-map - :e "C-M-i" #'completion-at-point - :i "C-SPC" #'completion-at-point - :n "C-SPC" (cmd! (call-interactively #'evil-insert-state) - (call-interactively #'completion-at-point)) - :v "C-SPC" (cmd! (call-interactively #'evil-change) - (call-interactively #'completion-at-point))) - (map! :unless (modulep! :editor evil) - :map corfu-mode-map - "C-M-i" #'completion-at-point) - (add-hook! 'minibuffer-setup-hook (defun +corfu-enable-in-minibuffer () "Enable Corfu in the minibuffer if `completion-at-point' is bound." @@ -57,32 +46,9 @@ (when (modulep! +icons) (add-to-list 'corfu-margin-formatters #'nerd-icons-corfu-formatter)) - (let ((cmds-del (cmds! (and (modulep! +tng) - (> corfu--index -1) - (eq corfu-preview-current 'insert)) - #'corfu-reset))) - (map! :map corfu-map - [return] #'corfu-insert - "RET" #'corfu-insert - (:when (modulep! +orderless) - " " #'+corfu-smart-sep-toggle-escape) - (:when (modulep! +tng) - [tab] #'corfu-next - [backtab] #'corfu-previous - "TAB" #'corfu-next - "S-TAB" #'corfu-previous - [backspace] cmds-del - "DEL" cmds-del))) - (when (modulep! +orderless) (after! orderless - (setq orderless-component-separator #'orderless-escapable-split-on-space))) - - (after! vertico - (map! :map corfu-map - "M-m" #'+corfu-move-to-minibuffer - (:when (modulep! :editor evil) - "M-J" #'+corfu-move-to-minibuffer)))) + (setq orderless-component-separator #'orderless-escapable-split-on-space)))) (use-package! cape :defer t @@ -176,16 +142,4 @@ (use-package! corfu-popupinfo :hook ((corfu-mode . corfu-popupinfo-mode)) :config - (setq corfu-popupinfo-delay '(0.5 . 1.0)) - (map! :map corfu-map - "C-" #'corfu-popupinfo-scroll-down - "C-" #'corfu-popupinfo-scroll-up - "C-S-p" #'corfu-popupinfo-scroll-down - "C-S-n" #'corfu-popupinfo-scroll-up - "C-h" #'corfu-popupinfo-toggle) - (map! :when (modulep! :editor evil) - :map corfu-popupinfo-map - ;; Reversed because popupinfo assumes opposite of what feels intuitive - ;; with evil. - "C-S-k" #'corfu-popupinfo-scroll-down - "C-S-j" #'corfu-popupinfo-scroll-up)) + (setq corfu-popupinfo-delay '(0.5 . 1.0))) diff --git a/modules/config/default/+emacs-bindings.el b/modules/config/default/+emacs-bindings.el index 7aa4dfc41..ab29c5977 100644 --- a/modules/config/default/+emacs-bindings.el +++ b/modules/config/default/+emacs-bindings.el @@ -511,7 +511,7 @@ "C-x C-b" #'ibuffer "C-x K" #'doom/kill-this-buffer-in-all-windows - ;;; company-mode + ;;; completion (in-buffer) (:when (modulep! :completion company) "C-;" #'+company/complete (:after company @@ -537,6 +537,13 @@ "C-p" #'company-search-repeat-backward "C-s" (cmd! (company-search-abort) (company-filter-candidates)))) + (:when (modulep! :completion corfu) + :after corfu + (:map corfu-mode-map + "C-M-i" #'completion-at-point) + (:map corfu-popupinfo-map + "C-S-h" #'corfu-popupinfo-toggle)) + ;;; ein notebooks (:after ein:notebook-multilang :map ein:notebook-multilang-mode-map diff --git a/modules/config/default/+evil-bindings.el b/modules/config/default/+evil-bindings.el index c79c078f6..4bcc92b69 100644 --- a/modules/config/default/+evil-bindings.el +++ b/modules/config/default/+evil-bindings.el @@ -43,7 +43,10 @@ #'yas-expand (and (bound-and-true-p company-mode) (modulep! :completion company +tng)) - #'company-indent-or-complete-common) + #'company-indent-or-complete-common + (and (bound-and-true-p corfu-mode) + (modulep! :completion corfu +tng)) + #'completion-at-point) :m [tab] (cmds! (and (modulep! :editor snippets) (evil-visual-state-p) (or (eq evil-visual-selection 'line) @@ -127,7 +130,7 @@ ;; ;;; Module keybinds -;;; :completion +;;; :completion (in-buffer) (map! (:when (modulep! :completion company) :i "C-@" (cmds! (not (minibufferp)) #'company-complete-common) :i "C-SPC" (cmds! (not (minibufferp)) #'company-complete-common) @@ -156,7 +159,31 @@ "C-s" #'company-filter-candidates [escape] #'company-search-abort))) - (:when (modulep! :completion ivy) + (:when (modulep! :completion corfu) + (:after corfu + (:map corfu-mode-map + :e "C-M-i" #'completion-at-point + (:unless (modulep! :completion corfu +tng) + :i "C-SPC" #'completion-at-point + :n "C-SPC" (cmd! (call-interactively #'evil-insert-state) + (call-interactively #'completion-at-point)) + :v "C-SPC" (cmd! (call-interactively #'evil-change) + (call-interactively #'completion-at-point)))) + (:map corfu-map + "C-u" (cmd! (let ((corfu-cycle nil)) + (funcall-interactively #'corfu-next (- corfu-count)))) + "C-d" (cmd! (let ((corfu-cycle nil)) + (funcall-interactively #'corfu-next corfu-count))))) + (:after corfu-popupinfo + :map corfu-popupinfo-map + ;; Reversed because popupinfo assumes opposite of what feels intuitive + ;; with evil. + "C-S-k" #'corfu-popupinfo-scroll-down + "C-S-j" #'corfu-popupinfo-scroll-up + "C-h" #'corfu-popupinfo-toggle))) + +;;; :completion (separate) +(map! (:when (modulep! :completion ivy) (:after ivy :map ivy-minibuffer-map "C-SPC" #'ivy-call-and-recenter ; preview file @@ -169,7 +196,8 @@ [C-return] #'+ivy/git-grep-other-window-action)) (:when (modulep! :completion helm) - (:after helm :map helm-map + (:after helm + :map helm-map [remap next-line] #'helm-next-line [remap previous-line] #'helm-previous-line [left] #'left-char @@ -371,8 +399,10 @@ ;;; c --- code (:prefix-map ("c" . "code") (:when (and (modulep! :tools lsp) (not (modulep! :tools lsp +eglot))) - :desc "LSP Execute code action" "a" #'lsp-execute-code-action - :desc "LSP Organize imports" "o" #'lsp-organize-imports + :desc "LSP" "l" #'+default/lsp-command-map + :desc "LSP Execute code action" "a" #'lsp-execute-code-action + :desc "LSP Organize imports" "o" #'lsp-organize-imports + :desc "LSP Rename" "r" #'lsp-rename (:when (modulep! :completion ivy) :desc "Jump to symbol in current workspace" "j" #'lsp-ivy-workspace-symbol :desc "Jump to symbol in any workspace" "J" #'lsp-ivy-global-workspace-symbol) @@ -387,12 +417,10 @@ :desc "Incoming call hierarchy" "y" #'lsp-treemacs-call-hierarchy :desc "Outgoing call hierarchy" "Y" (cmd!! #'lsp-treemacs-call-hierarchy t) :desc "References tree" "R" (cmd!! #'lsp-treemacs-references t) - :desc "Symbols" "S" #'lsp-treemacs-symbols) - :desc "LSP" "l" #'+default/lsp-command-map - :desc "LSP Rename" "r" #'lsp-rename) + :desc "Symbols" "S" #'lsp-treemacs-symbols)) (:when (modulep! :tools lsp +eglot) - :desc "LSP Execute code action" "a" #'eglot-code-actions - :desc "LSP Rename" "r" #'eglot-rename + :desc "LSP Execute code action" "a" #'eglot-code-actions + :desc "LSP Rename" "r" #'eglot-rename :desc "LSP Find declaration" "j" #'eglot-find-declaration (:when (modulep! :completion vertico) :desc "Jump to symbol in current workspace" "j" #'consult-eglot-symbols)) diff --git a/modules/config/default/config.el b/modules/config/default/config.el index e67adf1e3..f1d1c71e7 100644 --- a/modules/config/default/config.el +++ b/modules/config/default/config.el @@ -48,8 +48,8 @@ (time-to-seconds)) collect (epg-sub-key-fingerprint subkey)))) user-mail-address)) - ;; And suppress prompts if epa-file-encrypt-to has a default value (without - ;; overwriting file-local values). + ;; And suppress prompts if epa-file-encrypt-to has a default value (without + ;; overwriting file-local values). (defadvice! +default--dont-prompt-for-keys-a (&rest _) :before #'epa-file-write-region (unless (local-variable-p 'epa-file-encrypt-to) @@ -170,7 +170,7 @@ (and (sp-in-code-p id action context) (save-excursion (goto-char (line-beginning-position)) - (looking-at-p "[ ]*#include[^<]+")))) + (looking-at-p "[ \t]*#include[^<]+")))) ;; ...and leave it to smartparens (sp-local-pair '(c++-mode objc-mode) @@ -458,6 +458,49 @@ Continues comments if executed from a commented line. Consults '(evil-ex-completion-map))) "C-s" command)) + (map! :when (modulep! :completion corfu) + :after corfu + (:map corfu-mode-map + :prefix "C-x" + "C-l" #'cape-line + "C-k" #'cape-keyword + "C-f" #'cape-file + "s" #'cape-dict + "C-s" #'yasnippet-capf + "C-o" #'completion-at-point + "C-n" #'cape-dabbrev + "C-p" #'cape-history) + (:map corfu-map + [return] #'corfu-insert + "RET" #'corfu-insert + "C-S-s" #'+corfu-move-to-minibuffer + "C-p" #'corfu-previous + "C-n" #'corfu-next + (:when (modulep! :completion corfu +orderless) + " " #'+corfu-smart-sep-toggle-escape) + (:when (modulep! :completion corfu +tng) + [tab] #'corfu-next + "TAB" #'corfu-next + [backtab] #'corfu-previous + "S-TAB" #'corfu-previous)) + (:after corfu-popupinfo + :map corfu-popupinfo-map + "C-" #'corfu-popupinfo-scroll-down + "C-" #'corfu-popupinfo-scroll-up + "C-S-p" #'corfu-popupinfo-scroll-down + "C-S-n" #'corfu-popupinfo-scroll-up + "C-S-u" (cmd! (funcall-interactively #'corfu-popupinfo-scroll-down corfu-popupinfo-min-height)) + "C-S-d" (cmd! (funcall-interactively #'corfu-popupinfo-scroll-up corfu-popupinfo-min-height)))) + + (when-let ((cmds-del (and (modulep! :completion corfu +tng) + (cmds! (and (> corfu--index -1) + (eq corfu-preview-current 'insert)) + #'corfu-reset)))) + (map! :after corfu + :map corfu-map + [backspace] cmds-del + "DEL" cmds-del)) + ;; Smarter C-a/C-e for both Emacs and Evil. C-a will jump to indentation. ;; Pressing it again will send you to the true bol. Same goes for C-e, except ;; it will ignore comments+trailing whitespace before jumping to eol. From 2f755aaffedf7a460e73839c08f7a2e3ae77b1eb Mon Sep 17 00:00:00 2001 From: Luigi Sartor Piucco Date: Thu, 21 Dec 2023 12:07:39 -0300 Subject: [PATCH 47/49] feat(corfu): impl smart confirm in minibuffer An issue when using corfu in the minibuffer was the need for pressing RET twice, since the first only inserts the completion. This commit aliviates that by providing C-RET to ignore completion and conclude the minibuffer immediatelly and S-RET to insert completion then conclude. --- modules/completion/corfu/README.org | 23 +++++++++++++++++++++++ modules/completion/corfu/autoload.el | 8 ++++++++ modules/config/default/config.el | 8 ++++++-- 3 files changed, 37 insertions(+), 2 deletions(-) diff --git a/modules/completion/corfu/README.org b/modules/completion/corfu/README.org index ce7464cad..5b93ea0b6 100644 --- a/modules/completion/corfu/README.org +++ b/modules/completion/corfu/README.org @@ -103,6 +103,29 @@ following additional binds: | [[kbd:][S-TAB]] | (when completing) Go to previous candidate | | [[kbd:][DEL]] | (when completing) Reset completion DWIM-style | +*** Completion in the minibuffer +In the minibuffer, sometimes autocompletion can interfere with your goal; +Imagine you're composing a search pattern incrementally, and you find what you +want early, with only half the word. You then press [[kbd:RET]]. If completion +kicked in as you typed, you may lose the match, since it will complete the +first candidate. On the other hand, if you were paying attention to the +suggestions and selecting one appropriate, that's desired behavior, and you may +even desire to modify the prompt further (if you were composing a command +instead, you may want to extend it after the candidate). To allow better +control, there are 3 confirm bindings when Corfu appears in the minibuffer: + +| Keybind | Description | +|-----------+--------------------------------------------------------------------| +| [[kbd:RET]] | Accept the candidate only | +| [[kbd:C-RET]] | Confirm the current prompt only | +| [[kbd:S-RET]] | Accept the candidate then immediately confirm the completed prompt | + +- Use [[kbd:RET]] when you want to continue composing after completing; +- Use [[kbd:C-RET]] when you already have the desired string, and completing would + break it; +- Use [[kbd:S-RET]] when you know the composition will be finished after completion + (thus avoiding the need to type [[kbd:RET]] twice); + ** Searching with multiple keywords If the [[doom-module::completion corfu +orderless]] flag is enabled, users can perform code completion with multiple search keywords by use of space as the diff --git a/modules/completion/corfu/autoload.el b/modules/completion/corfu/autoload.el index 618aae42d..841802596 100644 --- a/modules/completion/corfu/autoload.el +++ b/modules/completion/corfu/autoload.el @@ -1,5 +1,13 @@ ;;; completion/corfu/autoload.el -*- lexical-binding: t; -*- +;;;###autoload +(defun +corfu-complete-and-exit-minibuffer () + (interactive) + (if (>= corfu--index 0) + (corfu-complete) + (corfu-insert)) + (exit-minibuffer)) + ;;;###autoload (defun +corfu-move-to-minibuffer () ;; Taken from corfu's README. diff --git a/modules/config/default/config.el b/modules/config/default/config.el index f1d1c71e7..eb0ee5265 100644 --- a/modules/config/default/config.el +++ b/modules/config/default/config.el @@ -490,8 +490,12 @@ Continues comments if executed from a commented line. Consults "C-S-p" #'corfu-popupinfo-scroll-down "C-S-n" #'corfu-popupinfo-scroll-up "C-S-u" (cmd! (funcall-interactively #'corfu-popupinfo-scroll-down corfu-popupinfo-min-height)) - "C-S-d" (cmd! (funcall-interactively #'corfu-popupinfo-scroll-up corfu-popupinfo-min-height)))) - + "C-S-d" (cmd! (funcall-interactively #'corfu-popupinfo-scroll-up corfu-popupinfo-min-height))) + (:map corfu-map + :gi "C-" '(menu-item "Conclude the minibuffer" exit-minibuffer + :enable (active-minibuffer-window)) + :gi "S-" '(menu-item "Insert completion and conclude" +corfu-complete-and-exit-minibuffer + :enable (active-minibuffer-window)))) (when-let ((cmds-del (and (modulep! :completion corfu +tng) (cmds! (and (> corfu--index -1) (eq corfu-preview-current 'insert)) From 5ac126624ca40be393e15fef7d88a060e8908f71 Mon Sep 17 00:00:00 2001 From: Luigi Sartor Piucco Date: Sun, 4 Feb 2024 17:17:13 -0300 Subject: [PATCH 48/49] feat(corfu): general move-to-minibuffer impl We relied directly on consult for this, meaning it needed the vertico module. Now, it should defer to the user's choice, including helm, ivy and ido. Note the convention for this indirection is using the `completing-read` API, which all such packages implement. This diverges from Corfu's suggestion of `completion-in-region`, which only vertico and ivy seem to implement. --- modules/completion/corfu/autoload.el | 11 ++++++----- modules/completion/corfu/config.el | 2 ++ 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/modules/completion/corfu/autoload.el b/modules/completion/corfu/autoload.el index 841802596..94b9fe6da 100644 --- a/modules/completion/corfu/autoload.el +++ b/modules/completion/corfu/autoload.el @@ -10,12 +10,13 @@ ;;;###autoload (defun +corfu-move-to-minibuffer () - ;; Taken from corfu's README. - ;; TODO: extend this to other completion front-ends. + ;; Adapted from Corfu's README. (interactive) - (let ((completion-extra-properties corfu--extra) - (completion-cycle-threshold completion-cycling)) - (apply #'consult-completion-in-region completion-in-region--data))) + (pcase completion-in-region--data + (`(,_ ,_ ,table ,pred ,extras) + (let ((completion-extra-properties extras) + completion-cycle-threshold completion-cycling) + (completing-read "Completion: " table pred nil nil 'corfu-history))))) ;;;###autoload (defun +corfu-smart-sep-toggle-escape () diff --git a/modules/completion/corfu/config.el b/modules/completion/corfu/config.el index e9ecbf69c..48448b2fa 100644 --- a/modules/completion/corfu/config.el +++ b/modules/completion/corfu/config.el @@ -33,6 +33,8 @@ tab-always-indent (if (modulep! +tng) 'complete tab-always-indent)) (add-to-list 'completion-category-overrides `(lsp-capf (styles ,@completion-styles))) + (add-to-list 'corfu-continue-commands #'+corfu-move-to-minibuffer) + (add-hook! 'minibuffer-setup-hook (defun +corfu-enable-in-minibuffer () "Enable Corfu in the minibuffer if `completion-at-point' is bound." From 37da8c54dc66949426ca01ad5c168eea78bb3aaa Mon Sep 17 00:00:00 2001 From: Luigi Sartor Piucco Date: Sun, 4 Feb 2024 18:19:04 -0300 Subject: [PATCH 49/49] bump: :completion corfu + evil-collection The `evil-collection` upgrade is needed due to a recent breaking change in Corfu's setup and teardown functions. `evil-collection` `:after`-advised these with `#'evil-normalize-keymaps`, which accepts only 1 optional argument. This was fine because the functions took no arguments, but some have been introduced recently. Trying to initiate completion would now throw a "too many arguments" error, and due to the partial operation on the keymaps, make Emacs mostly unusable. Related links: - https://github.com/minad/corfu/commit/9cebcfedca0ab165fcfc8a56acc2d2513a02b9e3 - https://github.com/emacs-evil/evil-collection/commit/cf1a11912d1e77a197fab0e4f82d0c2268084455 - https://github.com/minad/corfu/commit/61a20a50369de2cae77d649269d3c047fbbc27ec - https://github.com/emacs-evil/evil-collection/commit/2eb68ac588f68c7d6706618754524595138900a1 --- modules/completion/corfu/packages.el | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/completion/corfu/packages.el b/modules/completion/corfu/packages.el index ec9edc23f..05f2d9b98 100644 --- a/modules/completion/corfu/packages.el +++ b/modules/completion/corfu/packages.el @@ -1,8 +1,8 @@ ;; -*- no-byte-compile: t; -*- ;;; completion/corfu/packages.el -(package! corfu :pin "24dccafeea114b1aec7118f2a8405b46aa0051e0") -(package! cape :pin "18a30f48bb8754421cb10dad99e0a406173d4551") +(package! corfu :pin "b48d3017a47706198e04440cc1b3483bdf646771") +(package! cape :pin "bfde79ed440343c0dbf0f64cfe7913c1efbe3f83") (when (modulep! +icons) (package! nerd-icons-corfu :pin "7077bb76fefc15aed967476406a19dc5c2500b3c")) (when (modulep! +orderless) @@ -10,4 +10,4 @@ (when (modulep! :os tty) (package! corfu-terminal :pin "501548c3d51f926c687e8cd838c5865ec45d03cc")) (when (modulep! :editor snippets) - (package! yasnippet-capf :pin "a0a6b1c2bb6decdad5cf9b74202f0042f494a6ab")) + (package! yasnippet-capf :pin "db12b55cd08b614cbba134008566e48d7faf660e"))