X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=emacs_el%2Fconfiguration%2Fdon-configuration.org;h=922774c66d42cb426cecc08d91c44f13dc123adb;hb=2eafaccb15ffd538043c4ceae394c6680bb447a5;hp=ee2bf5e3ce33ee46830a92d7bac262d7b1d8f0da;hpb=d967bbc9115a91987c640c65f9ca0f2cb326cf40;p=lib.git

diff --git a/emacs_el/configuration/don-configuration.org b/emacs_el/configuration/don-configuration.org
index ee2bf5e..922774c 100644
--- a/emacs_el/configuration/don-configuration.org
+++ b/emacs_el/configuration/don-configuration.org
@@ -312,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 f ; currently not in melpa, so don't try to install
+  )
 #+END_SRC
 
 ** Perl
@@ -376,26 +383,33 @@ 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
     :defer t
     :ensure auctex
     :config
-    (add-to-list 'LaTeX-fill-excluded-macros
-                 '("Sexpr"))
-    (add-to-list 'TeX-style-path '"/home/don/lib/emacs_el/auctex/style")
+    ; (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)
@@ -449,9 +463,11 @@ value, scrolling continues until there is no more output.
            '("Cref" TeX-arg-ref)
            '("cpageref" TeX-arg-ref)
            '("Cpageref" TeX-arg-ref)))))
+    (eval-after-load
+        "latex"
+      '(add-to-list 'LaTeX-fill-excluded-macros
+                    '("Sexpr")))
 
-    (setq-default reftex-default-bibliography
-                  '("~/projects/research/references.bib"))
     (use-package font-latex
       :config
       (setq font-latex-match-reference-keywords
@@ -534,6 +550,18 @@ From http://julien.danjou.info/projects/emacs-packages#rainbow-mode, this colori
 #+BEGIN_SRC emacs-lisp
   (use-package outline-magic)
 #+END_SRC
+** Writeroom Mode
+#+BEGIN_SRC emacs-lisp
+  (use-package writeroom-mode
+    :config (add-hook 'writeroom-mode-hook 'auto-fill-mode)
+    )
+#+END_SRC
+** GhostText/Atomic Chrome
+#+BEGIN_SRC emacs-lisp
+  (use-package atomic-chrome
+    :config (atomic-chrome-start-server)
+    )
+#+END_SRC
 * Keybindings
 ** Override other things
 #+BEGIN_SRC emacs-lisp
@@ -743,7 +771,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)