diff options
Diffstat (limited to '')
| -rw-r--r-- | init.el | 1 | ||||
| -rw-r--r-- | settings/setup-dap-mode.el | 3 | ||||
| -rw-r--r-- | settings/setup-haskell-mode.el | 4 | ||||
| -rw-r--r-- | settings/setup-lisp-mode.el | 2 | ||||
| -rw-r--r-- | settings/setup-lsp-mode.el | 3 | ||||
| -rw-r--r-- | settings/setup-treemacs.el | 3 | ||||
| -rw-r--r-- | settings/setup-web-mode.el | 6 |
7 files changed, 15 insertions, 7 deletions
@@ -85,6 +85,7 @@ ido-vertical-mode jinja2-mode json + just-mode lsp-dart lsp-haskell lsp-mode diff --git a/settings/setup-dap-mode.el b/settings/setup-dap-mode.el index 208e1c8..9ba8f49 100644 --- a/settings/setup-dap-mode.el +++ b/settings/setup-dap-mode.el @@ -1,4 +1,7 @@ ;;; setup-dap-mode.el --- -*- lexical-binding: t; -*- +(dap-ui-mode) +(dap-ui-controls-mode) + (with-eval-after-load 'dap-mode (define-key dap-mode-map (kbd "C-c d d") 'dap-hydra)) diff --git a/settings/setup-haskell-mode.el b/settings/setup-haskell-mode.el index 3747f94..fd83fca 100644 --- a/settings/setup-haskell-mode.el +++ b/settings/setup-haskell-mode.el @@ -10,8 +10,8 @@ ("<=" . ?≤) ("()" . ?∅)))) -(add-hook 'haskell-mode-hook 'hasklig-mode) -(add-hook 'haskell-mode-hook 'haskell/pretty-symbols) +;; (add-hook 'haskell-mode-hook 'hasklig-mode) +;; (add-hook 'haskell-mode-hook 'haskell/pretty-symbols) ;; (setq inferior-haskell-find-project-root nil) diff --git a/settings/setup-lisp-mode.el b/settings/setup-lisp-mode.el index 6f8cdcb..82420d5 100644 --- a/settings/setup-lisp-mode.el +++ b/settings/setup-lisp-mode.el @@ -27,8 +27,6 @@ (add-hook 'lisp-mode-hook 'enable-paredit-mode) (add-hook 'emacs-lisp-mode-hook 'enable-paredit-mode) -(slime-mode) - ;; setup eval inferior lisp in slime ;; (define-key global-map (kbd "C-c C-e") 'slime-eval-last-expression) diff --git a/settings/setup-lsp-mode.el b/settings/setup-lsp-mode.el index f92ef15..a268e2b 100644 --- a/settings/setup-lsp-mode.el +++ b/settings/setup-lsp-mode.el @@ -13,6 +13,8 @@ ;; TRACK: https://github.com/emacs-lsp/lsp-ui/issues/613 (setq lsp-ui-doc-enable nil) (setq lsp-clients-clangd-args '("--compile-commands-dir=build")) +(setq lsp-disabled-clients '()) + (lsp-treemacs-sync-mode 1) @@ -24,6 +26,7 @@ (add-hook 'python-mode-hook #'lsp) (add-hook 'rustic-mode #'lsp) (add-hook 'web-mode-hook #'lsp) +(add-hook 'typescript-mode-hook #'lsp) (add-hook 'lsp-after-open-hook 'lsp-ui-mode) diff --git a/settings/setup-treemacs.el b/settings/setup-treemacs.el index 858e064..6b4773c 100644 --- a/settings/setup-treemacs.el +++ b/settings/setup-treemacs.el @@ -12,7 +12,8 @@ ("t" . treemacs-select-window) ("b" . treemacs-bookmark) ("f" . treemacs-find-file) - ("d" . treemacs-delete-other-windows))) + ("d" . treemacs-delete-other-windows) + ("s" . lsp-treemacs-symbols))) (provide 'setup-treemacs) ;;; setup-treemacs.el ends here diff --git a/settings/setup-web-mode.el b/settings/setup-web-mode.el index e476dc2..8a4f088 100644 --- a/settings/setup-web-mode.el +++ b/settings/setup-web-mode.el @@ -1,4 +1,5 @@ (require 'web-mode) +(require 'typescript-mode) (add-to-list 'auto-mode-alist '("\\.[agj]sp\\'" . web-mode)) (add-to-list 'auto-mode-alist '("\\.as[cp]x\\'" . web-mode)) @@ -7,8 +8,8 @@ (add-to-list 'auto-mode-alist '("\\.hbs\\'" . web-mode)) (add-to-list 'auto-mode-alist '("\\.html?\\'" . web-mode)) (add-to-list 'auto-mode-alist '("\\.js\\'" . web-mode)) -(add-to-list 'auto-mode-alist '("\\.ts\\'" . web-mode)) -(add-to-list 'auto-mode-alist '("\\.tsx\\'" . web-mode)) +(add-to-list 'auto-mode-alist '("\\.ts\\'" . typescript-mode)) +(add-to-list 'auto-mode-alist '("\\.tsx\\'" . typescript-mode)) (add-to-list 'auto-mode-alist '("\\.mustache\\'" . web-mode)) (add-to-list 'auto-mode-alist '("\\.tpl\\'" . web-mode)) (add-to-list 'auto-mode-alist '("\\.eex\\'" . web-mode)) @@ -37,6 +38,7 @@ ;; '(add-hook 'web-mode-hook #'add-node-modules-path)) (add-hook 'web-mode-hook 'indent-offset) +(add-hook 'web-mode-hook 'prettier-mode) ;(add-hook 'web-mode-hook 'prettier-js-mode) (provide 'setup-web-mode) |