From c191f06235a2c8c164d29338671779e475174156 Mon Sep 17 00:00:00 2001 From: Maximilian Wolff Date: Thu, 16 Apr 2020 21:45:59 +0200 Subject: [PATCH] [dash] Move bindings from SPC d to SPC a z to avoid key conflicts Debug bindings are now added to the global binding of SPC d therefore dash had to move to the standard application bindings. --- layers/+readers/dash/packages.el | 53 +++++++++++++++++++------------- 1 file changed, 32 insertions(+), 21 deletions(-) diff --git a/layers/+readers/dash/packages.el b/layers/+readers/dash/packages.el index 96b5ab5fb..73e6569d6 100644 --- a/layers/+readers/dash/packages.el +++ b/layers/+readers/dash/packages.el @@ -1,20 +1,31 @@ - ;; see conditional package inclusion -(setq dash-packages - '( - (dash-at-point :toggle (spacemacs/system-is-mac)) - (helm-dash :requires helm) - (counsel-dash :requires ivy) - (zeal-at-point :toggle (or (spacemacs/system-is-linux) - (spacemacs/system-is-mswindows))))) +;;; packages.el --- Dash Layer packages File for Spacemacs +;; +;; Copyright (c) 2012-2020 Sylvain Benner & Contributors +;; +;; Author: Sylvain Benner +;; URL: https://github.com/syl20bnr/spacemacs +;; +;; This file is not part of GNU Emacs. +;; +;;; License: GPLv3 + +;; see conditional package inclusion +(defconst dash-packages + '( + (dash-at-point :toggle (spacemacs/system-is-mac)) + (helm-dash :requires helm) + (counsel-dash :requires ivy) + (zeal-at-point :toggle (or (spacemacs/system-is-linux) + (spacemacs/system-is-mswindows))))) (defun dash/init-helm-dash () (use-package helm-dash :defer t :init (progn - (spacemacs/declare-prefix "d" "docs") + (spacemacs/declare-prefix "az" "zeal/dash docs") (spacemacs/set-leader-keys - "dh" 'helm-dash-at-point - "dH" 'helm-dash)) + "azh" 'helm-dash-at-point + "azH" 'helm-dash)) :config (when dash-autoload-common-docsets (dash//activate-package-docsets dash-docs-docset-newpath)))) @@ -22,10 +33,10 @@ (use-package counsel-dash :defer t :init (progn - (spacemacs/declare-prefix "d" "docs") + (spacemacs/declare-prefix "az" "zeal/dash docs") (spacemacs/set-leader-keys - "dh" 'counsel-dash-at-point - "dH" 'counsel-dash)) + "azh" 'counsel-dash-at-point + "azH" 'counsel-dash)) :config (when dash-autoload-common-docsets (dash//activate-package-docsets dash-docs-docset-newpath)))) @@ -33,19 +44,19 @@ (use-package dash-at-point :defer t :init (progn - (spacemacs/declare-prefix "d" "docs") + (spacemacs/declare-prefix "az" "zeal/dash docs") (spacemacs/set-leader-keys - "dd" 'dash-at-point - "dD" 'dash-at-point-with-docset)))) + "azd" 'dash-at-point + "azD" 'dash-at-point-with-docset)))) (defun dash/init-zeal-at-point () (use-package zeal-at-point :defer t :init (progn - (spacemacs/declare-prefix "d" "docs") - (spacemacs/set-leader-keys - "dd" 'zeal-at-point - "dD" 'zeal-at-point-set-docset)) + (spacemacs/declare-prefix "az" "zeal/dash docs") + (spacemacs/set-leader-keys + "azd" 'zeal-at-point + "azD" 'zeal-at-point-set-docset)) :config ;; This lets users search in multiple docsets (add-to-list 'zeal-at-point-mode-alist '(web-mode . "html,css,javascript"))))