Browse code
refactor(emacs,lsp): move lsp to its own configuration file
Edward Langley authored on 04/05/2021 01:21:34Showing 2 changed files
| ... | ... |
@@ -90,22 +90,7 @@ |
| 90 | 90 |
:ensure t) |
| 91 | 91 |
|
| 92 | 92 |
|
| 93 |
-(use-package lsp-mode |
|
| 94 |
- :ensure t |
|
| 95 |
- :config (setq lsp-enable-snippet nil)) |
|
| 96 |
- |
|
| 97 |
-(defun fwoar/lsp-ui-hook () |
|
| 98 |
- (lsp-ui-sideline-mode -1)) |
|
| 99 |
- |
|
| 100 |
-(use-package lsp-ui |
|
| 101 |
- :after lsp-mode |
|
| 102 |
- :ensure t |
|
| 103 |
- :config |
|
| 104 |
- (add-hook 'lsp-ui-mode-hook 'fwoar/lsp-ui-hook)) |
|
| 105 |
- |
|
| 106 |
-(use-package lsp-treemacs |
|
| 107 |
- :after lsp-mode treemacs |
|
| 108 |
- :ensure t) |
|
| 93 |
+(load-package-configuration 'lsp) |
|
| 109 | 94 |
|
| 110 | 95 |
(defvar fwoar-git-mode :ssh) |
| 111 | 96 |
(when (locate-library "site-lisp") |
| ... | ... |
@@ -704,18 +689,6 @@ With a prefix ARG invalidates the cache first." |
| 704 | 689 |
(evil-define-key 'normal maven-test-mode-map |
| 705 | 690 |
(kbd "<leader>t") 'maven-test-all |
| 706 | 691 |
(kbd "<leader>T") 'maven-test-toggle-between-test-and-class-other-window)) |
| 707 |
-(use-package lsp-java |
|
| 708 |
- :ensure t |
|
| 709 |
- :hook (java-mode . lsp)) |
|
| 710 |
- |
|
| 711 |
-(use-package lsp-haskell |
|
| 712 |
- :ensure t |
|
| 713 |
- :config |
|
| 714 |
- (setq lsp-haskell-process-path-hie "ghcide") |
|
| 715 |
- (setq lsp-haskell-process-args-hie '()) |
|
| 716 |
- ;; Comment/uncomment this line to see interactions between lsp client/server. |
|
| 717 |
- ;;(setq lsp-log-io t) |
|
| 718 |
- ) |
|
| 719 | 692 |
|
| 720 | 693 |
(progn |
| 721 | 694 |
(require 'ansi-color) |
| 722 | 695 |
new file mode 100644 |
| ... | ... |
@@ -0,0 +1,40 @@ |
| 1 |
+(use-package lsp-mode |
|
| 2 |
+ :ensure t |
|
| 3 |
+ :config (setq lsp-enable-snippet t)) |
|
| 4 |
+ |
|
| 5 |
+(defun fwoar/lsp-ui-hook () |
|
| 6 |
+ (lsp-ui-sideline-mode -1)) |
|
| 7 |
+ |
|
| 8 |
+(use-package lsp-ui |
|
| 9 |
+ :after lsp-mode |
|
| 10 |
+ :ensure t |
|
| 11 |
+ :config |
|
| 12 |
+ (add-hook 'lsp-ui-mode-hook 'fwoar/lsp-ui-hook)) |
|
| 13 |
+ |
|
| 14 |
+(comment |
|
| 15 |
+ (use-package lsp-treemacs |
|
| 16 |
+ :after lsp-mode treemacs |
|
| 17 |
+ :ensure t) |
|
| 18 |
+ |
|
| 19 |
+ (use-package maven-test-mode |
|
| 20 |
+ :ensure t |
|
| 21 |
+ :after general evil |
|
| 22 |
+ :hook java-mode |
|
| 23 |
+ :config |
|
| 24 |
+ (evil-define-key 'normal maven-test-mode-map |
|
| 25 |
+ (kbd "<leader>t") 'maven-test-all |
|
| 26 |
+ (kbd "<leader>T") 'maven-test-toggle-between-test-and-class-other-window)) |
|
| 27 |
+ |
|
| 28 |
+ (use-package lsp-java |
|
| 29 |
+ :ensure t |
|
| 30 |
+ :hook (java-mode . lsp))) |
|
| 31 |
+ |
|
| 32 |
+(comment |
|
| 33 |
+ (use-package lsp-haskell |
|
| 34 |
+ :ensure t |
|
| 35 |
+ :config |
|
| 36 |
+ (setq lsp-haskell-process-path-hie "ghcide") |
|
| 37 |
+ (setq lsp-haskell-process-args-hie '()) |
|
| 38 |
+ ;; Comment/uncomment this line to see interactions between lsp client/server. |
|
| 39 |
+ ;;(setq lsp-log-io t) |
|
| 40 |
+ )) |