dev: merge branch 'master'

modules/checkers/syntax/packages.el

@@ -7,8 +7,5 @@
   (when (modulep! +childframe)
     (package! flycheck-posframe :pin "19896b922c76a0f460bf3fe8d8ebc2f9ac9028d8")))
 
-;; Flymake
 (when (modulep! +flymake)
-  ;; NOTE: remove when straight bumped to support nonGnuELPA
-  (package! popon :recipe (:repo "https://codeberg.org/akib/emacs-popon"))
   (package! flymake-popon :recipe (:repo "https://codeberg.org/akib/emacs-flymake-popon")))

modules/completion/corfu/config.el

@@ -28,8 +28,10 @@ TAB/S-TAB.")
   "If non-nil, prefer navigating org tables over cycling candidates with
 TAB/S-TAB.")
 
+
 ;;
 ;;; Packages
+
 (use-package! corfu
   :hook (doom-first-input . global-corfu-mode)
   :init

modules/editor/format/autoload/lsp.el

@@ -2,7 +2,6 @@
 ;;;###if (modulep! :tools lsp)
 
 (defvar +format-lsp--last nil)
-
 ;;;###autoload
 (define-minor-mode +format-with-lsp-mode
   "Toggles `lsp-mode'/`eglot' integration with `apheleia-mode' in this buffer.

modules/emacs/dired/config.el

@@ -1,8 +1,12 @@
-;;; tools/dired/config.el -*- lexical-binding: t; -*-
+;;; emacs/dired/config.el -*- lexical-binding: t; -*-
 
 (defvar +dired-dirvish-icon-provider 'nerd-icons
   "Icon provider to use for dirvish when the module is enabled.")
 
+
+;;
+;;; Packages
+
 (use-package! dired
   :commands dired-jump
   :init

modules/lang/beancount/config.el

@@ -18,7 +18,7 @@
   ;; HACK: The intro message changed in newer versions of Fava, plus, the output
   ;;   could contain ANSI codes, causing the `beancount-fava' command to not
   ;;   open the server in the browser after the server has started.
-  ;; REVIEW: PR this uptsream!
+  ;; REVIEW: PR this upstream!
   (defadvice! +beancount--open-in-browser-after-starting-fix-a (_process output)
     :override #'beancount--fava-filter
     (save-match-data

modules/lang/cc/config.el

@@ -255,11 +255,7 @@ If rtags or rdm aren't available, fail silently instead of throwing a breaking e
                c++-mode-local-vars-hook
                objc-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)
+               cuda-mode-local-vars-hook)
              :append #'lsp!)
 
   (map! :after ccls

modules/lang/cc/packages.el

@@ -4,12 +4,12 @@
 (package! cmake-mode
   :recipe (:host github :repo "emacsmirror/cmake-mode" :files (:defaults "*"))
   :pin "b08b5d9045308362a623a4f576896d55ffecfd52")
-(package! cuda-mode :pin "7f593518fd135fc6af994024bcb47986dfa502d2")
+(package! cuda-mode :pin "7dd07a20c36b41c8cb38cdec989673b73d03e144")
 (package! demangle-mode :pin "04f545adab066708d6151f13da65aaf519f8ac4e")
 (package! disaster :pin "16bba9afb92aacf06c088c29ba47813b65a80d87")
 (unless (modulep! +tree-sitter)
   (package! modern-cpp-font-lock :pin "43c6b68ff58fccdf9deef11674a172e4eaa8455c"))
-(package! opencl-mode :pin "10ae7742d57ae79d96cf52753800b3490589b3f6")
+(package! opencl-mode :pin "204d5d9e0f5cb2cbe810f2933230eb08fe2c7695")
 
 (when (package! glsl-mode :pin "9b2e5f28e489a1f73c4aed734105618ac0dc0c43")
   (when (modulep! :completion company)
@@ -20,7 +20,7 @@
 (if (modulep! +lsp)
     (unless (modulep! :tools lsp +eglot)
       ;; ccls package is necessary only for lsp-mode.
-      (package! ccls :pin "8648238a92e5fd1ca1b693c99d2824f8804736b0"))
+      (package! ccls :pin "41399b0eba03f9b80769ced71501ba702db4cd62"))
   (when (package! irony :pin "40e0ce19eb850bdf1f77225f11713cc816250d95")
     (package! irony-eldoc :pin "73e79a89fad982a2ba072f2fcc1b4e41f0aa2978")
     (when (and (modulep! :checkers syntax)
@@ -29,7 +29,7 @@
     (when (modulep! :completion company)
       (package! company-irony :pin "b44711dfce445610c1ffaec4951c6ff3882b216a")
       (package! company-irony-c-headers :pin "72c386aeb079fb261d9ec02e39211272f76bbd97")))
-  (when (package! rtags :pin "bd1c818a993aebdfa22053cdd816ef0e3df7cfa1")
+  (when (package! rtags :pin "f472b5d0a05270d5c93945b6a71771ab69068147")
     (when (modulep! :completion ivy)
       (package! ivy-rtags))
     (when (modulep! :completion helm)

modules/lang/clojure/config.el

@@ -10,6 +10,7 @@
 (defvar +clojure-load-clj-refactor-with-lsp nil
   "Whether or not to include clj-refactor along with clojure-lsp.")
 
+
 ;;
 ;;; Packages
 

modules/lang/go/config.el

@@ -69,6 +69,7 @@
   (set-company-backend! 'go-mode 'company-go)
   (setq company-go-show-annotation t))
 
+
 (use-package! flycheck-golangci-lint
   :when (and (modulep! :checkers syntax)
              (not (modulep! :checkers syntax +flymake)))

modules/lang/haskell/config.el

@@ -6,7 +6,7 @@
 
 
 ;;
-;;; Common packages
+;;; Packages
 
 (after! haskell-mode
   (setq haskell-process-suggest-remove-import-lines t  ; warnings for redundant imports etc

modules/lang/ocaml/config.el

@@ -132,5 +132,5 @@
   (opam-switch-set-switch (tuareg-opam-current-compiler)))
 
 
-(eval-when! (modulep! +tree-sitter)
+(when (modulep! +tree-sitter)
   (add-hook 'tuareg-mode-local-vars-hook #'tree-sitter!))

modules/os/macos/config.el

@@ -18,7 +18,9 @@
 ;; Visit files opened outside of Emacs in existing frame, not a new one
 (setq ns-pop-up-frames nil)
 
-;; sane trackpad/mouse scroll settings
+;; Sane trackpad/mouse scroll settings. Also disables smooth scrolling because
+;; it's disturbingly clunky and slow without something like
+;; jdtsmith/ultra-scroll-mac.
 (setq mac-redisplay-dont-reset-vscroll t
       mac-mouse-wheel-smooth-scroll nil)
 

modules/tools/lsp/+eglot.el

@@ -4,15 +4,6 @@
   :commands eglot eglot-ensure
   :hook (eglot-managed-mode . +lsp-optimization-mode)
   :init
-  (defadvice! +eglot--ensure-available-mode-a (fn)
-    "Run `eglot-ensure' if the current mode has support."
-    :around #'eglot-ensure
-    (when (alist-get major-mode eglot-server-programs nil nil
-                     (lambda (modes key)
-                       (if (listp modes)
-                           (member key modes)
-                         (eq key modes))))
-      (funcall fn)))
   (setq eglot-sync-connect 1
         eglot-autoshutdown t
         ;; NOTE: We disable eglot-auto-display-help-buffer because :select t in

modules/tools/lsp/autoload/common.el

@@ -5,6 +5,9 @@
   "Dispatch to call the currently used lsp client entrypoint"
   (interactive)
   (if (modulep! +eglot)
-      (eglot-ensure)
+      (when (require 'eglot nil t)
+        (if (eglot--lookup-mode major-mode)
+            (eglot-ensure)
+          (eglot--message "No client defined for %s" major-mode)))
     (unless (bound-and-true-p lsp-mode)
       (lsp-deferred))))

modules/tools/magit/config.el

@@ -227,7 +227,10 @@ Only has an effect in GUI Emacs.")
         (:map magit-status-mode-map
          :nv "gz" #'magit-refresh)
         (:map magit-diff-mode-map
-         :nv "gd" #'magit-jump-to-diffstat-or-diff))
+         :nv "gd" #'magit-jump-to-diffstat-or-diff)
+        ;; Don't open recursive process buffers
+        (:map magit-process-mode-map
+         :nv "`" #'ignore))
 
   ;; A more intuitive behavior for TAB in magit buffers:
   (define-key! 'normal

modules/ui/popup/autoload/settings.el

@@ -163,6 +163,7 @@ used.
 \(fn PREDICATE &key IGNORE ACTIONS SIDE SIZE WIDTH HEIGHT SLOT VSLOT TTL QUIT SELECT MODELINE AUTOSAVE PARAMETERS)"
   (declare (indent defun))
   (push (+popup-make-rule predicate plist) +popup--display-buffer-alist)
+  ;; TODO: Don't overwrite user entries in `display-buffer-alist'
   (when (bound-and-true-p +popup-mode)
     (setq display-buffer-alist +popup--display-buffer-alist))
   +popup--display-buffer-alist)