Merge branch 'main' into single-monitor

This commit is contained in:
Andrew Scott 2022-05-02 12:06:31 -04:00
commit 63c932e328
Signed by: a
GPG key ID: 3EB62D0BBB8DB381

View file

@ -311,6 +311,14 @@
:init :init
(apheleia-global-mode +1)) (apheleia-global-mode +1))
(use-package tree-sitter
:config
(global-tree-sitter-mode)
(add-hook 'tree-sitter-after-on-hook #'tree-sitter-hl-mode))
(use-package tree-sitter-langs
:after tree-sitter)
;; C/C++ ;; C/C++
;(setq-default c-default-style "k&r") ;(setq-default c-default-style "k&r")
@ -338,12 +346,13 @@
:config :config
(add-to-list 'interpreter-mode-alist '("#!/usr/bin/env node" . js2-mode)) (add-to-list 'interpreter-mode-alist '("#!/usr/bin/env node" . js2-mode))
(setq js2-mode-show-strict-warnings nil) (setq js2-mode-show-strict-warnings nil)
:hook ('js-mode-hook 'js2-minor-mode)) :hook (js-mode . js2-minor-mode))
(use-package typescript-mode (use-package typescript-mode
:config :config
(setq typescript-indent-level 2) (setq typescript-indent-level 2)
:mode ("\\.ts\\'" . typescript-mode)) :mode ("\\.ts\\'" . typescript-mode)
("\\.tsx\\'" . typescript-mode))
(use-package restclient (use-package restclient
:init :init
@ -355,18 +364,20 @@
(typescript-mode . rainbow-mode) (typescript-mode . rainbow-mode)
(web-mode . rainbow-mode))) (web-mode . rainbow-mode)))
;(use-package skewer-mode ;; (use-package skewer-mode
; :init ;; :init
; (setq httpd-port 8123) ;; (setq httpd-port 8080)
; :hook ;; :hook
; (('js-mode-hook 'skewer-mode) ;; (('js-mode-hook 'skewer-mode)
; ('css-mode-hook 'skewer-css-mode) ;; ('css-mode-hook 'skewer-css-mode)
; ('html-mode-hook 'skewer-html-mode))) ;; ('html-mode-hook 'skewer-html-mode)))
;(use-package skewer-reload-stylesheets ;; (use-package skewer-reload-stylesheets
; :hook ;; :hook
; (('css-mode-hook 'skewer-reload-stylesheets-start-editing) ;; (('css-mode-hook 'skewer-reload-stylesheets-start-editing)
; ('scss-mode-hook 'skewer-reload-stylesheets-start-editing))) ;; ('scss-mode-hook 'skewer-reload-stylesheets-start-editing)))
;; (use-package simple-httpd)
(use-package web-mode (use-package web-mode
:config :config
@ -385,12 +396,8 @@
("\\.html?\\'" . web-mode))) ("\\.html?\\'" . web-mode)))
(use-package jsdoc (use-package jsdoc
:straight (jsdoc :type git :host github :repo "isamert/jsdoc.el")) :straight (jsdoc :type git :host github :repo "isamert/jsdoc.el")
:bind ("C-c C-n" . jsdoc))
; required for jsdoc
(use-package tree-sitter
:hook (js-mode . tree-sitter-mode))
(use-package tree-sitter-langs)
;; LaTeX ;; LaTeX