From 1c81570ef7cf6b932b888e08467f41308a23039a Mon Sep 17 00:00:00 2001 From: Jim Myhrberg Date: Thu, 27 Aug 2020 23:37:28 +0100 Subject: [PATCH] fix(packages): update package definitions to be compatible with latest straight.el A recent change (https://github.com/raxod502/straight.el/pull/558) to straight.el's use-package integration led to some of my :straight definitions throwing errors. When overriding the package name, do not wrap the real name in parens, for example: ;; bad (no longer works) (use-package helm-global-bindings :straight (helm)) ;; good (worked before, still works) (use-package helm-global-bindings :straight helm) --- modules/languages/siren-golang.el | 2 +- modules/languages/siren-ruby.el | 2 +- modules/navigation/siren-helm.el | 14 +++++++------- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/modules/languages/siren-golang.el b/modules/languages/siren-golang.el index 83b0f3a..5125201 100644 --- a/modules/languages/siren-golang.el +++ b/modules/languages/siren-golang.el @@ -61,7 +61,7 @@ (add-to-list 'completion-ignored-extensions ".test")) (use-package lsp-go - :straight (lsp-mode) + :straight lsp-mode :hook (go-mode . lsp-deferred)) diff --git a/modules/languages/siren-ruby.el b/modules/languages/siren-ruby.el index c508349..a074582 100644 --- a/modules/languages/siren-ruby.el +++ b/modules/languages/siren-ruby.el @@ -81,7 +81,7 @@ ruby-forward-sexp nil))) (use-package lsp-solargraph - :straight (lsp-mode) + :straight lsp-mode :hook (ruby-mode . lsp-deferred) diff --git a/modules/navigation/siren-helm.el b/modules/navigation/siren-helm.el index 0046947..97efc6a 100755 --- a/modules/navigation/siren-helm.el +++ b/modules/navigation/siren-helm.el @@ -10,7 +10,7 @@ (require 'tramp) (use-package helm-global-bindings - :straight (helm) + :straight helm :demand t :bind (:map helm-command-map @@ -110,7 +110,7 @@ (advice-add 'helm :before 'siren-helm--hide-treemacs)) (use-package helm-command - :straight (helm) + :straight helm :after (helm-global-bindings) :bind ("C-c C-m" . helm-M-x) @@ -120,14 +120,14 @@ (helm-M-x-fuzzy-match t)) (use-package helm-elisp - :straight (helm) + :straight helm :after (helm-global-bindings) :bind (:map helm-command-map ("d" . helm-apropos))) (use-package helm-files - :straight (helm) + :straight helm :after (helm-global-bindings) :bind ("C-x C-f" . helm-find-files) @@ -138,20 +138,20 @@ (helm-ff-search-library-in-sexp t)) (use-package helm-for-files - :straight (helm) + :straight helm :after (helm-global-bindings) :bind ("C-c f f" . helm-for-files) ("C-c f r" . helm-recentf)) (use-package helm-imenu - :straight (helm) + :straight helm :after (helm-global-bindings) :bind ("C-t" . helm-imenu)) (use-package helm-ring - :straight (helm) + :straight helm :after (helm-global-bindings) :defer t :init