diff options
| -rw-r--r-- | emacs | 40 | ||||
| -rw-r--r-- | emacs.d/custom.el | 3 |
2 files changed, 28 insertions, 15 deletions
@@ -277,10 +277,26 @@ :ensure t :defer t) -(use-package treesit - :init - (setq treesit-extra-load-path '("~/.guix-home/profile/lib/tree-sitter"))) - +(use-package treesit) + +(setq treesit-language-source-alist + '((bash "https://github.com/tree-sitter/tree-sitter-bash") + (cmake "https://github.com/uyha/tree-sitter-cmake") + (css "https://github.com/tree-sitter/tree-sitter-css") + (elisp "https://github.com/Wilfred/tree-sitter-elisp") + (go "https://github.com/tree-sitter/tree-sitter-go") + (html "https://github.com/tree-sitter/tree-sitter-html") + (javascript "https://github.com/tree-sitter/tree-sitter-javascript" "master" "src") + (json "https://github.com/tree-sitter/tree-sitter-json") + (make "https://github.com/alemuller/tree-sitter-make") + (markdown "https://github.com/ikatyang/tree-sitter-markdown") + (python "https://github.com/tree-sitter/tree-sitter-python") + (toml "https://github.com/tree-sitter/tree-sitter-toml") + (tsx "https://github.com/tree-sitter/tree-sitter-typescript" "master" "tsx/src") + (typescript "https://github.com/tree-sitter/tree-sitter-typescript" "master" "typescript/src") + (yaml "https://github.com/ikatyang/tree-sitter-yaml"))) + + ;; Project (bind-key "C-x p s" 'eat-project) @@ -331,11 +347,13 @@ (add-hook 'terraform-mode-hook 'my-terraform-mode-init)) (add-hook 'terraform-mode-hook 'eglot-ensure) +(unless (package-installed-p 'typescript-mode) + (package-install 'typescript-mode)) -(add-to-list 'auto-mode-alist '("\\.ts\\'" . typescript-ts-mode)) +(add-to-list 'auto-mode-alist '("\\.ts\\'" . typescript-mode)) (add-to-list 'auto-mode-alist '("\\.tsx\\'" . tsx-ts-mode)) (add-to-list 'auto-mode-alist '("\\.tf\\'" . terraform-mode)) -(add-to-list 'auto-mode-alist '("\\.json\\'" . json-ts-mode)) +(add-to-list 'auto-mode-alist '("\\.json\\'" . json-mode)) (add-to-list 'auto-mode-alist '("\\.ml\\'" . tuareg-mode)) (add-to-list 'auto-mode-alist '("\\.mli\\'" . tuareg-mode)) @@ -368,9 +386,9 @@ (unless (package-installed-p 'smartparens) (package-install 'smartparens)) -(add-hook 'typescript-ts-mode-hook 'prettier-js-mode) +(add-hook 'typescript-mode-hook 'prettier-js-mode) (add-hook 'tsx-ts-mode 'prettier-js-mode) -(add-hook 'typescript-ts-mode-hook #'smartparens-mode) +(add-hook 'typescript-mode-hook #'smartparens-mode) (add-hook 'json-ts-mode-hook #'smartparens-mode) (add-hook 'tuareg-mode-hook #'smartparens-mode) (add-hook 'terraform-mode-hook #'smartparens-mode) @@ -585,12 +603,6 @@ -;; Auto dim buffers -(unless (package-installed-p 'auto-dim-other-buffers) - (package-install 'auto-dim-other-buffers)) - -(auto-dim-other-buffers-mode) - ;; Keybindings (defvar marc-minor-mode-map (make-keymap) "marc-minor-mode keymap.") (define-key marc-minor-mode-map (kbd "C-c C-k") 'eldoc) diff --git a/emacs.d/custom.el b/emacs.d/custom.el index cb59ca4..53651ca 100644 --- a/emacs.d/custom.el +++ b/emacs.d/custom.el @@ -62,7 +62,7 @@ '(org-babel-load-languages '((emacs-lisp . t) (lisp . t) (shell . t))) '(org-fold-core-style 'overlays) '(package-selected-packages - '(slime eat avy monotropic-theme tempel vundo add-node-modules-path prettier password-store vc-fossil eldoc-box mu4e direnv elpher w3m elfeed-protocol elfeed ligature copilot f editorconfig s quelpa-use-package quelpa org-mime org-journal which-key consult orderless vertico markdown-mode smartparens tree-sitter-langs diff-hl magit corfu rg almost-mono-themes git-ps1-mode meow)) + '(typescript-mode slime eat avy monotropic-theme tempel vundo add-node-modules-path prettier password-store vc-fossil eldoc-box mu4e direnv elpher w3m elfeed-protocol elfeed ligature copilot f editorconfig s quelpa-use-package quelpa org-mime org-journal which-key consult orderless vertico markdown-mode smartparens tree-sitter-langs diff-hl magit corfu rg almost-mono-themes git-ps1-mode meow)) '(project-switch-commands '((project-find-file "Find file" nil) (project-find-regexp "Find regexp" nil) @@ -148,6 +148,7 @@ ;; If you edit it by hand, you could mess it up, so be careful. ;; Your init file should contain only one such instance. ;; If there is more than one, they won't work right. + '(default ((t (:inherit nil :extend nil :stipple nil :background "#ffffff" :foreground "#000000" :inverse-video nil :box nil :strike-through nil :overline nil :underline nil :slant normal :weight regular :height 100 :width normal :foundry "B&H " :family "Iosevka Term Curly")))) '(diff-hl-insert ((t (:background "green" :foreground "green")))) '(dired-directory ((t (:inherit font-lock-function-name-face :weight bold)))) '(elfeed-search-feed-face ((t (:foreground "dim gray")))) |