X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=emacs_el%2Fconfiguration%2Fdon-configuration.org;h=aa5494809b0aa2c432d9d7d7d166e59ec699f9dc;hb=3e10f9b1c84d227ddc999381e024cd462796c9ad;hp=e4a061372f9e84f587ba46feaff6d4befa86b592;hpb=14d487972ebe6dee67b8b15be8ab2ad98c552cc3;p=lib.git

diff --git a/emacs_el/configuration/don-configuration.org b/emacs_el/configuration/don-configuration.org
index e4a0613..aa54948 100644
--- a/emacs_el/configuration/don-configuration.org
+++ b/emacs_el/configuration/don-configuration.org
@@ -71,6 +71,22 @@
   (add-hook 'minibuffer-exit-hook #'don/minibuffer-exit-hook)
 #+END_SRC
 * Modules
+** Flyspell 🐝 
+#+BEGIN_SRC emacs-lisp
+  (use-package flyspell
+    :ensure t
+    :diminish flyspell-mode 🐝
+    :config
+    (add-hook 'message-mode-hook 'turn-on-flyspell)
+    (add-hook 'text-mode-hook 'turn-on-flyspell)
+    (add-hook 'c-mode-common-hook 'flyspell-prog-mode)
+    (add-hook 'cperl-mode-hook 'flyspell-prog-mode)
+    (add-hook 'tcl-mode-hook 'flyspell-prog-mode)
+    :init
+    (setq ispell-program-name "ispell")
+    )
+
+#+END_SRC
 ** Winnermode
 #+BEGIN_SRC emacs-lisp
   (winner-mode 1)
@@ -285,7 +301,8 @@ value, scrolling continues until there is no more output.
 #+BEGIN_SRC emacs-lisp :tangle don-configuration.el
   (use-package magit
     :ensure t
-    :bind ("C-x g" . magit-status)
+    :bind (("C-x g" . magit-status)
+           ("C-x C-g" . magit-status))
     :config
     ;; don't verify where we are pushing
     (setq magit-push-always-verify nil)
@@ -295,10 +312,17 @@ value, scrolling continues until there is no more output.
     (setq load-path
           (append '("~/lib/emacs_el/magit-annex")
                   load-path))
+    ;; load magit-vcsh
+    (setq load-path
+          (append '("~/lib/emacs_el/magit-vcsh")
+                  load-path))
     )
   (use-package magit-annex
     :ensure t
   )
+  (use-package magit-vcsh
+    :ensure t
+  )
 #+END_SRC
 
 ** Perl
@@ -359,6 +383,14 @@ value, scrolling continues until there is no more output.
                                 (tramp-remote-shell-args
                                  ("-c"))))
 #+END_SRC
+** Reftex
+#+BEGIN_SRC emacs-lisp
+  (use-package reftex
+    :ensure t
+    :config
+    (setq-default reftex-default-bibliography
+                    '("~/projects/research/references.bib")))
+#+END_SRC
 ** LaTeX
 #+BEGIN_SRC emacs-lisp
   (use-package tex
@@ -370,15 +402,16 @@ value, scrolling continues until there is no more output.
     (add-to-list 'TeX-style-path '"/home/don/lib/emacs_el/auctex/style")
     ;; REFTEX (much enhanced management of cross-ref, labels, etc)
     ;; http://www.strw.leidenuniv.nl/~dominik/Tools/reftex/
-    (autoload 'reftex-mode     "reftex" "RefTeX Minor Mode" t)
-    (autoload 'turn-on-reftex  "reftex" "RefTeX Minor Mode" nil)
-    (autoload 'reftex-citation "reftex-cite" "Make citation" nil)
-    (autoload 'reftex-index-phrase-mode "reftex-index" "Phrase mode" t)
+    ; (autoload 'reftex-mode     "reftex" "RefTeX Minor Mode" t)
+    ; (autoload 'turn-on-reftex  "reftex" "RefTeX Minor Mode" nil)
+    ; (autoload 'reftex-citation "reftex-cite" "Make citation" nil)
+    ; (autoload 'reftex-index-phrase-mode "reftex-index" "Phrase mode" t)
     (add-hook 'LaTeX-mode-hook 'turn-on-reftex)   ; with AUCTeX LaTeX mode
     (add-hook 'latex-mode-hook 'turn-on-reftex)   ; with Emacs latex mode
     (add-hook 'LaTeX-mode-hook 'outline-minor-mode)   ; with AUCTeX LaTeX mode
     (add-hook 'latex-mode-hook 'outline-minor-mode)   ; with Emacs latex mode
 
+    (setq-default reftex-plug-into-AUCTeX t)
     ;; support fake section headers
     (setq TeX-outline-extra
           '(("%chapter" 1)
@@ -433,8 +466,6 @@ value, scrolling continues until there is no more output.
            '("cpageref" TeX-arg-ref)
            '("Cpageref" TeX-arg-ref)))))
 
-    (setq-default reftex-default-bibliography
-                  '("~/projects/research/references.bib"))
     (use-package font-latex
       :config
       (setq font-latex-match-reference-keywords
@@ -493,7 +524,6 @@ From http://julien.danjou.info/projects/emacs-packages#rainbow-mode, this colori
 
 #+BEGIN_SRC emacs-lisp
   (use-package rainbow-mode
-    :ensure f
     ;; add ess to the x major mode
     :config (add-to-list 'rainbow-x-colors-major-mode-list 'ESS[S])
     (add-to-list 'rainbow-x-colors-major-mode-list 'ESS[R])
@@ -727,7 +757,6 @@ From http://julien.danjou.info/projects/emacs-packages#rainbow-mode, this colori
     )
 
   (column-number-mode t)
-  (setq-default reftex-plug-into-AUCTeX t)
 
   (server-start)
 
@@ -795,13 +824,6 @@ From http://julien.danjou.info/projects/emacs-packages#rainbow-mode, this colori
   (put 'downcase-region 'disabled nil)
   (put 'narrow-to-region 'disabled nil)
 
-  (setq ispell-program-name "ispell")
-  (autoload 'flyspell-mode "flyspell" "On-the-fly spelling checker." t)
-  (add-hook 'message-mode-hook 'turn-on-flyspell)
-  (add-hook 'text-mode-hook 'turn-on-flyspell)
-  (add-hook 'c-mode-common-hook 'flyspell-prog-mode)
-  (add-hook 'cperl-mode-hook 'flyspell-prog-mode)
-  (add-hook 'tcl-mode-hook 'flyspell-prog-mode)
   ; (defun turn-on-flyspell ()
   ;    "Force flyspell-mode on using a positive arg.  For use in hooks."
   ;    (interactive)