From 6cca25c66cc673ac6208071adc5f5f254036a599 Mon Sep 17 00:00:00 2001
From: Jim Myhrberg <contact@jimeh.me>
Date: Wed, 5 Aug 2020 10:09:35 +0100
Subject: [PATCH] fix(navigation): Update setup for recent changes to helm

---
 modules/lsp/siren-helm-lsp.el                |  1 +
 modules/navigation/siren-helm-ag.el          |  2 +-
 modules/navigation/siren-helm-gtags.el       |  1 +
 modules/navigation/siren-helm-open-github.el |  1 +
 modules/navigation/siren-helm-swoop.el       |  1 +
 modules/navigation/siren-helm.el             | 25 ++++++++++----------
 modules/projects/siren-helm-projectile.el    |  1 +
 modules/tools/siren-helm-make.el             |  2 +-
 8 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/modules/lsp/siren-helm-lsp.el b/modules/lsp/siren-helm-lsp.el
index 4936861..0d58fc0 100644
--- a/modules/lsp/siren-helm-lsp.el
+++ b/modules/lsp/siren-helm-lsp.el
@@ -10,6 +10,7 @@
 (require 'siren-lsp)
 
 (use-package helm-lsp
+  :after (helm-global-bindings)
   :bind
   ("C-c '" . helm-lsp-workspace-symbol)
   ("C-c C-'" . helm-lsp-workspace-symbol))
diff --git a/modules/navigation/siren-helm-ag.el b/modules/navigation/siren-helm-ag.el
index c41599e..dae2e0a 100644
--- a/modules/navigation/siren-helm-ag.el
+++ b/modules/navigation/siren-helm-ag.el
@@ -9,7 +9,7 @@
 (require 'siren-helm)
 
 (use-package helm-ag
-  :after (helm-config)
+  :after (helm-global-bindings)
   :bind
   ("C-x '" . helm-do-ag-project-root)
   ("C-x C-'" . helm-do-ag-project-root)
diff --git a/modules/navigation/siren-helm-gtags.el b/modules/navigation/siren-helm-gtags.el
index 54cb2ba..335a370 100644
--- a/modules/navigation/siren-helm-gtags.el
+++ b/modules/navigation/siren-helm-gtags.el
@@ -10,6 +10,7 @@
 
 (use-package helm-gtags
   :defer t
+  :after (helm-global-bindings)
 
   :custom
   (helm-gtags-auto-update t)
diff --git a/modules/navigation/siren-helm-open-github.el b/modules/navigation/siren-helm-open-github.el
index 318d41d..3da6671 100644
--- a/modules/navigation/siren-helm-open-github.el
+++ b/modules/navigation/siren-helm-open-github.el
@@ -9,6 +9,7 @@
 (require 'siren-helm)
 
 (use-package helm-open-github
+  :after (helm-global-bindings)
   :bind
   ("C-c o f" . helm-open-github-from-file)
   ("C-c o c" . helm-open-github-from-commit)
diff --git a/modules/navigation/siren-helm-swoop.el b/modules/navigation/siren-helm-swoop.el
index 72167ae..088a427 100644
--- a/modules/navigation/siren-helm-swoop.el
+++ b/modules/navigation/siren-helm-swoop.el
@@ -9,6 +9,7 @@
 (require 'siren-helm)
 
 (use-package helm-swoop
+  :after (helm-global-bindings)
   :bind
   ("M-r" . helm-swoop-without-pre-input)
   ("M-R" . helm-swoop-back-to-last-point)
diff --git a/modules/navigation/siren-helm.el b/modules/navigation/siren-helm.el
index 8cb722a..0046947 100755
--- a/modules/navigation/siren-helm.el
+++ b/modules/navigation/siren-helm.el
@@ -9,19 +9,18 @@
 ;; Helm fails with tramp-methods symbol being void if tramp is not required.
 (require 'tramp)
 
-(use-package helm-config
+(use-package helm-global-bindings
   :straight (helm)
   :demand t
   :bind
-  ("C-c h" . helm-command-prefix)
   (:map helm-command-map
         ("M" . helm-man-woman))
 
   :custom
-  (helm-command-prefix-key nil))
+  (helm-command-prefix-key "C-c h"))
 
 (use-package helm
-  :after (helm-config)
+  :after (helm-global-bindings)
   :defer t
   :hook
   (helm-minibuffer-set-up . siren-helm--hide-minibuffer-maybe)
@@ -112,7 +111,7 @@
 
 (use-package helm-command
   :straight (helm)
-  :after (helm-config)
+  :after (helm-global-bindings)
   :bind
   ("C-c C-m" . helm-M-x)
 
@@ -122,14 +121,14 @@
 
 (use-package helm-elisp
   :straight (helm)
-  :after (helm-config)
+  :after (helm-global-bindings)
   :bind
   (:map helm-command-map
         ("d" . helm-apropos)))
 
 (use-package helm-files
   :straight (helm)
-  :after (helm-config)
+  :after (helm-global-bindings)
   :bind
   ("C-x C-f" . helm-find-files)
 
@@ -140,20 +139,20 @@
 
 (use-package helm-for-files
   :straight (helm)
-  :after (helm-config)
+  :after (helm-global-bindings)
   :bind
   ("C-c f f" . helm-for-files)
   ("C-c f r" . helm-recentf))
 
 (use-package helm-imenu
   :straight (helm)
-  :after (helm-config)
+  :after (helm-global-bindings)
   :bind
   ("C-t" . helm-imenu))
 
 (use-package helm-ring
   :straight (helm)
-  :after (helm-config)
+  :after (helm-global-bindings)
   :defer t
   :init
   ;; This advice is borrowed from the browse-kill-ring package.
@@ -168,10 +167,12 @@
   (ad-activate 'yank-pop))
 
 (use-package helm-descbinds
-  :defer t)
+  :defer t
+  :after (helm-global-bindings))
 
 (use-package helm-describe-modes
-  :defer t)
+  :defer t
+  :after (helm-global-bindings))
 
 (provide 'siren-helm)
 ;;; siren-helm.el ends here
diff --git a/modules/projects/siren-helm-projectile.el b/modules/projects/siren-helm-projectile.el
index 4ddb2bd..35e9bc6 100644
--- a/modules/projects/siren-helm-projectile.el
+++ b/modules/projects/siren-helm-projectile.el
@@ -10,6 +10,7 @@
 (require 'siren-projectile)
 
 (use-package helm-projectile
+  :after (helm-global-bindings)
   :bind
   ("C-x ;" . helm-projectile-find-file)
   ("C-x C-;" . helm-projectile-find-file)
diff --git a/modules/tools/siren-helm-make.el b/modules/tools/siren-helm-make.el
index e936bf4..ba27bb1 100755
--- a/modules/tools/siren-helm-make.el
+++ b/modules/tools/siren-helm-make.el
@@ -9,7 +9,7 @@
 (require 'siren-helm)
 
 (use-package helm-make
-  :after (helm-config)
+  :after (helm-global-bindings)
   :bind
   (:map helm-command-map
         ("m" . helm-make-projectile))