diff --git a/init.el b/init.el index fd1c9cc..c296414 100644 --- a/init.el +++ b/init.el @@ -80,39 +80,41 @@ ;; helm config (use-package helm :ensure t :bind ( - ([remap apropos] . helm-apropos) - ([remap find-library] . helm-locate-library) - ([remap bookmark-jump] . helm-bookmarks) - ([remap execute-extended-command] . helm-M-x) - ([remap find-file] . helm-find-files) - ([remap imenu-anywhere] . helm-imenu-anywhere) - ([remap imenu] . helm-semantic-or-imenu) - ([remap noop-show-kill-ring] . helm-show-kill-ring) - ([remap persp-switch-to-buffer] . helm-mini) - ([remap switch-to-buffer] . helm-buffers-list) - ([remap projectile-find-file] . helm-projectile-find-file) - ([remap projectile-recentf] . helm-projectile-recentf) - ([remap projectile-switch-project] . helm-projectile-switch-project) + ([remap apropos] . helm-apropos) + ([remap find-library] . helm-locate-library) + ([remap bookmark-jump] . helm-bookmarks) + ([remap execute-extended-command] . helm-M-x) + ([remap find-file] . helm-find-files) + ([remap imenu-anywhere] . helm-imenu-anywhere) + ([remap imenu] . helm-semantic-or-imenu) + ([remap noop-show-kill-ring] . helm-show-kill-ring) + ([remap persp-switch-to-buffer] . helm-mini) + ([remap switch-to-buffer] . helm-buffers-list) + ([remap projectile-find-file] . helm-projectile-find-file) + ([remap projectile-recentf] . helm-projectile-recentf) + ([remap projectile-switch-project] . helm-projectile-switch-project) ([remap projectile-switch-to-buffer] . helm-projectile-switch-to-buffer) - ([remap recentf-open-files] . helm-recentf) - :map helm-map ( - ("C-j" . helm-next-line) + ([remap recentf-open-files] . helm-recentf) + :map helm-map ("C-k" . helm-previous-line) + ("C-j" . helm-next-line) + ("C-p" . helm-previous-line) + ("C-n" . helm-next-line) ("C-h" . helm-find-files-up-one-level) ("C-l" . helm-ff-RET) - ("ESC" . abort-recursive-edit))) - ("DOWN" . helm-next-line) - ("UP" . helm-previous-line) - ("LEFT" . helm-find-files-up-one-level) - ("RIGHT" . helm-ff-RET) + ("C-v" . evil-paste-from-register) + ("ESC" . abort-recursive-edit)) :preface (setq + helm-display-buffer-default-height 0.25 helm-display-header-line nil + helm-ff-file-name-history-use-recentf t helm-find-files-doc-header nil - helm-display-buffer-default-height 0.25) - :init + helm-mode-line-string nil + helm-move-to-line-cycle-in-source t) :config - (require 'helm-config)) + (require 'helm-config) + (helm-mode 1)) (use-package helm-lsp :ensure t) (use-package helm-company :ensure t) (use-package swiper-helm :ensure t) @@ -317,6 +319,7 @@ ;; general config (use-package general :ensure t :config + (global-set-key [escape] #'helm-or-evil-escape) (menu-bar-mode -1) (toggle-scroll-bar -1) (tool-bar-mode -1) @@ -428,6 +431,19 @@ ;; custom functions +(defun foo/helm-or-evil-escape () + "Escape from anything." + (interactive) + (cond ((minibuffer-window-active-p (minibuffer-window)) + ;; quit the minibuffer if open. + (abort-recursive-edit)) + ;; Run all escape hooks. If any returns non-nil, then stop there. + ;; ((cl-find-if #'funcall doom-escape-hook)) + ;; don't abort macros + ((or defining-kbd-macro executing-kbd-macro) nil) + ;; Back to the default + ((keyboard-quit)))) + (defun foo/toggle-maximize-buffer () "Maximize buffer." (interactive) (save-excursion