Merge branch 'master' of git+ssh://git.donarmstrong.com/srv/git/lib

diff --git a/emacs_el/configuration/don-configuration.org b/emacs_el/configuration/don-configuration.org
index 3562e2b09c43155b8f61d6b35cd4554b875c1bb8..d58fc9f76e977f8c58090e573d2f795fe2c55356 100644 (file)
--- a/emacs_el/configuration/don-configuration.org
+++ b/emacs_el/configuration/don-configuration.org
@@ -218,26 +218,82 @@ value, scrolling continues until there is no more output.
     :ensure t)
 #+END_SRC
 
+** Jumping
+*** Avy
+#+BEGIN_SRC emacs-lisp
+(use-package avy
+  :ensure t
+  :bind ("C-c C-SPC" . avy-goto-word-1)
+  :config (progn
+            (setq avy-background t)
+            (key-chord-define-global "jj"  #'avy-goto-word-1)))
+#+END_SRC
+
+** Snippets
+
+*** Yasnippet
+#+BEGIN_SRC emacs-lisp
+(use-package yasnippet
+  :ensure t
+  :diminish yas-minor-mode
+  :config (progn
+            (yas-global-mode)
+            (setq yas-verbosity 1)))
+#+END_SRC
+
+** Helm Flx
+
+[[https://github.com/PythonNut/helm-flx][helm-flx]] implements intelligent helm fuzzy sorting, provided by [[https://github.com/lewang/flx][flx]].
+
+#+BEGIN_SRC emacs-lisp
+(use-package helm-flx
+  :ensure t
+  :config (progn
+            ;; these are helm configs, but they kind of fit here nicely
+            (setq helm-M-x-fuzzy-match                  t
+                  helm-bookmark-show-location           t
+                  helm-buffers-fuzzy-matching           t
+                  helm-completion-in-region-fuzzy-match t
+                  helm-file-cache-fuzzy-match           t
+                  helm-imenu-fuzzy-match                t
+                  helm-mode-fuzzy-match                 t
+                  helm-locate-fuzzy-match               nil
+                  helm-quick-update                     t
+                  helm-recentf-fuzzy-match              nil
+                  helm-semantic-fuzzy-match             t)
+            (helm-flx-mode +1)))
+#+END_SRC
+
+
 ** Tinyprocmail
 
 #+BEGIN_SRC emacs-lisp
   ;; load tinyprocmail
-  (with-library 'tinyprocmail
-    ; (setq tinyprocmail--procmail-version "v3.22")
-    (add-hook 'tinyprocmail--load-hook 'tinyprocmail-install))
+  (use-package tinyprocmail
+    :ensure f
+    :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
-  ; don't verify where we are pushing
-  (setq magit-push-always-verify nil)
-  ;; refine diffs always (hilight words)
-  (setq magit-diff-refine-hunk nil)
-  ;; load magit-annex
-  (setq load-path
-        (append '("~/lib/emacs_el/magit-annex")
-                load-path))
-  (require 'magit-annex)
+  (use-package magit
+    :ensure t
+    :config
+    ;; don't verify where we are pushing
+    (setq magit-push-always-verify nil)
+    ;; refine diffs always (hilight words)
+    (setq magit-diff-refine-hunk nil)
+    ;; load magit-annex
+    (setq load-path
+          (append '("~/lib/emacs_el/magit-annex")
+                  load-path))
+    )
+  (use-package magit-annex
+    :ensure t
+  )
 #+END_SRC
 
 ** Perl
@@ -267,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
@@ -294,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)
@@ -346,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)
@@ -389,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 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
@@ -508,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$" . 
@@ -691,7 +767,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)

diff --git a/emacs_el/configuration/org-mode-configuration.el b/emacs_el/configuration/org-mode-configuration.el
index 835e23123409cd18b11c072cd2ba1081e4ddd3ce..8e434d1f7b4173f657e24cd1d88b7ddf51be7c93 100644 (file)
--- a/emacs_el/configuration/org-mode-configuration.el
+++ b/emacs_el/configuration/org-mode-configuration.el
@@ -442,8 +442,8 @@ Maildir, or by Message-ID."
                    'my-rtcite-export-handler)
 
 
-(setq-default org-mobile-directory "/rzlab.ucr.edu:/sites/dav.donarmstrong.com/root/org/")
-(when (string= system-name "rzlab.ucr.edu")
+(setq-default org-mobile-directory "/linnode.donarmstrong.com:/sites/dav.donarmstrong.com/root/org/")
+(when (string= system-name "linnode.donarmstrong.com")
   (setq-default org-mobile-directory "/sites/dav.donarmstrong.com/root/org/"))
 (setq-default org-directory "/home/don/org-mode/")
 (setq-default org-mobile-inbox-for-pull "/home/don/org-mode/from-mobile.org")