Merge branch 'master' of git.ganneff.de:emacs

[emacs.git] / .emacs.d / config / emacs.org

diff --git a/.emacs.d/config/emacs.org b/.emacs.d/config/emacs.org
index 4ffc072..524b11e 100644 (file)
--- a/.emacs.d/config/emacs.org
+++ b/.emacs.d/config/emacs.org
@@ -117,20 +117,20 @@ neccessary.
 *** Info path
 Help emacs to find the info files
 #+BEGIN_SRC emacs-lisp :tangle no
-(setq Info-directory-list '("~/.emacs.d/info"
-                            "/usr/local/share/info/"
-                            "/usr/local/info/"
-                            "/usr/local/gnu/info/"
-                            "/usr/local/gnu/lib/info/"
-                            "/usr/local/gnu/lib/emacs/info/"
-                            "/usr/local/emacs/info/"
-                            "/usr/local/lib/info/"
-                            "/usr/local/lib/emacs/info/"
-                            "/usr/share/info/emacs-23"
-                            "/usr/share/info/"
-                            "/usr/share/info/"))
+(setq Info-directory-list (cons jj-info-dir
+                                '("/usr/local/share/info/"
+                                  "/usr/local/info/"
+                                  "/usr/local/gnu/info/"
+                                  "/usr/local/gnu/lib/info/"
+                                  "/usr/local/gnu/lib/emacs/info/"
+                                  "/usr/local/emacs/info/"
+                                  "/usr/local/lib/info/"
+                                  "/usr/local/lib/emacs/info/"
+                                  "/usr/share/info/emacs-23"
+                                  "/usr/share/info/"
+                                  "/usr/share/info/")))
 (setq Info-default-directory-list
-      (cons "~/.emacs.d/info" Info-default-directory-list))
+      (cons jj-info-dir Info-default-directory-list))
 #+END_SRC
 
 ** Interface related
@@ -1113,6 +1113,8 @@ than electric-indent-mode.
 #+END_SRC
 ** anzu
 [2014-06-01 Sun 23:02]
+Provides a minor mode which displays current match and total matches
+information in the mode-line in various search modes.
 #+BEGIN_SRC emacs-lisp :tangle yes
 (use-package anzu
   :ensure anzu
@@ -1129,7 +1131,7 @@ than electric-indent-mode.
 [2014-05-21 Wed 00:33]
 #+BEGIN_SRC emacs-lisp :tangle yes
 (use-package ascii
-  :commands (ascii-on ascii-display ascii-toggle)
+  :commands (ascii-on ascii-display)
   :init
   (progn
     (defun ascii-toggle ()
@@ -1434,7 +1436,8 @@ movement keys.
   :commands (dired dired-other-window dired-other-frame dired-noselect
                    dired-mode dired-jump)
   :init
-  (progn)
+  (progn
+    (setq diredp-hide-details-initially-flag nil))
   :config
   (progn
     (setq dired-auto-revert-buffer (quote dired-directory-changed-p))
@@ -1459,8 +1462,7 @@ movement keys.
       (dired-mark-sexp '(mark-similar-versions name)))
 
     (use-package dired+
-      :ensure dired+
-      :init (setq diredp-hide-details-initially-flag nil))
+      :ensure dired+)
 
     (use-package dired-x)
     (setq dired-guess-shell-alist-user
@@ -2025,18 +2027,21 @@ that disables itself auto-magically.
   :init
   (progn
     (setq hydra-is-helpful t)
-
+    (setq hydra-lv t)
     (defhydra hydra-zoom (global-map "<f2>")
       "zoom"
       ("g" text-scale-increase "in")
       ("l" text-scale-decrease "out")
       ("q" nil "quit"))
 
-    (hydra-create "M-g"
-      '(("h" first-error "first")
-        ("j" next-error "next")
-        ("k" previous-error "prev")
-        ("q" nil "quit")))
+    (defhydra hydra-error (global-map "M-g")
+      "goto-error"
+      ("h" first-error "first")
+      ("j" next-error "next")
+      ("k" previous-error "prev")
+      ("v" recenter-top-bottom "recenter")
+      ("q" nil "quit"))
+
     (global-set-key
      (kbd "C-c C-v")
      (defhydra toggle ()
@@ -2047,8 +2052,36 @@ that disables itself auto-magically.
        ("t" toggle-truncate-lines "truncate" :color blue)
        ("w" whitespace-mode "whitespace" :color blue)
        ("q" nil "cancel")))
+
+    (defhydra hydra-launcher (:color blue)
+      "Launch"
+      ("h" man "man")
+      ("r" (browse-url "http://www.reddit.com/r/emacs/") "reddit")
+      ("w" (browse-url "http://www.emacswiki.org/") "emacswiki")
+      ("s" shell "shell")
+      ("q" nil "cancel"))
+    (global-set-key (kbd "C-c r") 'hydra-launcher/body)
     )
-)
+
+  (defhydra hydra-toggle (:color pink)
+    "
+_a_ abbrev-mode:    % 4`abbrev-mode^^^^     _f_ auto-fill-mode:    %`auto-fill-function
+_d_ debug-on-error: % 4`debug-on-error^     _t_ truncate-lines:    %`truncate-lines
+_w_ whitespace-mode:% 4`whitespace-mode     _g_ golden-ratio-mode: %`golden-ratio-mode
+
+"
+    ("a" abbrev-mode nil)
+    ("i" aggressive-indent-mode nil)
+    ("d" toggle-debug-on-error nil)
+    ("f" auto-fill-mode nil)
+    ("g" golden-ratio-mode nil)
+    ("t" toggle-truncate-lines nil)
+    ("r" global-auto-revert-mode nil)
+    ("w" whitespace-mode nil)
+    ("q" nil "cancel"))
+
+  (global-set-key (kbd "C-c C-v") 'hydra-toggle/body)
+  )
 #+END_SRC
 ** ibuffer
 [2014-05-21 Wed 23:54]