Commit 942ccc43f3cd

Vincent Demeester <vincent@sbr.pm>
2020-04-17 19:45:20
emacs: remove ivy, counsel and swiper configurations
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
1 parent f595faa
Changed files (2)
tools/emacs/config/config-completion.el
@@ -265,85 +265,5 @@ Otherwise, use `projectile-switch-to-project'."
 
 ;; -UseCompany
 
-;; Deprecated for now
-(use-package ivy
-  :disabled
-  :bind (("C-x B" . ivy-switch-buffer)
-         :map ivy-occur-mode-map
-         ("f" . forward-char)
-         ("b" . backward-char)
-         ("n" . ivy-occur-next-line)
-         ("p" . ivy-occur-previous-line)
-         ("<C-return>" . ivy-occur-press))
-  :hook
-  (ivy-occur-mode . hl-line-mode)
-  :config
-  (setq ivy-count-format "%d/%d "
-        ivy-height-alist '((t lambda (_caller) (/ (window-height) 4)))
-        ivy-use-virtual-buffers t
-        ivy-virtual-abbreviate 'full ;Show the full virtual file paths
-        ivy-wrap nil
-        ivy-re-builders-alist '((counsel-M-x . ivy--regex-fuzzy)
-                                (t . ivy--regex-plus))
-        ivy-display-style 'fancy
-        ivy-use-selectable-prompt t
-        ivy-fixed-height-minibuffer nil
-        ivy-extra-directories '("../" "./")
-        )
-  (ivy-set-occur 'ivy-switch-buffer 'ivy-switch-buffer-occur)
-  (ivy-set-occur 'swiper 'swiper-occur)
-  (ivy-set-occur 'swiper-isearch 'swiper-occur))
-
-(use-package counsel
-  :disabled
-  :after ivy
-  :bind (("M-i" . counsel-semantic-or-imenu)
-         ("C-x C-r" . counsel-recentf)
-         ("C-M-y" . counsel-yank-pop)
-         ("C-h F" . counsel-faces)       ;Overrides `Info-goto-emacs-command-node'
-         ("C-h S" . counsel-info-lookup-symbol)
-         ("C-c u" . counsel-unicode-char)
-         ("C-c C" . counsel-colors-emacs) ;Alternative to `list-colors-display'
-         ("M-s r" . counsel-rg)
-         ("M-s g" . counsel-git-grep)
-         :map ivy-minibuffer-map
-         ("C-r" . counsel-minibuffer-history)
-         ("C-SPC" . ivy-restrict-to-matches))
-  :config
-  (setq counsel-yank-pop-preselect-last t
-        counsel-yank-pop-separator "\n—————————\n"
-        counsel-find-file-at-point t)
-  (progn
-    (ivy-set-actions
-     'counsel-find-file
-     `(("x"
-        (lambda (x) (delete-file (expand-file-name x ivy--directory)))
-        ,(propertize "delete" 'face 'font-lock-warning-face))))
-
-    ;; counsel-rg
-    ;; Redefine `counsel-rg-base-command' with my required options, especially
-    ;; the `--follow' option to allow search through symbolic links (part of
-    ;; `modi/rg-arguments').
-    (setq counsel-rg-base-command
-          (concat (mapconcat #'shell-quote-argument
-                             (append '("rg")
-                                     vde/rg-arguments
-                                     '("--no-heading" ;No file names above matching content
-                                       ))
-                             " ")
-                  " %s"            ;This MUST be %s, not %S
-                                        ;https://github.com/abo-abo/swiper/issues/427
-                  ))))
-
-;;; Default rg arguments
-;; https://github.com/BurntSushi/ripgrep
-(defconst vde/rg-arguments
-  `("--no-ignore-vcs"                   ;Ignore files/dirs ONLY from `.ignore'
-    "--line-number"                     ;Line numbers
-    "--smart-case"
-    "--max-columns" "150"      ;Emacs doesn't handle long line lengths very well
-    "--ignore-file" ,(expand-file-name ".ignore" (getenv "HOME")))
-  "Default rg arguments used in the functions in `counsel' and `projectile' packages.")
-
 (provide 'config-completion)
 ;;; config-completion.el ends here
tools/emacs/config/config-search.el
@@ -84,36 +84,5 @@ confines of word boundaries (e.g. multiple words)."
     (defalias 'projectile-ripgrep #'rg-project)))
 ;; -UseRG
 
-(use-package swiper
-  :disabled
-  :after ivy
-  :custom
-  (swiper-action-recenter t)
-  (swiper-goto-start-of-match t)
-  (swiper-include-line-number-in-search t)
-  :bind (("C-S-s" . swiper)
-         ("M-s s" . swiper-multi)
-         ("M-s w" . swiper-thing-at-point)
-         :map swiper-map
-         ("M-y" . yank)
-         ("C-." . swiper-avy)))
-
-(use-package anzu
-  :disabled
-  :ensure t
-  :delight
-  :custom
-  (anzu-search-threshold 100)
-  (anzu-replace-threshold nil)
-  (anzu-deactivate-region nil)
-  (anzu-replace-to-string-separator "")
-  :config
-  (global-anzu-mode 1)
-  :bind (([remap isearch-query-replace] . anzu-isearch-query-replace)
-         ([remap isearch-query-replace-regexp] . anzu-isearch-query-replace-regexp))
-  ([remap query-replace] . anzu-query-replace)
-  ([remap query-replace-regexp] . anzu-query-replace-regexp)
-  ("M-s %" . anzu-query-replace-at-cursor))
-
 (provide 'config-search)
 ;;; config-search.el ends here