ebe4c60264
This reverts commit 29c78ce841 and all other fixes
that have been made afterwards.
The motivation is that use-package is seen by many as a replacement for
`require`. Is use-package always defer the loading of packages then is breaks
this use case, this does not respect POLA so even if it was making Spacemacs
loading faster (up to 3s faster on some startup on my machine) we just cannot
use it, it would be irresponsible. Spacemacs should be easy to use, loading
performance will come with time but it is not a priority.
146 lines
6.3 KiB
EmacsLisp
146 lines
6.3 KiB
EmacsLisp
;;; packages.el --- Spacemacs Purpose Layer packages File for Spacemacs
|
|
;;
|
|
;; Copyright (c) 2012-2018 Sylvain Benner & Contributors
|
|
;;
|
|
;; Author: Bar Magal
|
|
;; URL: https://github.com/syl20bnr/spacemacs
|
|
;;
|
|
;; This file is not part of GNU Emacs.
|
|
;;
|
|
;;; License: GPLv3
|
|
|
|
(setq spacemacs-purpose-packages
|
|
'(eyebrowse
|
|
(helm-purpose :requires helm)
|
|
(ivy-purpose :requires ivy)
|
|
popwin
|
|
(spacemacs-purpose-popwin
|
|
:location local
|
|
:requires popwin)
|
|
window-purpose))
|
|
|
|
(defun spacemacs-purpose/pre-init-eyebrowse ()
|
|
(spacemacs|use-package-add-hook eyebrowse
|
|
:post-config
|
|
(progn
|
|
(add-hook 'purpose-mode-hook #'spacemacs/window-purpose-sync-eyebrowse)
|
|
;; sync with eyebrowse now
|
|
(spacemacs/window-purpose-sync-eyebrowse))))
|
|
|
|
(defun spacemacs-purpose/init-helm-purpose ()
|
|
(use-package helm-purpose
|
|
:defer t
|
|
:init
|
|
(progn
|
|
(setq purpose-preferred-prompt 'helm)
|
|
;; remap bindings defined with `spacemacs/set-leader-keys'
|
|
(global-set-key [remap purpose-switch-buffer-with-purpose]
|
|
#'helm-purpose-switch-buffer-with-purpose)
|
|
(global-set-key [remap switch-buffer-without-purpose]
|
|
#'helm-purpose-mini-ignore-purpose)
|
|
(global-set-key [remap purpose-switch-buffer-with-some-purpose]
|
|
#'helm-purpose-switch-buffer-with-some-purpose))))
|
|
|
|
(defun spacemacs-purpose/init-ivy-purpose ()
|
|
;; vanilla lets `ivy' take over
|
|
(use-package ivy-purpose
|
|
:defer t
|
|
:init
|
|
(progn
|
|
(setq purpose-preferred-prompt 'vanilla)
|
|
(global-set-key [remap purpose-switch-buffer-with-purpose]
|
|
#'ivy-purpose-switch-buffer-with-purpose)
|
|
(global-set-key [remap purpose-switch-buffer-without-purpose]
|
|
#'ivy-purpose-switch-buffer-without-purpose)
|
|
(global-set-key [remap purpose-switch-buffer-with-some-purpose]
|
|
#'ivy-purpose-switch-buffer-with-some-purpose))))
|
|
|
|
(defun spacemacs-purpose/pre-init-popwin ()
|
|
;; when popwin creates a popup window, it removes the `purpose-dedicated'
|
|
;; window parameter from all windows, so we must save and restore it
|
|
;; ourselves. this works well as long as no buffer is displayed in more than
|
|
;; one window. if a buffer is displayed in several windows, and at least one
|
|
;; of these windows is purpose-dedicated, then all these windows will become
|
|
;; purpose-dedicated after popwin creates a popup window.
|
|
;; there is no problem if the local spacemacs-purpose-popwin package is used,
|
|
;; as long as the user doesn't call `popwin:create-popup-window' directly
|
|
;; (e.g. <f2> from `helm-mini')
|
|
(spacemacs|use-package-add-hook popwin
|
|
:post-config
|
|
(progn
|
|
(defvar window-purpose--dedicated-windows nil)
|
|
(defadvice popwin:create-popup-window
|
|
(before window-purpose/save-dedicated-windows)
|
|
(setq window-purpose--dedicated-windows
|
|
(cl-loop for window in (window-list)
|
|
if (purpose-window-purpose-dedicated-p window)
|
|
collect (window-buffer window))))
|
|
(defadvice popwin:create-popup-window
|
|
(after window-purpose/restore-dedicated-windows)
|
|
(cl-loop for buffer in window-purpose--dedicated-windows
|
|
do (cl-loop for window in (get-buffer-window-list buffer)
|
|
do (purpose-set-window-purpose-dedicated-p
|
|
window t))))
|
|
(add-hook 'purpose-mode-hook #'spacemacs/window-purpose-sync-popwin)
|
|
(with-eval-after-load 'window-purpose
|
|
(spacemacs/window-purpose-sync-popwin)
|
|
;; can't have both `purpose-mode' and `popwin-mode' active at the same
|
|
;; time (see https://github.com/syl20bnr/spacemacs/issues/9593), but we
|
|
;; use `popwin' for its configuration so we can't just exclude it, so
|
|
;; current solution is to disable `popwin-mode' (which is enabled in
|
|
;; popwin's :config block)
|
|
(popwin-mode -1)))))
|
|
|
|
(defun spacemacs-purpose/pre-init-spacemacs-purpose-popwin ()
|
|
(spacemacs|use-package-add-hook window-purpose
|
|
:post-config
|
|
(progn
|
|
;; override popwin commands with pupo commands
|
|
(spacemacs/set-leader-keys
|
|
"wpp" #'pupo/close-window
|
|
"wpP" #'pupo/close-all-windows)
|
|
(pupo-mode))))
|
|
|
|
(defun spacemacs-purpose/init-spacemacs-purpose-popwin ()
|
|
(use-package spacemacs-purpose-popwin :commands pupo-mode))
|
|
|
|
(defun spacemacs-purpose/init-window-purpose ()
|
|
(use-package window-purpose
|
|
:init
|
|
(progn
|
|
;; 'r' is for "puRpose" ('w', 'p' are crowded, 'W', 'P' aren't
|
|
;; comfortable)
|
|
(spacemacs/set-leader-keys
|
|
"rb" 'purpose-switch-buffer-with-purpose
|
|
"rB" 'switch-buffer-without-purpose
|
|
"rd" 'purpose-toggle-window-purpose-dedicated
|
|
"rD" 'purpose-delete-non-dedicated-windows
|
|
"rp" 'purpose-switch-buffer-with-some-purpose
|
|
"rP" 'purpose-set-window-purpose)
|
|
(purpose-mode))
|
|
:config
|
|
(progn
|
|
;; change `switch-to-buffer' display preferences according to
|
|
;; `dotspacemacs-switch-to-buffer-prefers-purpose'. This affects actions
|
|
;; like `spacemacs/alternate-buffer', and opening buffers from Dired
|
|
(setcdr (assq 'switch-to-buffer purpose-action-sequences)
|
|
(if dotspacemacs-switch-to-buffer-prefers-purpose
|
|
'(purpose-display-reuse-window-buffer
|
|
purpose-display-reuse-window-purpose
|
|
purpose-display-maybe-same-window
|
|
purpose-display-maybe-other-window
|
|
purpose-display-maybe-other-frame
|
|
purpose-display-maybe-pop-up-window
|
|
purpose-display-maybe-pop-up-frame)
|
|
'(purpose-display-maybe-same-window
|
|
purpose-display-reuse-window-buffer
|
|
purpose-display-reuse-window-purpose
|
|
purpose-display-maybe-other-window
|
|
purpose-display-maybe-other-frame
|
|
purpose-display-maybe-pop-up-window
|
|
purpose-display-maybe-pop-up-frame)))
|
|
;; overriding `purpose-mode-map' with empty keymap, so it doesn't conflict
|
|
;; with original `C-x C-f', `C-x b', etc. and `semantic' key bindings.
|
|
(setcdr purpose-mode-map nil)
|
|
(spacemacs|diminish purpose-mode)
|
|
(purpose-x-golden-ratio-setup))))
|