Merge branch 'master' of ssh://git.lambdashire.com:9774/mprodrigues/emacs.d

elisp/extras.el

@@ -179,30 +179,30 @@
   (add-to-list 'auto-mode-alist '("\\.js\\'" . rjsx-mode)))
 
 ;; Typescript
-(use-package tide
+;; (use-package tide
-  :disabled
+;;   :disabled
-  :config
+;;   :config
-  (load "~/.emacs.d/elisp/typescript.el"))
+;;   (load "~/.emacs.d/elisp/typescript.el"))
 
-(use-package typescript-mode
+;; (use-package typescript-mode
-  :ensure t
+;;   :ensure t
-  :init
+;;   :init
-  (define-derived-mode typescript-tsx-mode typescript-mode "tsx")
+;;   (define-derived-mode typescript-tsx-mode typescript-mode "tsx")
-  :config
+;;   :config
-  (add-hook 'typescript-mode #'subword-mode)
+;;   (add-hook 'typescript-mode #'subword-mode)
-  (add-to-list 'auto-mode-alist '("\\.tsx?\\'" . typescript-tsx-mode)))
+;;   (add-to-list 'auto-mode-alist '("\\.tsx?\\'" . typescript-tsx-mode)))
 
-(use-package tree-sitter
+;; (use-package tree-sitter
-  :straight t
+;;   :straight t
-  :hook ((typescript-mode . tree-sitter-hl-mode)
+;;   :hook ((typescript-mode . tree-sitter-hl-mode)
-	 (typescript-tsx-mode . tree-sitter-hl-mode)))
+;; 	 (typescript-tsx-mode . tree-sitter-hl-mode)))
 
-(use-package tree-sitter-langs
+;; (use-package tree-sitter-langs
-  :straight t
+;;   :straight t
-  :after tree-sitter
+;;   :after tree-sitter
-  :config
+;;   :config
-  (tree-sitter-require 'tsx)
+;;   (tree-sitter-require 'tsx)
-  (add-to-list 'tree-sitter-major-mode-language-alist '(typescript-tsx-mode . tsx)))
+;;   (add-to-list 'tree-sitter-major-mode-language-alist '(typescript-tsx-mode . tsx)))
 
 ;; Geiser
 (use-package geiser)

elisp/keypad.el

@@ -1,5 +1,7 @@
 ;; magit
 (global-set-key (kbd "C-x g") 'magit-status)
+;; eshell
+(global-set-key (kbd "<f4>") 'eshell)
 
 ;; number pad keys
 (global-set-key (kbd "<kp-decimal>") 'other-window)