From 719693bc5b965eb8bef1f21d086e6a774bb97f32 Mon Sep 17 00:00:00 2001 From: Maciej Szlosarczyk Date: Tue, 1 Feb 2022 10:05:42 +0200 Subject: [PATCH] Disable lenses globally, fix key binding conflict --- init.el | 3 ++- pkg/hydra.el | 3 ++- pkg/lsp.el | 2 ++ pkg/prog-mode.el | 2 -- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/init.el b/init.el index c424bde..9ec153f 100644 --- a/init.el +++ b/init.el @@ -80,7 +80,8 @@ ;; Your init file should contain only one such instance. ;; If there is more than one, they won't work right. '(safe-local-variable-values - '((lsp-lens-enable) + '((lsp-lens-mode) + (lsp-lens-enable) (cider-shadow-default-options . ":app") (cider-preferred-build-tool . lein) (cider-shadow-default-options . "app") diff --git a/pkg/hydra.el b/pkg/hydra.el index fb8e73e..2a068af 100644 --- a/pkg/hydra.el +++ b/pkg/hydra.el @@ -60,7 +60,7 @@ ^──────────────────────────────────────────────────────────────────────────────── ^ _c_: Toggle comment _y_: Snippet _s_: Swiper ^ _r_: Replace _m_: Any (Company) _u_: Undo tree -^ _i_: Indent +^ _i_: Indent^^ _d_: Dash ^ _a_: Align ^ " @@ -71,6 +71,7 @@ ("i" indent-region) ("a" align-regexp) ("s" swiper) + ("d" dash-at-point) ("u" undo-tree-visualize) ("y" company-yasnippet) diff --git a/pkg/lsp.el b/pkg/lsp.el index ce7cec7..3219c74 100644 --- a/pkg/lsp.el +++ b/pkg/lsp.el @@ -13,6 +13,8 @@ lsp-prefer-capf t lsp-completion-provider :capf lsp-server-trace nil + lsp-lens-enable nil + lsp-lens-mode nil read-process-output-max (* 1024 1024 2) lsp-enable-file-watchers nil) (unbind-key "s-l =" lsp-mode-map) diff --git a/pkg/prog-mode.el b/pkg/prog-mode.el index 9484941..b74b8c7 100644 --- a/pkg/prog-mode.el +++ b/pkg/prog-mode.el @@ -51,8 +51,6 @@ :commands dash-at-point :straight t :defer t - :bind (:map prog-mode-map ("C-s C-d" . dash-at-point) - :map text-mode-map ("C-s C-d" . dash-at-point)) :config (add-to-list 'dash-at-point-mode-alist ;; Configure lookup for Ruby mode