summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--tag-emacs/emacs.d/init.org88
1 files changed, 38 insertions, 50 deletions
diff --git a/tag-emacs/emacs.d/init.org b/tag-emacs/emacs.d/init.org
index 76743a63..6049bc39 100644
--- a/tag-emacs/emacs.d/init.org
+++ b/tag-emacs/emacs.d/init.org
@@ -582,17 +582,6 @@ for similar things any more.
     :bind ("M-SPC" . shrink-whitespace))
 #+END_SRC
 
-** recentf
-
-I only use this occasionally, but it’s nice for files outside of projects.
-
-#+BEGIN_SRC emacs-lisp
-(use-package recentf
-  :init (progn (setq recentf-auto-cleanup 'never
-                     recentf-save-file (expand-file-name "recentf" user-emacs-directory))
-               (recentf-mode 1)))
-#+END_SRC
-
 ** Tramp
 
 Tramp is awesome.  It makes SSH feel Unix-y.  The proxy setup is so
@@ -1203,45 +1192,44 @@ replacement for helm so far.
 
 #+BEGIN_SRC emacs-lisp
   (use-package swiper
-    :bind (("C-s" . swiper)
-           ("C-r" . swiper)
-           ("C-c C-r" . ivy-resume)
-           ("C-x i" . ivy-imenu-goto)
-           ("C-=" . swiper))
-    :diminish ivy-mode
-    :demand t
-    :config (progn
-              (ivy-mode 1)
-              (setq ivy-use-virtual-buffers t
-                    ivy-re-builders-alist '((internal-complete-buffer . ivy--regex-fuzzy)
-                                            (t . ivy--regex-plus)))
-              (defun ivy-imenu-get-candidates-from (alist  &optional prefix)
-                (cl-loop for elm in alist
-                         nconc (if (imenu--subalist-p elm)
-                                   (ivy-imenu-get-candidates-from
-                                    (cl-loop for (e . v) in (cdr elm) collect
-                                             (cons e (if (integerp v) (copy-marker v) v)))
-                                    (concat prefix (if prefix ".") (car elm)))
-                                 (and (cdr elm) ; bug in imenu, should not be needed.
-                                      (setcdr elm (copy-marker (cdr elm))) ; Same as [1].
-                                      (list (cons (concat prefix (if prefix ".") (car elm))
-                                                  (copy-marker (cdr elm))))))))
-
-              (defun ivy-imenu-goto ()
-                "Go to buffer position"
-                (interactive)
-                (let ((imenu-auto-rescan t) items)
-                  (unless (featurep 'imenu)
-                    (require 'imenu nil t))
-                  (setq items (imenu--make-index-alist t))
-                  (ivy-read "imenu items:"
-                            (ivy-imenu-get-candidates-from (delete (assoc "*Rescan*" items) items))
-                            :action (lambda (k) (goto-char k)))))
-              (ivy-set-actions 'ivy-switch-buffer '(("k" (lambda (x)
-                                                           (kill-buffer x)
-                                                           (ivy--reset-state ivy-last))
-                                                     "kill")))
-              (add-to-list 'ivy-initial-inputs-alist '(counsel-M-x . ""))))
+	:bind (("C-s" . swiper)
+		   ("C-r" . swiper)
+		   ("C-c C-r" . ivy-resume)
+		   ("C-x i" . ivy-imenu-goto)
+		   ("C-=" . swiper))
+	:diminish ivy-mode
+	:demand t
+	:config (progn
+			  (ivy-mode 1)
+			  (setq ivy-re-builders-alist '((internal-complete-buffer . ivy--regex-fuzzy)
+											(t . ivy--regex-plus)))
+			  (defun ivy-imenu-get-candidates-from (alist  &optional prefix)
+				(cl-loop for elm in alist
+						 nconc (if (imenu--subalist-p elm)
+								   (ivy-imenu-get-candidates-from
+									(cl-loop for (e . v) in (cdr elm) collect
+											 (cons e (if (integerp v) (copy-marker v) v)))
+									(concat prefix (if prefix ".") (car elm)))
+								 (and (cdr elm) ; bug in imenu, should not be needed.
+									  (setcdr elm (copy-marker (cdr elm))) ; Same as [1].
+									  (list (cons (concat prefix (if prefix ".") (car elm))
+												  (copy-marker (cdr elm))))))))
+
+			  (defun ivy-imenu-goto ()
+				"Go to buffer position"
+				(interactive)
+				(let ((imenu-auto-rescan t) items)
+				  (unless (featurep 'imenu)
+					(require 'imenu nil t))
+				  (setq items (imenu--make-index-alist t))
+				  (ivy-read "imenu items:"
+							(ivy-imenu-get-candidates-from (delete (assoc "*Rescan*" items) items))
+							:action (lambda (k) (goto-char k)))))
+			  (ivy-set-actions 'ivy-switch-buffer '(("k" (lambda (x)
+														   (kill-buffer x)
+														   (ivy--reset-state ivy-last))
+													 "kill")))
+			  (add-to-list 'ivy-initial-inputs-alist '(counsel-M-x . ""))))
 #+END_SRC
 
 ** counsel