diff options
Diffstat (limited to '')
-rw-r--r-- | .emacs.d/init.el | 129 |
1 files changed, 64 insertions, 65 deletions
diff --git a/.emacs.d/init.el b/.emacs.d/init.el index b8d4ccb..3ce4a3d 100644 --- a/.emacs.d/init.el +++ b/.emacs.d/init.el @@ -914,7 +914,7 @@ around if needed." :custom (magit-diff-refine-hunk t) (magit-display-buffer-function #'magit-display-buffer-fullframe-status-v1) - (magit-completing-read-function 'magit-ido-completing-read) + ;; (magit-completing-read-function 'magit-ido-completing-read) :custom-face (magit-diff-file-heading ((t (:weight normal))))) ;; recently opened files @@ -936,59 +936,61 @@ around if needed." ("C-c f r" . recentf-open-files) ("C-c x" . execute-extended-command)) -(use-feature ido - :demand - :bind - (:map ido-common-completion-map - ([escape] . minibuffer-keyboard-quit) - ("DEL" . b/ido-backspace)) - :config - (require 'delsel) - (defun b/ido-backspace () - "Forward to `backward-delete-char'. On error (read-only), quit." - (interactive) - (condition-case nil - (backward-delete-char 1) - (error - (minibuffer-keyboard-quit)))) - (ido-mode 1) - (ido-everywhere 1) - :custom - (ido-enable-flex-matching t) - (ido-max-window-height 10) - (ido-use-virtual-buffers t)) +(comment + (use-feature ido + :demand + :bind + (:map ido-common-completion-map + ([escape] . minibuffer-keyboard-quit) + ("DEL" . b/ido-backspace)) + :config + (require 'delsel) + (defun b/ido-backspace () + "Forward to `backward-delete-char'. On error (read-only), quit." + (interactive) + (condition-case nil + (backward-delete-char 1) + (error + (minibuffer-keyboard-quit)))) + (ido-mode 1) + (ido-everywhere 1) + :custom + (ido-enable-flex-matching t) + ;; (ido-enable-regexp t) + ;; (ido-enable-prefix t) + (ido-max-window-height 10) + (ido-use-virtual-buffers t)) + + (use-package ido-vertical-mode + :defer 0.3 + :config + (ido-vertical-mode 1) + :custom + (ido-vertical-define-keys 'C-n-C-p-up-and-down) + (ido-vertical-show-count t)) -(use-package ido-vertical-mode - :defer 0.3 - :config - (ido-vertical-mode 1) - :custom - (ido-vertical-define-keys 'C-n-C-p-up-and-down) - (ido-vertical-show-count t)) + (use-package ido-completing-read+ + :defer 0.3 + :after ido + :config + (ido-ubiquitous-mode 1)) -(use-package ido-completing-read+ - :defer 0.3 - :after ido - :config - (ido-ubiquitous-mode 1)) + (use-package crm-custom + :defer 0.3 + :config + (crm-custom-mode 1)) + + (use-feature icomplete + :defer 0.3 + :config + (icomplete-mode 1))) (use-package amx :defer 0.3 :config (amx-mode)) -(use-package crm-custom - :defer 0.3 - :config - (crm-custom-mode 1)) - -(use-feature icomplete - :defer 0.3 - :config - (icomplete-mode 1)) - (use-package ivy - :disabled :defer 0.3 :bind (:map ivy-minibuffer-map @@ -998,7 +1000,7 @@ around if needed." ("DEL" . ivy-backward-delete-char)) :config (setq ivy-wrap t - ivy-height 14 + ;; ivy-height 14 ivy-use-virtual-buffers t ivy-virtual-abbreviate 'abbreviate ivy-count-format "%d/%d ") @@ -1023,25 +1025,21 @@ This function is intended for use with `ivy-ignore-buffers'." ) (use-package swiper - :commands (swiper swiper-isearch) - :bind (;; ("C-s" . swiper-isearch) - ;; ("C-r" . swiper) + :demand + :after ivy + :bind (("C-s" . swiper-isearch) + ("C-r" . swiper-isearch-backward) ("C-S-s" . swiper-isearch))) (use-package counsel - :commands (counsel-linux-app)) - ;; :bind (([remap execute-extended-command] . counsel-M-x) - ;; ([remap find-file] . counsel-find-file) - ;; ("C-c f ." . counsel-find-file) - ;; ("C-c f l" . counsel-find-library) - ;; ("C-c f r" . counsel-recentf) - ;; ("C-c x" . counsel-M-x) - ;; :map minibuffer-local-map - ;; ("C-r" . counsel-minibuffer-history)) - ;; :config - ;; (counsel-mode 1) - ;; (defalias 'locate #'counsel-locate) - ;; ) + :bind (;; ([remap execute-extended-command] . counsel-M-x) + ;; ([remap find-file] . counsel-find-file) + ("C-c f r" . counsel-recentf) + :map minibuffer-local-map + ("C-r" . counsel-minibuffer-history)) + :config + (counsel-mode 1) + (defalias 'locate #'counsel-locate)) (comment (use-package helm @@ -2485,9 +2483,10 @@ https://csclub.uwaterloo.ca/~abandali") :init (add-hook 'dired-mode-hook 'gnus-dired-mode)) -(use-feature gnus-utils - :custom - (gnus-completing-read-function 'gnus-ido-completing-read)) +(comment + (use-feature gnus-utils + :custom + (gnus-completing-read-function 'gnus-ido-completing-read))) (use-feature mm-decode :config |