diff --git a/init.example.el b/init.example.el index 87b2429d7..ede5648e2 100644 --- a/init.example.el +++ b/init.example.el @@ -67,7 +67,7 @@ ;gist ; interacting with github gists ;macos ; MacOS-specific commands ;make ; run make tasks from Emacs - ;magit ; + ;magit ; a git porcelain for Emacs ;password-store ; password manager for nerds ;pdf ; pdf enhancements ;prodigy ; FIXME managing external services & code builders @@ -119,7 +119,7 @@ ;ruby ; 1.step do {|i| p "Ruby is #{i.even? ? 'love' : 'life'}"} ;rust ; Fe2O3.unwrap().unwrap().unwrap().unwrap() ;scala ; java, but good - (sh +fish) ; she sells (ba|z)sh shells on the C xor + (sh +fish) ; she sells (ba|z|fi)sh shells on the C xor ;solidity ; do you need a blockchain? No. ;swift ; who asked for emoji variables? ;web ; the tubes @@ -145,9 +145,9 @@ ;; literate config in your `doom-private-dir' whenever it changes. ;literate - ;; The default module set reasonable defaults for Emacs. It also provides - ;; a Spacemacs-inspired keybinding scheme, a custom yasnippet library, - ;; and additional ex commands for evil-mode. Use it as a reference for - ;; your own modules. + ;; The default module sets reasonable defaults for Emacs. It also + ;; provides a Spacemacs-inspired keybinding scheme, a custom yasnippet + ;; library, and additional ex commands for evil-mode. Use it as a + ;; reference for your own modules. (default +bindings +snippets +evil-commands)) diff --git a/modules/feature/lookup/autoload/lookup.el b/modules/feature/lookup/autoload/lookup.el index d188e4c7b..de5964ff9 100644 --- a/modules/feature/lookup/autoload/lookup.el +++ b/modules/feature/lookup/autoload/lookup.el @@ -141,9 +141,9 @@ point or current buffer. Falls back to dumb-jump, naive ripgrep/the_silver_searcher text search, then `evil-goto-definition' if evil-mode is active." (interactive - (list (+lookup--symbol-or-region) current-prefix-arg)) - (cond ((null identifier) - (user-error "Nothing under point")) + (list (+lookup--symbol-or-region) + current-prefix-arg)) + (cond ((null identifier) (user-error "Nothing under point")) ((and +lookup-definition-functions (+lookup--jump-to :definition identifier))) @@ -187,7 +187,9 @@ point and/or current buffer. Falls back to a naive ripgrep/the_silver_searcher search otherwise." (interactive (list (+lookup--symbol-or-region))) - (cond ((and +lookup-references-functions + (cond ((null identifier) (user-error "Nothing under point")) + + ((and +lookup-references-functions (+lookup--jump-to :references identifier))) ((+lookup--file-search identifier)) diff --git a/modules/feature/lookup/packages.el b/modules/feature/lookup/packages.el index 743c8631a..67e05165f 100644 --- a/modules/feature/lookup/packages.el +++ b/modules/feature/lookup/packages.el @@ -1,8 +1,8 @@ ;; -*- no-byte-compile: t; -*- ;;; feature/lookup/packages.el -;; `dumb-jump' uses the `helm-build-sync-source' macro, but this requires helm be -;; loaded before it is byte-compiled during installation. To ensure this, we +;; `dumb-jump' uses the `helm-build-sync-source' macro, but this requires helm +;; be loaded before it is byte-compiled during installation. To ensure this, we ;; declare helm before dumb-jump. (when (featurep! :completion helm) (depends-on! :completion helm)) diff --git a/modules/lang/javascript/config.el b/modules/lang/javascript/config.el index 470ab60b5..dbcb6d1b1 100644 --- a/modules/lang/javascript/config.el +++ b/modules/lang/javascript/config.el @@ -77,14 +77,15 @@ :config (set-electric! 'rjsx-mode :chars '(?\} ?\) ?. ?>)) (set-docsets! 'rjsx-mode +javascript-docsets) - (add-hook! 'rjsx-mode-hook - ;; jshint doesn't know how to deal with jsx - (push 'javascript-jshint flycheck-disabled-checkers)) + (when (featurep! :feature syntax-checker) + (add-hook! 'rjsx-mode-hook + ;; jshint doesn't know how to deal with jsx + (push 'javascript-jshint flycheck-disabled-checkers))) ;; `rjsx-electric-gt' relies on js2's parser to tell it when the cursor is in ;; a self-closing tag, so that it can insert a matching ending tag at point. ;; However, the parser doesn't run immediately, so a fast typist can outrun - ;; it, causing tags to stay unclosed, so force it to parse. + ;; it, causing tags to stay unclosed, so we force it to parse. (defun +javascript|reparse (n) ;; if n != 1, rjsx-electric-gt calls rjsx-maybe-reparse itself (if (= n 1) (rjsx-maybe-reparse))) diff --git a/modules/lang/org/+capture.el b/modules/lang/org/+capture.el index 4c7025664..4794bf657 100644 --- a/modules/lang/org/+capture.el +++ b/modules/lang/org/+capture.el @@ -27,7 +27,6 @@ (file+headline +org-default-notes-file "Inbox") "* %u %?\n%i" :prepend t :kill-buffer t))) - (defun +org|init-capture () (setq org-default-notes-file (expand-file-name +org-default-notes-file org-directory) +org-default-todo-file (expand-file-name +org-default-todo-file org-directory)) diff --git a/modules/lang/web/+css.el b/modules/lang/web/+css.el index 45eae706e..d68fed0a8 100644 --- a/modules/lang/web/+css.el +++ b/modules/lang/web/+css.el @@ -19,7 +19,6 @@ (add-hook 'css-mode-hook #'rainbow-delimiters-mode) (add-hook! (css-mode sass-mode stylus-mode) #'(yas-minor-mode-on - flycheck-mode rainbow-mode)) diff --git a/modules/ui/doom/config.el b/modules/ui/doom/config.el index 3e5e9bb9e..e123b2060 100644 --- a/modules/ui/doom/config.el +++ b/modules/ui/doom/config.el @@ -31,7 +31,6 @@ :config ;; improve integration w/ org-mode (add-hook 'doom-load-theme-hook #'doom-themes-org-config) - ;; more Atom-esque file icons for neotree/treemacs (when (featurep! :ui neotree) (add-hook 'doom-load-theme-hook #'doom-themes-neotree-config)