Loads

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

diff --git a/.emacs.d/config/emacs.org b/.emacs.d/config/emacs.org
index 59ba0d6..efffec8 100644 (file)
--- a/.emacs.d/config/emacs.org
+++ b/.emacs.d/config/emacs.org
@@ -106,7 +106,7 @@ jj-elisp-dir and add them.
 
 *** Info path
 Help emacs to find the info files
 
 *** Info path
 Help emacs to find the info files

-#+BEGIN_SRC emacs-lisp :tangle no
+#+BEGIN_SRC emacs-lisp :tangle yes

 (setq Info-directory-list (cons jj-info-dir
                                 '("/usr/local/share/info/"
                                   "/usr/local/info/"
 (setq Info-directory-list (cons jj-info-dir
                                 '("/usr/local/share/info/"
                                   "/usr/local/info/"


@@ -588,14 +588,26 @@ ways.
                 (add-hook 'expand-expand-hook 'indent-according-to-mode)
                 (add-hook 'expand-jump-hook 'indent-according-to-mode)))))
 #+END_SRC
                 (add-hook 'expand-expand-hook 'indent-according-to-mode)
                 (add-hook 'expand-jump-hook 'indent-according-to-mode)))))
 #+END_SRC

-** ace-jump-mode
+** avy-mode

 [2013-04-28 So 11:26]
 [2013-04-28 So 11:26]

-Quickly move around in buffers.
+avy is a GNU Emacs package for jumping to visible text using a char-based decision tree.

 #+BEGIN_SRC emacs-lisp
 #+BEGIN_SRC emacs-lisp

