emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add helm/ivy keybindings; remove unused helm fns

Browse source
This commit is contained in:
Henrik Lissner 2016-10-03 12:11:50 +02:00
parent d2c6f0ca71
commit 630bdc76d5
2 changed files with 23 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

12
core/defuns/defuns-helm.el
View file

@ -53,18 +53,6 @@ DIR specifies the default-directory from which ag is run."
(interactive "<a><!>") (interactive "<a><!>")
(if bang (helm-multi-swoop-all search) (helm-swoop :$query search))) (if bang (helm-multi-swoop-all search) (helm-swoop :$query search)))
;;;###autoload
(defun doom/helm-find-in-emacsd ()
(interactive)
(let ((default-directory doom-emacs-dir))
(helm-projectile-find-file)))
;;;###autoload
(defun doom/helm-find-in-dotfiles ()
(interactive)
(let ((default-directory (expand-file-name ".dotfiles" "~")))
(helm-projectile-find-file)))
;;;###autoload ;;;###autoload
(defun doom/helm-buffers-dwim (&optional all-p) (defun doom/helm-buffers-dwim (&optional all-p)
"Displays open buffers in current project. If ALL-P, then show all open "Displays open buffers in current project. If ALL-P, then show all open

30
private/my-bindings.el
View file

@ -7,15 +7,26 @@
`(lambda () (interactive) `(lambda () (interactive)
(let ((default-directory ,path)) (let ((default-directory ,path))
(,@(if project-p (,@(if project-p
;; '(helm-projectile-find-file)
'(counsel-projectile-find-file) '(counsel-projectile-find-file)
'(call-interactively 'counsel-find-file)))))) ;; '(call-interactively 'helm-find-files)
'(call-interactively 'counsel-find-file)
)))))
(map! "<f9>" 'what-face (map! "<f9>" 'what-face
;; Essential ;; Essential
"M-x" 'smex (:when (featurep 'helm)
"A-x" 'smex "M-x" 'helm-M-x
"M-X" 'smex-major-mode-commands "A-x" 'helm-M-x
"A-X" 'smex-major-mode-commands "M-X" 'helm-apropos
"A-X" 'helm-apropos
"M-o" 'helm-find-files)
(:when (featurep 'ivy)
"M-x" 'smex
"A-x" 'smex
"M-X" 'smex-major-mode-commands
"A-X" 'smex-major-mode-commands
"M-o" 'counsel-find-file)
"M-;" 'eval-expression "M-;" 'eval-expression
"A-;" 'eval-expression "A-;" 'eval-expression
;; Tools ;; Tools
@ -63,8 +74,7 @@
"A-SPC" 'just-one-space "A-SPC" 'just-one-space
"M-a" 'mark-whole-buffer "M-a" 'mark-whole-buffer
"M-c" 'evil-yank "M-c" 'evil-yank
"M-o" 'counsel-find-file "M-q" 'save-buffers-kill-emacs
"M-q" 'kill-emacs
"M-s" 'save-buffer "M-s" 'save-buffer
"M-v" 'clipboard-yank "M-v" 'clipboard-yank
"M-z" 'undo "M-z" 'undo
@ -87,19 +97,25 @@
(:leader (:leader
:nv "," 'doom/ivy-switch-project-buffer :nv "," 'doom/ivy-switch-project-buffer
:nv "<" 'doom/ivy-switch-buffer :nv "<" 'doom/ivy-switch-buffer
;; :nv "," 'helm-buffers-list
;; :nv "<" 'helm-mini
:nv "." (@find-file-in default-directory) :nv "." (@find-file-in default-directory)
:nv "/" (@find-file-in (doom/project-root) t) :nv "/" (@find-file-in (doom/project-root) t)
:nv ">" 'projectile-find-file-in-known-projects :nv ">" 'projectile-find-file-in-known-projects
:n ":" 'imenu-list-minor-mode :n ":" 'imenu-list-minor-mode
;; :nv ";" 'helm-semantic-or-imenu
:nv ";" 'counsel-imenu :nv ";" 'counsel-imenu
:v "=" 'align-regexp :v "=" 'align-regexp
:nv "a" 'projectile-find-other-file :nv "a" 'projectile-find-other-file
;; :n "b" 'helm-bookmarks
:n "b" 'counsel-bookmark :n "b" 'counsel-bookmark
:n "e" 'doom/flycheck-errors :n "e" 'doom/flycheck-errors
:n "k" 'doom:docs-lookup :n "k" 'doom:docs-lookup
:nv "l" 'doom/nlinum-toggle :nv "l" 'doom/nlinum-toggle
;; :nv "m" 'helm-recentf
:nv "m" 'counsel-recentf :nv "m" 'counsel-recentf
:nv "M" 'projectile-recentf :nv "M" 'projectile-recentf
;; :nv "p" 'helm-projectile-switch-project
:nv "p" 'counsel-yank-pop :nv "p" 'counsel-yank-pop
:nv "P" 'counsel-projectile :nv "P" 'counsel-projectile
:n "R" 'doom/reset-theme :n "R" 'doom/reset-theme