diff --git a/custom.el b/custom.el index cd37bcc..1f6ee7a 100644 --- a/custom.el +++ b/custom.el @@ -6,13 +6,13 @@ ;; If there is more than one, they won't work right. '(package-selected-packages '(aider browse-kill-ring caddyfile-mode cape cider company corfu - dockerfile-mode dumb-jump dumber-jump emacs-lldb - exec-path-from-shell flycheck fsharp-mode haskell-mode - haskell-ts-mode helm htmlize idris-mode marginalia - markdown-ts-mode move-text multiple-cursors odin-mode - orderless org-mode parinfer-rust-mode realgud-lldb rg sly - terraform-mode tree-sitter-langs vertico visual-fill-column - yasnippet-snippets zig-mode)) + dockerfile-mode dumb-jump dumber-jump emacs-lldb emmet + emmet-mode exec-path-from-shell flycheck fsharp-mode + haskell-mode haskell-ts-mode helm htmlize idris-mode + marginalia markdown-ts-mode move-text multiple-cursors + odin-mode orderless org-mode parinfer-rust-mode + realgud-lldb rg sly terraform-mode tree-sitter-langs + vertico visual-fill-column yasnippet-snippets zig-mode)) '(safe-local-variable-directories '("/Users/grant/programming/project/edit/")) '(safe-local-variable-values '((Package . CL-USER) (Syntax . ANSI-Common-Lisp) (Base . 10) diff --git a/init.el b/init.el index 579b38e..0723daf 100644 --- a/init.el +++ b/init.el @@ -61,7 +61,6 @@ ;; Add .asdf to exec-path (when (file-exists-p (file-truename "~/.asdf")) - (setq env-changed t) (push (file-truename "~/.asdf/shims") exec-path) (push (file-truename "~/.asdf/bin") exec-path)) @@ -69,8 +68,7 @@ (setq exec-path (cl-remove-if (lambda (s) (and (< 5 (length s)) - (string= (substring s 0 6) "/mnt/c") - (setq env-changed t))) + (string= (substring s 0 6) "/mnt/c"))) exec-path)) (when exec-path @@ -157,14 +155,14 @@ :defer t) (use-package tree-sitter - :mode ((" \\.tsx\\'" . tsx-ts-mode) - (" \\.js\\'" . typescript-ts-mode) - (" \\.mjs\\'" . typescript-ts-mode) - (" \\.mts\\'" . typescript-ts-mode) - (" \\.cjs\\'" . typescript-ts-mode) - (" \\.ts\\'" . typescript-ts-mode) - (" \\.jsx\\'" . tsx-ts-mode) - (" \\.json\\'" . json-ts-mode)) + :mode (("\\.tsx\\'" . tsx-ts-mode) + ("\\.js\\'" . typescript-ts-mode) + ("\\.mjs\\'" . typescript-ts-mode) + ("\\.mts\\'" . typescript-ts-mode) + ("\\.cjs\\'" . typescript-ts-mode) + ("\\.ts\\'" . typescript-ts-mode) + ("\\.jsx\\'" . tsx-ts-mode) + ("\\.json\\'" . json-ts-mode)) :custom (treesit-extra-load-path '("~/repos/tree-sitter-module/dist"))) @@ -433,3 +431,16 @@ (use-package move-text :bind (("M-" . move-text-up) ("M-" . move-text-down))) + +(use-package emmet-mode + :hook (sgml-mode tsx-ts-mode) + :custom + (emmet-jsx-major-modes + '(rjsx-mode + typescript-tsx-mode + js-jsx-mode + js2-jsx-mode + jsx-mode + js-mode + ;; Need to add this + tsx-ts-mode)))