X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=emacs_el%2Fconfiguration%2Fdon-configuration.org;h=75df81acc954fa4f746dd5cefb3201e38c2d8d39;hb=2b6f4c7a53fa1cb1fa837aa6461af4c8e417fdf0;hp=552feec13be98698f00de4050fd82de658c5623b;hpb=40db3d2a1fe38634b23135f4a9c1a4fa9cebf626;p=lib.git

diff --git a/emacs_el/configuration/don-configuration.org b/emacs_el/configuration/don-configuration.org
index 552feec..75df81a 100644
--- a/emacs_el/configuration/don-configuration.org
+++ b/emacs_el/configuration/don-configuration.org
@@ -280,7 +280,7 @@ value, scrolling continues until there is no more output.
 ** Magit
 #+BEGIN_SRC emacs-lisp :tangle don-configuration.el
   (use-package magit
-    :ensure f
+    :ensure t
     :config
     ;; don't verify where we are pushing
     (setq magit-push-always-verify nil)
@@ -292,8 +292,7 @@ value, scrolling continues until there is no more output.
                   load-path))
     )
   (use-package magit-annex
-    :ensure f
-    :config (require 'magit-annex)
+    :ensure t
   )
 #+END_SRC
 
@@ -465,21 +464,36 @@ value, scrolling continues until there is no more output.
     :config (require 'ess_configuration))
 #+END_SRC
 
+** Rainbowmode
+From http://julien.danjou.info/projects/emacs-packages#rainbow-mode, this colorizes color strings
+
+#+BEGIN_SRC emacs-lisp
+  (use-package rainbow-mode
+    :ensure f
+    ;; add ess to the x major mode
+    :init (add-to-list 'rainbow-x-colors-major-mode-list 'ESS[S])
+    (add-to-list 'rainbow-x-colors-major-mode-list 'ESS[R])
+  )
+#+END_SRC
 
 ** Polymode
 #+BEGIN_SRC emacs-lisp
-  (setq load-path
-        (append '("~/lib/emacs_el/polymode/modes")
-                load-path))
-  (require 'polymode)
-  (require 'poly-R)
-  (require 'poly-noweb)
-  (require 'poly-markdown)
-  (add-to-list 'auto-mode-alist '("\\.Snw" . poly-noweb+r-mode))
-  (add-to-list 'auto-mode-alist '("\\.Rnw" . poly-noweb+r-mode))
-  (add-to-list 'auto-mode-alist '("\\.Rmd" . poly-markdown+r-mode))
+  (use-package polymode
+    :config
+    (use-package poly-R)
+    (use-package poly-noweb)
+    (use-package poly-markdown)
+    :mode ("\\.Snw" . poly-noweb+r-mode)
+    :mode ("\\.Rnw" . poly-noweb+r-mode)
+    :mode ("\\.Rmd" . poly-markdown+r-mode)
+    )
 #+END_SRC
 
+** Outlining
+*** Outline magic
+#+BEGIN_SRC emacs-lisp
+  (use-package outline-magic)
+#+END_SRC
 * Keybindings
 ** Override other things
 #+BEGIN_SRC emacs-lisp
@@ -581,14 +595,7 @@ value, scrolling continues until there is no more output.
   ; (require 'google-weather)
   ; (require 'org-google-weather)
   ; (setq-default org-google-weather-format "%i %c, [%l,%h] %s %C")
-
-  ; http://julien.danjou.info/projects/emacs-packages#rainbow-mode
-  ; this colorizes color strings
-  (require 'rainbow-mode)
-  ; add ess to the x major mode
-  (add-to-list 'rainbow-x-colors-major-mode-list 'ESS[S])
-  (add-to-list 'rainbow-x-colors-major-mode-list 'ESS[R])
-
+  
   (global-set-key "\C-xp" 'server-edit)
 
   (setq-default auto-mode-alist (cons '("\.wml$" . 
@@ -764,7 +771,7 @@ value, scrolling continues until there is no more output.
   (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)