From a1d5f323dfbe168e477494e99a9155e1499ac55f Mon Sep 17 00:00:00 2001 From: Mateus Rodrigues Date: Thu, 9 Mar 2023 12:36:51 +0000 Subject: [PATCH 1/2] Use built-in tree-sitter from emacs 29. Emacs 29 comes with native tree-sitter implementation, so I'm commenting out this stuff for now (probably will be deleted). All these configs can be eventually remade, if need be, using the native tree-sitter. --- elisp/extras.el | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/elisp/extras.el b/elisp/extras.el index 4ba85c2..e911143 100644 --- a/elisp/extras.el +++ b/elisp/extras.el @@ -174,30 +174,30 @@ (add-to-list 'auto-mode-alist '("\\.js\\'" . rjsx-mode))) ;; Typescript -(use-package tide - :disabled - :config - (load "~/.emacs.d/elisp/typescript.el")) +;; (use-package tide +;; :disabled +;; :config +;; (load "~/.emacs.d/elisp/typescript.el")) -(use-package typescript-mode - :ensure t - :init - (define-derived-mode typescript-tsx-mode typescript-mode "tsx") - :config - (add-hook 'typescript-mode #'subword-mode) - (add-to-list 'auto-mode-alist '("\\.tsx?\\'" . typescript-tsx-mode))) +;; (use-package typescript-mode +;; :ensure t +;; :init +;; (define-derived-mode typescript-tsx-mode typescript-mode "tsx") +;; :config +;; (add-hook 'typescript-mode #'subword-mode) +;; (add-to-list 'auto-mode-alist '("\\.tsx?\\'" . typescript-tsx-mode))) -(use-package tree-sitter - :straight t - :hook ((typescript-mode . tree-sitter-hl-mode) - (typescript-tsx-mode . tree-sitter-hl-mode))) +;; (use-package tree-sitter +;; :straight t +;; :hook ((typescript-mode . tree-sitter-hl-mode) +;; (typescript-tsx-mode . tree-sitter-hl-mode))) -(use-package tree-sitter-langs - :straight t - :after tree-sitter - :config - (tree-sitter-require 'tsx) - (add-to-list 'tree-sitter-major-mode-language-alist '(typescript-tsx-mode . tsx))) +;; (use-package tree-sitter-langs +;; :straight t +;; :after tree-sitter +;; :config +;; (tree-sitter-require 'tsx) +;; (add-to-list 'tree-sitter-major-mode-language-alist '(typescript-tsx-mode . tsx))) ;; Geiser (use-package geiser) From 70da73c091e064e827b8532d1b283d85a19e43d2 Mon Sep 17 00:00:00 2001 From: Mateus Rodrigues Date: Thu, 9 Mar 2023 12:40:31 +0000 Subject: [PATCH 2/2] Bind eshell to F4. This keybind will probably change in the future. --- elisp/keypad.el | 2 ++ 1 file changed, 2 insertions(+) diff --git a/elisp/keypad.el b/elisp/keypad.el index 9d3d44c..7d2a07a 100644 --- a/elisp/keypad.el +++ b/elisp/keypad.el @@ -1,5 +1,7 @@ ;; magit (global-set-key (kbd "C-x g") 'magit-status) +;; eshell +(global-set-key (kbd "") 'eshell) ;; number pad keys (global-set-key (kbd "") 'other-window)