-(use-package ace-jump-mode
-  :ensure ace-jump-mode
-  :commands ace-jump-mode
-  :bind ("H-SPC" . ace-jump-mode))
+(use-package avy
+  :ensure avy
+  :commands (avy-goto-char avy-goto-char-2 avy-goto-line avy-goto-word-1 avy-goto-word-0 avy-isearch avy-goto-subword-0 avy-goto-subword-1 avy-copy-line avy-copy-region avy-move-line)
+  :bind (("H-SPC" . avy-goto-char-2)
+         ("M-g g" . avy-goto-line)
+         )
+  :init
+  (progn
+    (setq avy-all-windows 'all-frames)
+    (setq avi-keys '(?a ?s ?d ?e ?f ?h ?j ?k ?l ?n ?m ?v ?r ?u) )
+    )
+  :config
+  (progn
+    (bind-key "C-y" 'avy-isearch isearch-mode-map)
+    )
+)

 #+END_SRC
 ** ace-window
 [2013-04-21 So 20:27]
 #+END_SRC
 ** ace-window
 [2013-04-21 So 20:27]


@@ -604,7 +616,11 @@ Use H-w to switch windows
 (use-package ace-window
   :ensure ace-window
   :commands ace-window
 (use-package ace-window
   :ensure ace-window
   :commands ace-window

-  :bind ("H-w" . ace-window))
+  :bind ("H-w" . ace-window)
+  :config
+  (progn
+    (setq aw-keys '(?a ?s ?d ?f ?j ?k ?l))
+    ))

 #+END_SRC
 ** aggressive-indent
 [2014-10-27 Mon 13:08]
 #+END_SRC
 ** aggressive-indent
 [2014-10-27 Mon 13:08]


@@ -961,7 +977,7 @@ movement keys.
     (setq dired-recursive-copies (quote top))
     (setq dired-recursive-deletes (quote top))
     (setq dired-guess-shell-alist-user
     (setq dired-recursive-copies (quote top))
     (setq dired-recursive-deletes (quote top))
     (setq dired-guess-shell-alist-user

-          '(("\\.pdf\\'" "mupdf" "evince")
+          '(("\\.pdf\\'" "mupdf")

             ("\\.\\(?:djvu\\|eps\\)\\'" "evince")
             ("\\.\\(?:jpg\\|jpeg\\|png\\|gif\\|xpm\\)\\'" "eog")
             ("\\.\\(?:xcf\\)\\'" "gimp")
             ("\\.\\(?:djvu\\|eps\\)\\'" "evince")
             ("\\.\\(?:jpg\\|jpeg\\|png\\|gif\\|xpm\\)\\'" "eog")
             ("\\.\\(?:xcf\\)\\'" "gimp")


@@ -1851,7 +1867,7 @@ disabling that.
 ** ethan-wspace
 [2014-06-01 Sun 15:00]
 Proper whitespace handling
 ** ethan-wspace
 [2014-06-01 Sun 15:00]
 Proper whitespace handling

-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle no

 (use-package ethan-wspace
   :ensure ethan-wspace
   :diminish (ethan-wspace-mode . "ew")
 (use-package ethan-wspace
   :ensure ethan-wspace
   :diminish (ethan-wspace-mode . "ew")


@@ -1915,18 +1931,16 @@ And I want to have it everywhere.
     (setq font-lock-maximum-decoration t)))
 #+END_SRC
 ** git commit mode
     (setq font-lock-maximum-decoration t)))
 #+END_SRC
 ** git commit mode

-#+BEGIN_SRC emacs-lisp
-(use-package git-commit-mode
-  :ensure git-commit-mode
-  :commands git-commit-mode
+#+BEGIN_SRC emacs-lisp :tangle no
+(use-package git-commit
+  :commands git-commit

   :mode ("COMMIT_EDITMSG" . git-commit-mode))
 #+END_SRC
 
 ** git rebase mode
   :mode ("COMMIT_EDITMSG" . git-commit-mode))
 #+END_SRC
 
 ** git rebase mode

-#+BEGIN_SRC emacs-lisp
-(use-package git-rebase-mode
-  :ensure git-rebase-mode
-  :commands git-rebase-mode
+#+BEGIN_SRC emacs-lisp :tangle no
+(use-package git-rebase
+  :commands git-rebase

   :mode ("git-rebase-todo" . git-rebase-mode))
 #+END_SRC
 ** git-gutter+
   :mode ("git-rebase-todo" . git-rebase-mode))
 #+END_SRC
 ** git-gutter+


@@ -2035,7 +2049,7 @@ for this.
   :diminish guide-key-mode
   :init
   (progn
   :diminish guide-key-mode
   :init
   (progn

-    (setq guide-key/guide-key-sequence '("C-x" "C-c" "M-g"))
+    (setq guide-key/guide-key-sequence '("C-x" "C-c" "M-g" "M-s"))

     (guide-key-mode 1)
     (setq guide-key/recursive-key-sequence-flag t)
     (setq guide-key/popup-window-position 'bottom)
     (guide-key-mode 1)
     (setq guide-key/recursive-key-sequence-flag t)
     (setq guide-key/popup-window-position 'bottom)


@@ -2633,11 +2647,11 @@ magit is a mode for interacting with git.
       :commands magit-blame-mode
       :defer t)
 
       :commands magit-blame-mode
       :defer t)
 

-    (use-package magit-svn
-      :ensure magit-svn
-      :commands (magit-svn-mode
-                 turn-on-magit-svn)
-      :defer t)
+    ; (use-package magit-svn
+    ;   :ensure magit-svn
+    ;   :commands (magit-svn-mode
+    ;              turn-on-magit-svn)
+    ;   :defer t)

 
     (add-hook 'magit-mode-hook 'hl-line-mode)
     (defun magit-status-with-prefix ()
 
     (add-hook 'magit-mode-hook 'hl-line-mode)
     (defun magit-status-with-prefix ()


@@ -2652,13 +2666,13 @@ magit is a mode for interacting with git.
     (unbind-key "M-h" magit-mode-map)
     (unbind-key "M-s" magit-mode-map)
 
     (unbind-key "M-h" magit-mode-map)
     (unbind-key "M-s" magit-mode-map)
 

-    (use-package magit-find-file
-      :ensure magit-find-file
-      :commands (magit-find-file-completing-read)
-      :defer t
-      :init
-      (progn
-        (bind-key "C-x C-f" 'magit-find-file-completing-read magit-mode-map)))
+    ; (use-package magit-find-file
+    ;   :ensure magit-find-file
+    ;   :commands (magit-find-file-completing-read)
+    ;   :defer t
+    ;   :init
+    ;   (progn
+    ;     (bind-key "C-x C-f" 'magit-find-file-completing-read magit-mode-map)))

 
     (add-hook 'magit-log-edit-mode-hook
               #'(lambda ()
 
     (add-hook 'magit-log-edit-mode-hook
               #'(lambda ()


@@ -2677,6 +2691,18 @@ magit is a mode for interacting with git.
       (jump-to-register :magit-fullscreen))
 
     (bind-key "q" 'magit-quit-session magit-status-mode-map)
       (jump-to-register :magit-fullscreen))
 
     (bind-key "q" 'magit-quit-session magit-status-mode-map)

+
+    (defun magit-rebase-unpushed (commit &optional args)
+      "Start an interactive rebase sequence over all unpushed commits."
+      (interactive (list (magit-get-tracked-branch)
+                         (magit-rebase-arguments)))
+      (if (setq commit (magit-rebase-interactive-assert commit))
+          (magit-run-git-sequencer "rebase" "-i" commit args)
+        (magit-log-select
+          `(lambda (commit)
+             (magit-rebase-interactive (concat commit "^") (list ,@args))))))
+
+    (magit-define-popup-action 'magit-rebase-popup ?l "Rebase unpushed" 'magit-rebase-unpushed)

     ))
 #+END_SRC
 ** markdown-mode
     ))
 #+END_SRC
 ** markdown-mode


@@ -4463,6 +4489,7 @@ Transparent Remote (file) Access, Multiple Protocol, remote file editing.
 #+BEGIN_SRC emacs-lisp
 (use-package tramp
   :defer t
 #+BEGIN_SRC emacs-lisp
 (use-package tramp
   :defer t

+  :disabled t

   :config
   (progn
     (setq tramp-persistency-file-name (expand-file-name "tramp" jj-cache-dir))
   :config
   (progn
     (setq tramp-persistency-file-name (expand-file-name "tramp" jj-cache-dir))


@@ -4659,7 +4686,7 @@ readable/editable without getting a big headache.
 Yasnippet is a template system. Type an abbreviation, expand it into
 whatever the snippet holds.
 #+BEGIN_SRC emacs-lisp
 Yasnippet is a template system. Type an abbreviation, expand it into
 whatever the snippet holds.
 #+BEGIN_SRC emacs-lisp

-(setq yas-snippet-dirs (expand-file-name "yasnippet/snippets" jj-elisp-dir))
+;(setq yas-snippet-dirs (expand-file-name "yasnippet/snippets" jj-elisp-dir))

 (use-package yasnippet
   :ensure yasnippet
   :defer t
 (use-package yasnippet
   :ensure yasnippet
   :defer t