dev: merge from master

modules/completion/ivy/config.el

@@ -286,7 +286,7 @@ workable results ripgrep produces, despite the error."
     "Change `counsel-file-jump' to use fd or ripgrep, if they are available."
     :override #'counsel--find-return-list
     (cl-destructuring-bind (find-program . args)
-        (cond ((when-let (fd (executable-find (or doom-projectile-fd-binary "fd") t))
+        (cond ((when-let (fd (executable-find (or doom-fd-executable "fd") t))
                  (append (list fd "--hidden" "--type" "file" "--type" "symlink" "--follow" "--color=never")
                          (cl-loop for dir in projectile-globally-ignored-directories
                                   collect "--exclude"

modules/completion/vertico/autoload/vertico.el

@@ -211,15 +211,15 @@ targets."
 ;;;###autoload
 (defun +vertico/consult-fd-or-find (&optional dir initial)
   "Runs consult-fd if fd version > 8.6.0 exists, consult-find otherwise.
-See URL `https://github.com/minad/consult/issues/770'."
+See minad/consult#770."
   (interactive "P")
   ;; TODO this condition was adapted from a similar one in lisp/doom-projects.el, to be replaced with a more robust check post v3
   (if (when-let*
           ((bin (if (ignore-errors (file-remote-p default-directory nil t))
                     (cl-find-if (doom-rpartial #'executable-find t)
                                 (list "fdfind" "fd"))
-                  doom-projectile-fd-binary))
-           (version (with-memoization doom-projects--fd-version
+                  doom-fd-executable))
+           (version (with-memoization (get 'doom-fd-executable 'version)
                       (cadr (split-string (cdr (doom-call-process bin "--version"))
                                           " " t))))
            ((ignore-errors (version-to-list version))))

modules/completion/vertico/config.el

@@ -210,7 +210,7 @@ orderless."
          "C-x C-d" #'consult-dir
          "C-x C-j" #'consult-dir-jump-file))
   :config
-  ;; DEPRECATED: Remove when Doom core replaces projectile with project.el
+  ;; DEPRECATED: Remove when projectile is replaced with project.el
   (setq consult-dir-project-list-function #'consult-dir-projectile-dirs)
 
   (when (modulep! :tools docker)

modules/emacs/dired/config.el

@@ -211,7 +211,7 @@ we have to clean it up ourselves."
 
 
 (use-package! fd-dired
-  :when doom-projectile-fd-binary
+  :when doom-fd-executable
   :defer t
   :init
   (global-set-key [remap find-dired] #'fd-dired)

modules/lang/README.org

@@ -3,7 +3,7 @@
 #+since:   21.12.0
 
 * Description
-These modules specialize in integration particular languages and their
+These modules specialize in the integration of particular languages and their
 ecosystems into (Doom) Emacs.
 
 * Frequently asked questions

modules/lang/cc/README.org

@@ -75,8 +75,7 @@ recommended.
 + clangd (must be v9 or newer) :: clangd is included with =llvm= which should be
   available through your OS' package manager.
   - Linux:
-    - Debian 11 & Ubuntu 20.10: ~$ apt-get install clangd-11~
-      - 20.04 LTS: [[https://pkgs.org/search/?q=clangd][clangd-10]]
+    - Debian & Ubuntu: ~$ apt-get install clangd~
     - Fedora & CentOS/RHEL 8+: ~$ dnf install clang-tools-extra~
     - openSUSE: ~$ zypper install clang~
     - Arch: ~$ pacman -S clang~

modules/lang/cc/config.el

@@ -303,6 +303,9 @@ If rtags or rdm aren't available, fail silently instead of throwing a breaking e
   :defer t
   :init
   (defvar ccls-sem-highlight-method 'font-lock)
+  (after! project
+    (add-to-list 'project-vc-ignores "^\\.ccls-cache$"))
+  ;; DEPRECATED: Remove when projectile is replaced with project.el
   (after! projectile
     (add-to-list 'projectile-globally-ignored-directories "^.ccls-cache$")
     (add-to-list 'projectile-project-root-files-bottom-up ".ccls-root")

modules/lang/elixir/config.el

@@ -1,5 +1,6 @@
 ;;; lang/elixir/config.el -*- lexical-binding: t; -*-
 
+;; DEPRECATED: Remove when projectile is replaced with project.el
 (after! projectile
   (add-to-list 'projectile-project-root-files "mix.exs"))
 

modules/lang/gdscript/config.el

@@ -1,5 +1,9 @@
 ;;; lang/gdscript/config.el -*- lexical-binding: t; -*-
 
+(after! project
+  (add-to-list 'project-vc-extra-root-markers "project.godot"))
+
+;; DEPRECATED: Remove when projectile is replaced with project.el
 (after! projectile
   (add-to-list 'projectile-project-root-files "project.godot"))
 

modules/lang/haskell/config.el

@@ -1,5 +1,6 @@
 ;;; lang/haskell/config.el -*- lexical-binding: t; -*-
 
+;; DEPRECATED: Remove when projectile is replaced with project.el
 (after! projectile
   (add-to-list 'projectile-project-root-files "stack.yaml"))
 

modules/lang/markdown/README.org

@@ -68,7 +68,9 @@ gfm-mode:
     - ~$ pip install proselint~
     - Or through your OS package manager
       - MacOS: ~$ brew install proselint~
-      - Arch Linux: ~$ pacman -S proselint~
+      - Arch Linux: [[https://aur.archlinux.org/packages/proselint][proselint in AUR]]
+      - Debian & Ubuntu: ~$ apt-get install python3-proselint~
+      - Fedora: ~$ dnf install proselint~
   - [[https://github.com/textlint/textlint][textlint]] (~$ npm install textlint~)
 
 ** Markdown compiler

modules/lang/org/README.org

@@ -187,7 +187,12 @@ brew install gnuplot
 #+begin_src sh
 pacman -S texlive-core texlive-bin texlive-science texlive-latexextra
 pacman -S gnuplot
-pacman -S jupyter # required by +jupyter
+#+end_src
+
+** Debian & Ubuntu
+#+begin_src sh
+apt-get install texlive dvipng
+apt-get install gnuplot
 #+end_src
 
 ** NixOS

modules/lang/php/config.el

@@ -12,6 +12,7 @@
 (defvar +php-run-tests-in-docker nil
   "Whether or not to run tests in a docker environment")
 
+;; DEPRECATED: Remove when projectile is replaced with project.el
 (after! projectile
   (add-to-list 'projectile-project-root-files "composer.json"))
 

modules/lang/racket/config.el

@@ -1,5 +1,6 @@
 ;;; lang/racket/config.el -*- lexical-binding: t; -*-
 
+;; DEPRECATED: Remove when projectile is replaced with project.el
 (after! projectile
   (add-to-list 'projectile-project-root-files "info.rkt"))
 

modules/lang/ruby/config.el

@@ -1,5 +1,6 @@
 ;;; lang/ruby/config.el -*- lexical-binding: t; -*-
 
+;; DEPRECATED: Remove when projectile is replaced with project.el
 (after! projectile
   (add-to-list 'projectile-project-root-files "Gemfile"))
 

modules/lang/rust/config.el

@@ -1,5 +1,6 @@
 ;;; lang/rust/config.el -*- lexical-binding: t; -*-
 
+;; DEPRECATED: Remove when projectile is replaced with project.el
 (after! projectile
   (add-to-list 'projectile-project-root-files "Cargo.toml"))
 

modules/lang/zig/config.el

@@ -1,5 +1,6 @@
 ;;; lang/zig/config.el -*- lexical-binding: t; -*-
 
+;; DEPRECATED: Remove when projectile is replaced with project.el
 (after! projectile
   (add-to-list 'projectile-project-root-files "build.zig"))