yogsototh/doom-emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

nit: minor comment reformatting & revision

Browse source
This commit is contained in:
Henrik Lissner 2024-03-26 10:39:24 -04:00 committed by Yann Esposito (Yogsototh)
parent 75dd1a1f45
commit 28ee896420
Signed by untrusted user who does not match committer: yogsototh
GPG key ID: 7B19A4C650D59646
5 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
bin/doom
View file

@ -89,9 +89,9 @@
(user-error (message "Error: %s" (cadr e)) (user-error (message "Error: %s" (cadr e))
(kill-emacs 2))) (kill-emacs 2)))
;; UX: Abort if the user is using 'doom' as root, unless ~/.config/emacs is ;; UX: Abort if the user is using 'doom' as root, unless $EMACSDIR is owned by
;; owned by root, in which case we assume the user genuinely wants root to be ;; root, in which case we can safely assume the user genuinely wants root to
;; their primary user account for Emacs. ;; be their primary user account for this session.
(when (equal 0 (user-real-uid)) (when (equal 0 (user-real-uid))
(unless (equal 0 (file-attribute-user-id (file-attributes doom-emacs-dir))) (unless (equal 0 (file-attribute-user-id (file-attributes doom-emacs-dir)))
(message (message

2
modules/app/everywhere/config.el
View file

@ -8,7 +8,7 @@
:config :config
(set-yas-minor-mode! 'emacs-everywhere-mode) (set-yas-minor-mode! 'emacs-everywhere-mode)
;; HACK Inhibit MAJOR-MODE-local-vars-hook in emacs-everywhere buffers, ;; HACK: Inhibit MAJOR-MODE-local-vars-hook in emacs-everywhere buffers,
;; because Doom commonly starts servers and other extraneous services on ;; because Doom commonly starts servers and other extraneous services on
;; this hook, which will rarely work well in emacs-everywhere's temporary ;; this hook, which will rarely work well in emacs-everywhere's temporary
;; buffers anyway. ;; buffers anyway.

2
modules/lang/nix/config.el
View file

@ -11,8 +11,6 @@
:interpreter ("\\(?:cached-\\)?nix-shell" . +nix-shell-init-mode) :interpreter ("\\(?:cached-\\)?nix-shell" . +nix-shell-init-mode)
:mode "\\.nix\\'" :mode "\\.nix\\'"
:init :init
;; Treat flake.lock files as json. Fall back to js-mode because it's faster
;; than js2-mode, and its extra features aren't needed there.
(add-to-list 'auto-mode-alist (add-to-list 'auto-mode-alist
(cons "/flake\\.lock\\'" (cons "/flake\\.lock\\'"
(if (modulep! :lang json) (if (modulep! :lang json)

5
modules/ui/ligatures/config.el
View file

@ -161,8 +161,9 @@ and cannot run in."
(fboundp 'mac-auto-operator-composition-mode)) (fboundp 'mac-auto-operator-composition-mode))
(add-hook 'doom-init-ui-hook #'mac-auto-operator-composition-mode 'append)) (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, ;; This module does not support Emacs 27 and less, but if we still try to
;; it will end up in catastrophic work-loss errors, so we leave the check here for safety. ;; enable ligatures, it will end up in catastrophic work-loss errors, so we
;; leave the check here for safety.
((and (> emacs-major-version 27) ((and (> emacs-major-version 27)
(or (featurep 'ns) (or (featurep 'ns)
(string-match-p "HARFBUZZ" system-configuration-features)) (string-match-p "HARFBUZZ" system-configuration-features))

2
modules/ui/treemacs/config.el
View file

@ -26,7 +26,7 @@ This must be set before `treemacs' has loaded.")
treemacs-persist-file (concat doom-cache-dir "treemacs-persist") treemacs-persist-file (concat doom-cache-dir "treemacs-persist")
treemacs-last-error-persist-file (concat doom-cache-dir "treemacs-last-error-persist")) treemacs-last-error-persist-file (concat doom-cache-dir "treemacs-last-error-persist"))
:config :config
;; Don't follow the cursor ;; Don't follow the cursor (it's more disruptive/jarring than helpful as a default)
(treemacs-follow-mode -1) (treemacs-follow-mode -1)
(set-popup-rule! "^ ?\\*Treemacs" :ignore t) (set-popup-rule! "^ ?\\*Treemacs" :ignore t)