diff --git a/layers/+completion/ivy/packages.el b/layers/+completion/ivy/packages.el index a08457f2f..57b80fc28 100644 --- a/layers/+completion/ivy/packages.el +++ b/layers/+completion/ivy/packages.el @@ -12,6 +12,7 @@ (setq ivy-packages '(auto-highlight-symbol counsel + counsel-projectile evil flx ivy @@ -78,6 +79,19 @@ ;; Set syntax highlighting for counsel search results (ivy-set-display-transformer 'spacemacs/counsel-search 'counsel-git-grep-transformer)))) +(defun ivy/init-counsel-projectile () + (when (configuration-layer/package-usedp 'projectile) + (use-package counsel-projectile + :defer t + :init + (spacemacs/set-leader-keys + "pb" 'counsel-projectile-switch-to-buffer + "pd" 'counsel-projectile-find-dir + "pp" 'counsel-projectile + "pf" 'counsel-projectile-find-file + "pr" 'projectile-recentf + "ps" 'counsel-projectile)))) + (defun ivy/post-init-auto-highlight-symbol () (setq spacemacs-symbol-highlight-transient-state-remove-bindings '("/" "b" "f")) diff --git a/layers/+distribution/spacemacs-base/packages.el b/layers/+distribution/spacemacs-base/packages.el index d8b6377e2..93771d145 100644 --- a/layers/+distribution/spacemacs-base/packages.el +++ b/layers/+distribution/spacemacs-base/packages.el @@ -241,7 +241,8 @@ "projectile.cache") projectile-known-projects-file (concat spacemacs-cache-directory "projectile-bookmarks.eld")) - (unless (configuration-layer/package-usedp 'helm-projectile) + (unless (or (configuration-layer/package-usedp 'helm-projectile) + (configuration-layer/package-usedp 'counsel-projectile)) (spacemacs/set-leader-keys "pb" 'projectile-switch-to-buffer "pd" 'projectile-find-dir