From 35b549fe481aa164a13004f0630c9da659e8e6a0 Mon Sep 17 00:00:00 2001
From: Liu Miao <liumiaogemini@foxmail.com>
Date: Tue, 15 Jun 2021 02:34:33 +0800
Subject: [PATCH] remove nox
---
lisp/prog-common.el | 49 +++++++++++++++++++++------------------------
1 file changed, 23 insertions(+), 26 deletions(-)
diff --git a/lisp/prog-common.el b/lisp/prog-common.el
index be6248b..0805f20 100644
--- a/lisp/prog-common.el
+++ b/lisp/prog-common.el
@@ -6,32 +6,29 @@
;;;
;;; Language server protocol
-(cond
- ;; Use nox as client.
- ((eq 'nox user/lsp-client)
- (use-package nox
- :load-path "lisp/nox"
- :config
- (setq nox-server-programs user/nox-server-programs)
- (dolist (hook user/nox-list)
- (add-hook hook '(lambda () (nox-ensure))))))
- ;; Use lsp-mode as client
- ((eq 'lsp-mode user/lsp-client)
- (use-package lsp-mode
- :ensure t
- :init
- (setq lsp-keymap-prefix "C-c l")
- :hook ((c-mode . lsp-deferred)
- (c++-mode . lsp-deferred)
- (python-mode . lsp-deferred)
- (lsp-mode . lsp-enable-which-key-integration))
- :config
- (setq lsp-enable-snippet nil)
- (setq lsp-modeline-diagnostics-enable nil)
- :commands (lsp lsp-deferred)
- )
+(use-package lsp-mode
+ :ensure t
+ :init
+ (setq lsp-keymap-prefix "C-c l")
+ ;; :hook ((c-mode . lsp-deferred)
+ ;; (c++-mode . lsp-deferred)
+ ;; (python-mode . lsp-deferred)
+ ;; (lsp-mode . lsp-enable-which-key-integration))
+ :hook ((c-mode c++-mode python-mode) . lsp-deferred)
+ :config
+ (setq lsp-enable-snippet nil)
+ (setq lsp-modeline-diagnostics-enable nil)
+ (push '("^\\*[Ll]sp.+\\*$"
+ :regexp t
+ :dedicated t
+ :position bottom
+ :stick t
+ :noselect t)
+ popwin:special-display-config)
- (use-package lsp-ui
+ :commands (lsp lsp-deferred))
+
+(use-package lsp-ui
:ensure t
:config
(setq lsp-ui-doc-enable nil)
@@ -44,7 +41,7 @@
(use-package dap-mode
:after (lsp-mode)
:ensure t)
- ))
+
;;; Completion
(use-package yasnippet
--
GitLab