Merge branch 'main' of git.sr.ht:~marcuskammer/emacs.d

bundle/bundle--package.el

@@ -71,9 +71,8 @@
   :mode (("\\.lisp$" . lisp-mode)
          ("\\.lsp$" . lisp-mode)
          ("\\.cl$" . lisp-mode))
-  :custom
-  (lisp-indent-function 'common-lisp-indent-function)
   :config
+  (setq lisp-indent-function 'common-lisp-indent-function)
   (if (eq system-type 'windows-nt)
       (setq inferior-lisp-program "sbcl --noinform")
     (setq inferior-lisp-program "/usr/bin/sbcl --noinform"))
@@ -329,13 +328,23 @@
   ;;   (add-hook 'after-save-hook (lambda () (compile compile-command))))
   ;; (add-hook 'c-mode-common-hook 'me/c-mode-compile-on-save))
 
-(use-package js-mode
-  :ensure nil
-  :hook (js-mode . eglot-ensure)
-  :mode (("\\.webmanifest\\'" . js-mode)
-         ("\\.js\\'" . js-mode)
-         ("\\.mjs\\'" . js-mode)
-         ("\\.cjs\\'" . js-mode)))
+;; (use-package js-mode
+;;   :ensure nil
+;;   :hook (js-mode . eglot-ensure)
+  ;; :mode (("\\.webmanifest\\'" . js-mode)
+  ;;        ("\\.js\\'" . js-mode)
+  ;;        ("\\.mjs\\'" . js-mode)
+  ;;        ("\\.cjs\\'" . js-mode)))
+
+(use-package js2-mode
+             :defer t
+             :mode
+             (("\\.webmanifest\\'" . js2-mode)
+              ("\\.js\\'" . js2-mode)
+              ("\\.mjs\\'" . js2-mode)
+              ("\\.cjs\\'" . js2-mode))
+             :config
+             (add-to-list 'interpreter-mode-alist '("node" . js2-mode)))
 
 (use-package go-mode
   :mode ("\\.go\\'" . go-mode)
@@ -460,15 +469,19 @@
   (global-set-key (kbd "C-x M-g") 'magit-dispatch))
 
 (use-package yaml-mode
+  :defer t
   :mode "\\.yml\\'")
 
 (use-package csv-mode
+  :defer t
   :mode "\\.csv\\'")
 
 (use-package markdown-mode
+  :defer t
   :mode "\\.md\\'")
 
 (use-package typescript-mode
+  :defer t
   :mode "\\.ts\\'"
   :hook (typescript-mode . eglot-ensure)
   :config (setq typescript-indent-level 2))