X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=emacs_el%2Fconfiguration%2Fdon-configuration.org;h=68aa0fddfe516361810f05b0920f98ad69a1dfe3;hb=3cd7324bade17e9fdc9bc3f927c407253ad3fb97;hp=905861895d8d7322695d3db278d602bc40b4c368;hpb=eaf7e11775004ebf863636b3fe8569fbcb8449b2;p=lib.git

diff --git a/emacs_el/configuration/don-configuration.org b/emacs_el/configuration/don-configuration.org
index 9058618..68aa0fd 100644
--- a/emacs_el/configuration/don-configuration.org
+++ b/emacs_el/configuration/don-configuration.org
@@ -274,13 +274,13 @@ value, scrolling continues until there is no more output.
     :config (with-library 'tinyprocmail
               ;; (setq tinyprocmail--procmail-version "v3.22")
               (add-hook 'tinyprocmail--load-hook 'tinyprocmail-install))
-  
+  )
 #+END_SRC
 
 ** 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
 
@@ -324,7 +323,20 @@ value, scrolling continues until there is no more output.
 
 ** Helm
 #+BEGIN_SRC emacs-lisp
-(require 'don-helm)
+  (use-package helm
+    :ensure t
+    :config
+    (helm-mode 1)
+    (define-key global-map [remap find-file] 'helm-find-files)
+    (define-key global-map [remap occur] 'helm-occur)
+    (define-key global-map [remap list-buffers] 'helm-buffers-list)
+    (define-key global-map [remap dabbrev-expand] 'helm-dabbrev)
+    (global-set-key (kbd "M-x") 'helm-M-x)
+    (unless (boundp 'completion-in-region-function)
+      (define-key lisp-interaction-mode-map [remap completion-at-point] 'helm-lisp-completion-at-point)
+      (define-key emacs-lisp-mode-map       [remap completion-at-point] 'helm-lisp-completion-at-point))
+    (add-hook 'kill-emacs-hook #'(lambda () (and (file-exists-p "$TMP") (delete-file "$TMP"))))
+  )
 #+END_SRC
 ** Hydra
 #+BEGIN_SRC emacs-lisp :tangle don-configuration.el
@@ -351,6 +363,7 @@ value, scrolling continues until there is no more output.
   ;; this is in the very newest auctex; avoid for now
   (add-to-list 'LaTeX-fill-excluded-macros
                '("Sexpr"))
+  (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)
@@ -403,7 +416,7 @@ value, scrolling continues until there is no more output.
           ("OM" "{")
           ("DL" "{")
           ("fixme" "{")))
-      
+
   (setq-default TeX-parse-self t)
   (setq-default TeX-auto-save t)
   (setq-default TeX-master nil)
@@ -446,9 +459,22 @@ value, scrolling continues until there is no more output.
 #+END_SRC
 ** ESS
 #+BEGIN_SRC emacs-lisp
-  (require 'ess_configuration)
+  (use-package ess
+    :ensure t
+    :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 t
+    ;; 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
@@ -565,14 +591,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$" .