From e7d55655d74e24ba9cde531328c39e1a9e726b74 Mon Sep 17 00:00:00 2001
From: Jim Myhrberg <contact@jimeh.me>
Date: Wed, 14 Aug 2019 12:57:35 +0100
Subject: [PATCH] Improve lsp-mode keybindings

---
 modules/languages/siren-golang.el | 5 +----
 modules/languages/siren-ruby.el   | 6 ++----
 modules/lsp/siren-lsp-ui.el       | 5 +++++
 modules/lsp/siren-lsp.el          | 3 +++
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/modules/languages/siren-golang.el b/modules/languages/siren-golang.el
index ea34429..a87b68a 100644
--- a/modules/languages/siren-golang.el
+++ b/modules/languages/siren-golang.el
@@ -18,10 +18,7 @@
   :commands go-mode
   :bind (:map go-mode-map
               ("RET" . newline-and-indent)
-              ("C-h f" . godoc-at-point)
-              ("C-c C-j" . godef-jump)
-              ("C-c C-j" . lsp-ui-peek-find-definitions)
-              ("C-c C-." . lsp-rename))
+              ("C-h f" . godoc-at-point))
 
   :hook
   (go-mode . siren-go-mode-setup)
diff --git a/modules/languages/siren-ruby.el b/modules/languages/siren-ruby.el
index b29418b..0413d5d 100644
--- a/modules/languages/siren-ruby.el
+++ b/modules/languages/siren-ruby.el
@@ -48,9 +48,7 @@
               ("RET" . newline-and-indent)
               ("C-c C-l" . goto-line)
               ("C-M-f" . sp-ruby-forward-sexp)
-              ("C-M-b" . sp-ruby-backward-sexp)
-              ("C-c C-j" . lsp-ui-peek-find-definitions)
-              ("C-c C-." . lsp-rename))
+              ("C-M-b" . sp-ruby-backward-sexp))
 
   :hook
   (ruby-mode . siren-ruby-mode-setup)
@@ -110,7 +108,7 @@
   :bind (:map robe-mode-map
               ("C-c C-j" . robe-jump)
               ("C-c b". pop-tag-mark))
-  :hook (ruby-mode . robe-mode)
+  ;; :hook (ruby-mode . robe-mode)
 
   :init
   (eval-after-load 'company
diff --git a/modules/lsp/siren-lsp-ui.el b/modules/lsp/siren-lsp-ui.el
index fcabed3..d03c93a 100644
--- a/modules/lsp/siren-lsp-ui.el
+++ b/modules/lsp/siren-lsp-ui.el
@@ -11,6 +11,11 @@
 (use-package lsp-ui
   :commands lsp-ui-mode
 
+  :bind (:map lsp-ui-mode-map
+              ("C-c C-d" . lsp-ui-doc-show)
+              ("M-?" . lsp-ui-peek-find-references)
+              ("C-c C-j" . lsp-ui-peek-find-definitions))
+
   :hook
   (lsp-mode . lsp-ui-mode)
 
diff --git a/modules/lsp/siren-lsp.el b/modules/lsp/siren-lsp.el
index 8a08d4d..b8ccbe1 100644
--- a/modules/lsp/siren-lsp.el
+++ b/modules/lsp/siren-lsp.el
@@ -9,6 +9,9 @@
 (use-package lsp-mode
   :commands lsp
 
+  :bind (:map lsp-mode-map
+              ("C-c C-." . lsp-rename))
+
   :custom
   (lsp-eldoc-render-all nil))