diff --git a/.gitmodules b/.gitmodules index 39fda36..68ca2a5 100644 --- a/.gitmodules +++ b/.gitmodules @@ -100,3 +100,18 @@ [submodule "site-lisp/tsi"] path = site-lisp/tsi url = https://github.com/orzechowskid/tsi.el.git +[submodule "site-lisp/prettier"] + path = site-lisp/prettier + url = https://github.com/jscheid/prettier.el.git +[submodule "site-lisp/iter2"] + path = site-lisp/iter2 + url = https://github.com/doublep/iter2.git +[submodule "site-lisp/nvm"] + path = site-lisp/nvm + url = https://github.com/rejeep/nvm.el.git +[submodule "site-lisp/f"] + path = site-lisp/f + url = https://github.com/rejeep/f.el.git +[submodule "site-lisp/s"] + path = site-lisp/s + url = https://github.com/magnars/s.el.git diff --git a/init.el b/init.el index 2fd2237..1872260 100644 --- a/init.el +++ b/init.el @@ -119,6 +119,7 @@ If freezing sometimes, decrease it. If stuttering, increase it.") (require 'init-editorconfig) (require 'init-typescript) (require 'init-eglot) +(require 'init-prettier) (setq custom-file (expand-file-name "custom.el" creature/cache-dir)) diff --git a/lisp/init-prettier.el b/lisp/init-prettier.el new file mode 100644 index 0000000..aab0d46 --- /dev/null +++ b/lisp/init-prettier.el @@ -0,0 +1,17 @@ +;; -*- coding: utf-8; lexical-binding: t; -*- + +(autoload 'prettier-mode "prettier" "" t) + +(defun creature/prettier-setup () + "Enable ‘prettier-mode’ selectively." + (when (and prettier-mode + (or (not prettier-version) (prettier--in-node-modules-p))) + (prettier-mode -1))) + +(with-eval-after-load 'prettier + (add-hook 'prettier-mode-hook #'creature/prettier-setup)) + +(dolist (hook '(css-mode-hook js-mode-hook typescript-mode-hook)) + (add-hook hook #'prettier-mode)) + +(provide 'init-prettier) diff --git a/site-lisp/f b/site-lisp/f new file mode 160000 index 0000000..d50dca4 --- /dev/null +++ b/site-lisp/f @@ -0,0 +1 @@ +Subproject commit d50dca48929575642912bb5bbb2585709ba38f82 diff --git a/site-lisp/iter2 b/site-lisp/iter2 new file mode 160000 index 0000000..0cfd732 --- /dev/null +++ b/site-lisp/iter2 @@ -0,0 +1 @@ +Subproject commit 0cfd73224557d3b8282f4f5b24cbbfa4e0120184 diff --git a/site-lisp/nvm b/site-lisp/nvm new file mode 160000 index 0000000..c214762 --- /dev/null +++ b/site-lisp/nvm @@ -0,0 +1 @@ +Subproject commit c214762fd6f539ec3e1fd8198cefbdb4b428b19c diff --git a/site-lisp/prettier b/site-lisp/prettier new file mode 160000 index 0000000..e419bb7 --- /dev/null +++ b/site-lisp/prettier @@ -0,0 +1 @@ +Subproject commit e419bb7a916c38a4a62632c49233de1523f41218 diff --git a/site-lisp/s b/site-lisp/s new file mode 160000 index 0000000..e957dcb --- /dev/null +++ b/site-lisp/s @@ -0,0 +1 @@ +Subproject commit e957dcb0677da18b2bb60ad867db5df5c35b5616