From a89d4b7df556bb8b309d1c23e0b60404e750f156 Mon Sep 17 00:00:00 2001 From: Tim Ruffing Date: Fri, 1 Dec 2023 19:15:36 +0100 Subject: [PATCH 1/7] tweak(default): add binding for undo-tree This also makes the check for the presence of vundo consistent with the rest of the file by using modulep! instead of fboundp. --- modules/config/default/+evil-bindings.el | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/config/default/+evil-bindings.el b/modules/config/default/+evil-bindings.el index f6d1c9225..a62541d4c 100644 --- a/modules/config/default/+evil-bindings.el +++ b/modules/config/default/+evil-bindings.el @@ -760,8 +760,9 @@ ((modulep! :completion helm) #'swiper-isearch-thing-at-point)) :desc "Dictionary" "t" #'+lookup/dictionary-definition :desc "Thesaurus" "T" #'+lookup/synonyms - (:when (fboundp 'vundo) - :desc "Undo history" "u" #'vundo)) + :desc "Undo history" "u" + (cond ((modulep! :emacs undo +tree) #'undo-tree-visualize) + ((modulep! :emacs undo) #'vundo))) ;;; t --- toggle (:prefix-map ("t" . "toggle") From c7ddbe049f2d4f36f808b9113f5ca80a5892e54f Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Sat, 2 Dec 2023 10:48:42 -0500 Subject: [PATCH 2/7] fix(swift): set-eglot-client!: extra argument And move setter out of condition (it will no-op if :tools lsp +eglot isn't enabled). Plus, it should be configured even when +lsp isn't enabled for :lang swift. Amend: #7567 Close: #7577 Co-authored-by: ncihnegn --- modules/lang/swift/config.el | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/modules/lang/swift/config.el b/modules/lang/swift/config.el index 5fc4d9888..ab66f2c48 100644 --- a/modules/lang/swift/config.el +++ b/modules/lang/swift/config.el @@ -2,11 +2,10 @@ (after! swift-mode (set-repl-handler! 'swift-mode #'run-swift) + (set-eglot-client! 'swift-mode '("sourcekit-lsp")) (when (modulep! +lsp) - (add-hook 'swift-mode-local-vars-hook #'lsp! 'append) - (when (modulep! :tools lsp +eglot) - (set-eglot-client! swift-mode 'swift-mode '("sourcekit-lsp")))) + (add-hook 'swift-mode-local-vars-hook #'lsp! 'append)) (when (modulep! +tree-sitter) (add-hook 'swift-mode-local-vars-hook #'tree-sitter! 'append))) From f8274f208c3f60a9407a8d432be137748d97134d Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Sat, 2 Dec 2023 11:20:42 -0500 Subject: [PATCH 3/7] bump: :lang org aimebertrand/org-mac-link@3a30a937e135 -> aimebertrand/org-mac-link@e30171a6e98d alf/ob-restclient.el@ded3b7eb7b05 -> alf/ob-restclient.el@1a127eb0165f awth13/org-appear@eb9f9db40aa5 -> awth13/org-appear@81eba5d7a5b7 bastibe/org-journal@18df4d5ae5e1 -> bastibe/org-journal@a306f76ee2b0 emacs-jupyter/jupyter@1baabc8f2d06 -> emacs-jupyter/jupyter@0a92c0c978ab emacs-straight/org-mode@e90a8a69a7fa -> emacs-straight/org-mode@57b94f3447b9 emacsmirror/org-contrib@dc59cdd46be8 -> emacsmirror/org-contrib@79286861ae3f hakimel/reveal.js@07a6cf1249e4 -> hakimel/reveal.js@d5896c968b24 magit/orgit-forge@8ba92a54aee9 -> magit/orgit-forge@f595a30aa75a magit/orgit@4a585029875a -> magit/orgit@b60efabc4a1b oer/org-re-reveal@93396b531ba1 -> oer/org-re-reveal@e7895dae9807 org-noter/org-noter@ab838691f0d6 -> org-noter/org-noter@a4296d8338d4 Ref: bastibe/org-journal#415 Close: #7506 Fix: #7545 Co-authored-by: SeanMaclochlainn --- 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 f67a07819..ac75cc70d 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 "e90a8a69a7fa2d83c995b5d32bc0b24a68218ed3") + :pin "57b94f3447b9046dac2f9238e24ad902510056cc") (package! org-contrib :recipe (:host github :repo "emacsmirror/org-contrib") - :pin "dc59cdd46be8f6854c5d6e9252263d0e4e62e896") + :pin "79286861ae3f4a47fbc66ce97cd527196f60c4a8") (package! avy) (package! htmlize :pin "dd27bc3f26efd728f2b1f01f9e4ac4f61f2ffbf9") @@ -56,7 +56,7 @@ (when (and IS-MAC (modulep! :os macos)) - (package! org-mac-link :pin "3a30a937e135a6637a5126e2ac096b6c90584045")) + (package! org-mac-link :pin "e30171a6e98db90787ab8a23b3a7dc4fd13b10f9")) (when (modulep! +passwords) (package! org-passwords @@ -71,9 +71,9 @@ (when (modulep! :tools pdf) (package! org-pdftools :pin "4e420233a153a9c4ab3d1a7e1d7d3211c836f0ac")) (when (modulep! :tools magit) - (package! orgit :pin "4a585029875a1dbbe96d8ac157bd2fd02875f289") + (package! orgit :pin "b60efabc4a1b15d7eacaabc5bdfe6f3c20fee161") (when (modulep! :tools magit +forge) - (package! orgit-forge :pin "8ba92a54aee9693b1bf03baf14f83550a7c89b18"))) + (package! orgit-forge :pin "f595a30aa75af55522b1203cd29198fb9aa3a0a5"))) (when (modulep! +brain) (package! org-brain :pin "2bad7732aae1a3051e2a14de2e30f970bbe43c25")) (when (modulep! +dragndrop) @@ -84,15 +84,15 @@ (when (modulep! +ipython) ; DEPRECATED (package! ob-ipython :pin "7147455230841744fb5b95dcbe03320313a77124")) (when (modulep! +jupyter) - (package! jupyter :pin "1baabc8f2d0631f8f4308400f9a53f1aadd58d14")) + (package! jupyter :pin "0a92c0c978ab12bd31a50a7e8b1295f5d1767e20")) (when (modulep! +journal) - (package! org-journal :pin "18df4d5ae5e15580df42562c143d007c6d28d75f")) + (package! org-journal :pin "a306f76ee2b0292946a20530bd9114aefc85a263")) (when (modulep! +noter) - (package! org-noter :pin "ab838691f0d6ae281597451de311f71a50ba8da6")) + (package! org-noter :pin "a4296d8338d46b5c863d3d339b50e201172f218c")) (when (modulep! +pomodoro) (package! org-pomodoro :pin "3f5bcfb80d61556d35fc29e5ddb09750df962cc6")) (when (modulep! +pretty) - (package! org-appear :pin "eb9f9db40aa529fe4b977235d86494b115281d17") + (package! org-appear :pin "81eba5d7a5b74cdb1bad091d85667e836f16b997") (package! org-superstar :pin "54c81c27dde2a6dc461bb064e79a8b2089093a2e") (package! org-fancy-priorities :pin "7f677c6c14ecf05eab8e0efbfe7f1b00ae68eb1d")) (when (modulep! +present) @@ -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 "93396b531ba13219bdbb968c197d5c44535ce1cd") + (package! org-re-reveal :pin "e7895dae9807df38b6e17b6c24e1e824caad6c46") (package! revealjs :recipe (:host github :repo "hakimel/reveal.js" :files ("css" "dist" "js" "plugin")) - :pin "07a6cf1249e40164705713ed9ad60f13846789fb")) + :pin "d5896c968b2406126ca0beafecdffe219230b6b4")) (cond ((modulep! +roam) (package! org-roam @@ -152,7 +152,7 @@ :recipe (:host github :repo "DEADB17/ob-racket") :pin "d8fd51bddb019b0eb68755255f88fc800cfe03cb")) (when (modulep! :lang rest) - (package! ob-restclient :pin "ded3b7eb7b0592328a7a08ecce6f25278cba4a1d")) + (package! ob-restclient :pin "1a127eb0165f10bb9d33606aa8529051118805e7")) (when (modulep! :lang scala) (package! ob-ammonite :pin "39937dff395e70aff76a4224fa49cf2ec6c57cca")) From 0d8479ae9bc736a0cb2465eab16dae7c449d84de Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Sat, 2 Dec 2023 11:23:54 -0500 Subject: [PATCH 4/7] tweak: emit feedback when started in daemon mode --- lisp/doom.el | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/lisp/doom.el b/lisp/doom.el index 2d59d5ffa..42465738d 100644 --- a/lisp/doom.el +++ b/lisp/doom.el @@ -697,6 +697,16 @@ appropriately against `noninteractive' or the `cli' context." ;; ;;; Last minute initialization +(when (daemonp) + (message "Starting Doom Emacs in daemon mode!") + (unless doom-inhibit-log + (add-hook! 'doom-after-init-hook :depth 106 + (unless doom-inhibit-log + (setq doom-inhibit-log (not (or noninteractive init-file-debug)))) + (message "Disabling verbose mode. Have fun!")) + (add-hook! 'kill-emacs-hook :depth 110 + (message "Killing Emacs. Sayonara!")))) + (add-hook! 'doom-before-init-hook :depth -105 (defun doom--begin-init-h () "Begin the startup process." From b1d8d1cd9f4a2245329330cd92c04cf8f9e41472 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Sat, 2 Dec 2023 11:25:54 -0500 Subject: [PATCH 5/7] nit: reformatting, comment, and markup revision --- lisp/doom.el | 6 +++--- modules/editor/evil/init.el | 2 +- modules/lang/org/config.el | 2 +- profiles/README.org | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lisp/doom.el b/lisp/doom.el index 42465738d..464803b03 100644 --- a/lisp/doom.el +++ b/lisp/doom.el @@ -119,9 +119,9 @@ (let ((inhibit-changing-match-data t)) (if (string-match "HARFBUZZ" system-configuration-features) ; no alternative (push 'harfbuzz features))) -;; `native-compile' exists whether or not it is functional (e.g. libgcc is -;; available or not). This seems silly, so pretend it doesn't exist if it -;; isn't available. +;; The `native-compile' feature exists whether or not it is functional (e.g. +;; libgcc is available or not). This seems silly, so pretend it doesn't exist if +;; it isn't functional. (if (featurep 'native-compile) (if (not (native-comp-available-p)) (delq 'native-compile features))) diff --git a/modules/editor/evil/init.el b/modules/editor/evil/init.el index baf9744ed..fb8cc330a 100644 --- a/modules/editor/evil/init.el +++ b/modules/editor/evil/init.el @@ -40,8 +40,8 @@ free-keys helm help - indent image + indent kotlin-mode lispy outline diff --git a/modules/lang/org/config.el b/modules/lang/org/config.el index d32c76928..52dec99e7 100644 --- a/modules/lang/org/config.el +++ b/modules/lang/org/config.el @@ -160,7 +160,7 @@ Is relative to `org-directory', unless it is absolute. Is used in Doom's default "IDEA(i)" ; An unconfirmed and unapproved task or notion "|" "DONE(d)" ; Task successfully completed - "KILL(k)") ; Task was cancelled, aborted or is no longer applicable + "KILL(k)") ; Task was cancelled, aborted, or is no longer applicable (sequence "[ ](T)" ; A task that needs doing "[-](S)" ; Task is in progress diff --git a/profiles/README.org b/profiles/README.org index dfc2b067f..b9bcd8348 100644 --- a/profiles/README.org +++ b/profiles/README.org @@ -113,7 +113,7 @@ There are two caveats with this profile system: 1. Delete [[https://github.com/plexus/chemacs2][Chemacs]] from =$EMACSDIR=. 2. Install Doom there: ~$ git clone https://github.com/doomemacs/doomemacs - ~/.config/emacs~ + \~/.config/emacs~ 3. Move =~/.emacs-profiles.el= to =~/.config/doom/profiles.el= and transform the string keys to symbols and adapt =env= entries like so: From 5b9da18bc10cff72026e63552cd5241a806d676d Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Sat, 2 Dec 2023 11:27:59 -0500 Subject: [PATCH 6/7] fix(csharp): enable lsp in csharp-tree-sitter-mode Fix: #7541 --- modules/lang/csharp/config.el | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/lang/csharp/config.el b/modules/lang/csharp/config.el index 94f64cc61..e0fe64a49 100644 --- a/modules/lang/csharp/config.el +++ b/modules/lang/csharp/config.el @@ -50,8 +50,10 @@ or terminating simple string." :defer t :init (add-hook 'csharp-mode-local-vars-hook #'tree-sitter! 'append) - (if (fboundp #'csharp-tree-sitter-mode) - (add-to-list 'auto-mode-alist '("\\.cs\\'" . csharp-tree-sitter-mode)))) + (when (fboundp #'csharp-tree-sitter-mode) + (add-to-list 'auto-mode-alist '("\\.cs\\'" . csharp-tree-sitter-mode)) + (when (modulep! +lsp) + (add-hook 'csharp-tree-sitter-mode-local-vars-hook #'lsp! 'append)))) ;; Unity shaders From 36d18d6da59f3b5acd5fa36e9a24724bd7c03f11 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Sat, 2 Dec 2023 11:32:28 -0500 Subject: [PATCH 7/7] fix(cc): enable lsp in cuda-mode Fix: #7576 --- modules/lang/cc/config.el | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/modules/lang/cc/config.el b/modules/lang/cc/config.el index d56bcb3e1..75f74a55b 100644 --- a/modules/lang/cc/config.el +++ b/modules/lang/cc/config.el @@ -250,7 +250,12 @@ If rtags or rdm aren't available, fail silently instead of throwing a breaking e (add-hook! '(c-mode-local-vars-hook c++-mode-local-vars-hook objc-mode-local-vars-hook - cmake-mode-local-vars-hook) + cmake-mode-local-vars-hook + ;; HACK Can't use cude-mode-local-vars-hook because cuda-mode + ;; isn't a proper major mode (just a plain function + ;; masquarading as one, so your standard mode hooks won't fire + ;; from switching to cuda-mode). + cuda-mode-hook) :append #'lsp!) (map! :after ccls