Replace popwin with shackle; refactor window/buffer defuns

This commit is contained in:
Henrik Lissner 2015-12-21 05:44:44 -05:00
parent 6b38183786
commit fca83ffc19
10 changed files with 508 additions and 282 deletions

View file

@ -30,8 +30,8 @@
"M-b" 'narf:build
"M-t" 'narf:workgroup-new
"M-T" 'narf/workgroup-display
"A-`" 'narf-switch-to-iterm
"C-`" 'popwin:messages
"A-`" 'os-switch-to-term
"C-`" 'narf/popup-messages
"C-~" 'rtog/toggle-repl
"M-`" 'narf/popup-toggle
@ -192,11 +192,13 @@
:n "zr" 'narf/evil-open-folds
:n "zm" 'narf/evil-close-folds
:n "zx" 'narf:kill-real-buffer
:n "zx" 'narf/kill-real-buffer
:n "ZX" 'bury-buffer
:n "]b" 'narf/next-real-buffer
:n "[b" 'narf/previous-real-buffer
;; These are intentionally reversed
:n "]b" 'narf/previous-real-buffer
:n "[b" 'narf/next-real-buffer
:m "]d" 'narf/vcs-next-hunk
:m "[d" 'narf/vcs-prev-hunk
:m "]e" 'narf/flycheck-next-error
@ -334,17 +336,14 @@
(:after help-mode
(:map help-map
"e" 'narf:popup-messages
"e" 'narf/popup-messages
;; Remove slow/annoying help subsections
"h" nil
"g" nil)
(:map help-mode-map
:n "]]" 'help-go-forward
:n "[[" 'help-go-back
:n "<escape>" (λ! (kill-buffer)
(if (narf/popup-p (current-buffer))
(narf/popup-close)
(evil-window-delete))))))
:n "<escape>" 'narf/popup-close)))
;; Line-wise mouse selection on margin
(global-set-key (kbd "<left-margin> <down-mouse-1>") 'narf/mouse-drag-line)

View file

@ -33,12 +33,13 @@
(exmap "git[hub]" 'narf:github-browse-file)
;; Dealing with buffers
(exmap "k[ill]" 'kill-this-buffer) ; Kill current buffer
(exmap "k[ill]" 'narf/kill-real-buffer) ; Kill current buffer
(exmap "k[ill]all" 'narf:kill-all-buffers) ; Kill all buffers (bang = in project)
(exmap "k[ill]buried" 'narf:kill-buried-buffers) ; Kill all buried buffers (bang = in project)
(exmap "k[ill]o" 'narf:kill-unreal-buffers)
(exmap "l[ast]" 'narf:popup-last-buffer)
(exmap "m[sg]" 'narf:popup-messages)
(exmap "k[ill]match" 'narf:kill-matching-buffers)
(exmap "l[ast]" 'narf/popup-last-buffer)
(exmap "m[sg]" 'narf/popup-messages)
;; Project navigation
(exmap "a" 'helm-projectile-find-other-file)