diff options
| -rw-r--r-- | tag-emacs/emacs.d/Cask | 5 | ||||
| -rw-r--r-- | tag-emacs/emacs.d/init.el | 83 |
2 files changed, 9 insertions, 79 deletions
diff --git a/tag-emacs/emacs.d/Cask b/tag-emacs/emacs.d/Cask index 9c562f4..7f924f4 100644 --- a/tag-emacs/emacs.d/Cask +++ b/tag-emacs/emacs.d/Cask @@ -24,8 +24,6 @@ (depends-on "emmet-mode") (depends-on "expand-region") (depends-on "fancy-narrow") -(depends-on "flx") -(depends-on "flx-ido") (depends-on "flycheck") (depends-on "framemove") (depends-on "geiser") @@ -37,7 +35,7 @@ (depends-on "goto-chg") (depends-on "haskell-mode") (depends-on "helm") -(depends-on "ido-vertical-mode") +(depends-on "helm-projectile") (depends-on "jinja2-mode") (depends-on "js2-mode") (depends-on "litable") @@ -73,7 +71,6 @@ (depends-on "smart-mode-line") (depends-on "smart-tab") (depends-on "smart-tabs-mode") -(depends-on "smex") (depends-on "solarized-theme") (depends-on "toml-mode") (depends-on "tup-mode") diff --git a/tag-emacs/emacs.d/init.el b/tag-emacs/emacs.d/init.el index 22aff30..3f5d29f 100644 --- a/tag-emacs/emacs.d/init.el +++ b/tag-emacs/emacs.d/init.el @@ -437,80 +437,13 @@ (defalias 'exit-emacs #'save-buffers-kill-emacs)) (req-package helm-config - :bind (("C-x i" . helm-imenu)) - :config (setq helm-idle-delay .1 - helm-input-idle-delay 0)) - -(req-package ido - :bind (("C-x b" . ido-switch-buffer)) - :init (progn - (setq ido-save-directory-list-file (expand-file-name "ido-state" user-emacs-directory)) - (bind-key* "C-x C-f" #'ido-find-file) - (ido-mode 1) - (ido-everywhere 1)) - :config (progn - (setq ido-auto-merge-delay-time 99999 - ido-enable-flex-matching t) - - (ido-init-completion-maps) - (defun ido-manual-merge () - (interactive) - (ido-initiate-auto-merge (current-buffer))) - (bind-key "C-c C-s" #'ido-manual-merge ido-file-dir-completion-map))) - -(defun ap/ido-projectile-switch-buffer-dwim (force-ido) - (interactive "p") - (if (and (projectile-project-p) (eq force-ido 1)) - (call-interactively #'projectile-switch-to-buffer) - (call-interactively #'ido-switch-buffer))) - -(bind-key "s-x b" #'ap/ido-projectile-switch-buffer-dwim) -(bind-key "s-x s-b" #'ap/ido-projectile-switch-buffer-dwim) - -(req-package ido-vertical-mode - :require ido - :init (progn - (setq ido-vertical-decorations '("\n❯ " - "" - "\n " - "\n …" - "[" - "]" - " [No match]" - " [Matched]" - " [Not readable]" - " [Too big]" - " [Confirm]" - "\n❯ " - "" - ))) - :config (ido-vertical-mode 1)) - -(req-package flx-ido - :require ido - :init (progn - (flx-ido-mode 1) - (setq flx-ido-threshhold 1000))) - -(req-package smex - :require ido - :bind (("M-x" . smex) - ("<apps>" . smex) - ("<menu>" . smex) - ("M-X" . smex-major-mode-commands) - ("C-c M-x" . execute-extended-command)) + :bind (("C-x i". helm-imenu) + ("M-x" . helm-M-x) + ("C-x C-b" . helm-mini)) :config (progn - (setq smex-key-advice-ignore-menu-bar t - smex-auto-update nil) - (defun smex-update-after-load (_unused) - (if (boundp 'smex-cache) - (smex-update))) - (add-hook 'after-load-functions 'smex-update-after-load)) - :init (progn - (setq smex-history-length 100 - smex-save-file (concat user-emacs-directory - "smex-items")) - (smex-initialize))) + (setq helm-idle-delay .1 + helm-input-idle-delay 0) + (helm-mode 1))) ;;;; Modeline @@ -699,8 +632,8 @@ (ap/-add-known-subfolder-projects (ido-read-directory-name "Add projects under: "))) (defun ap/open-subfolder-project (from-dir &optional arg) - (let ((project-dir (projectile-completing-read "Open project: " - (ap/subfolder-projects from-dir)))) + (let ((project-dir (helm-comp-read "Open project: " + (ap/subfolder-projects from-dir)))) (projectile-switch-project-by-name (expand-file-name project-dir from-dir) arg))) (defun ap/open-work-project (&optional arg) |