Update cray gnus config and git email address.

cray.org

@@ -38,55 +38,74 @@
 Use gnus in emacs for email. Outside of normal emacs since its easier.
 
 #+BEGIN_SRC emacs-lisp :tangle (when (eq cray-p t) "tmp/.gnus") :mkdirp yes :tangle-mode (identity #o600)
-  (use-package gnus
-    :ensure t
-    :config
-    (progn
-      (setq user-full-name "Mitch Tishmack"
-            user-mail-address "mtishmack@cray.com")
-      (setq gnus-select-method '(nnnil ""))
-      (setq gnus-secondary-select-methods '((nnml "")))
-      (add-hook 'gnus-group-mode-hook 'gnus-topic-mode)
-      (setq gnus-mime-display-multipart-related-as-mixed t)
-      (setq gnus-auto-select-first nil)
-      (setq gnus-summary-display-arrow nil)
-      (setq nnmail-split-methods 'nnmail-split-fancy)
-      (setq gnus-nntp-server nil
-                 gnus-read-active-file nil
-                 gnus-save-newsrc-file nil
-                 gnus-read-newsrc-file nil
-                 gnus-check-new-newsgroups nil)
-           (setq nnml-directory "~/.emacs.d/mail")
-           (setq message-directory "~/.emacs.d/mail")
-
-           (setq gnus-select-method
-                 '(nnimap "outlook"
-                          (nnimap-address "outlook.office365.com")
-                          (nnimap-server-port 993)))
-
-           (setq-default
-            gnus-summary-line-format "[%U%R%z]  %(%&user-date;  %-15,15f  %B%s%)\n"
-            gnus-user-date-format-alist '((t . "%Y-%m-%d"))
-            gnus-summary-thread-gathering-function 'gnus-gather-threads-by-references
-            gnus-sum-thread-tree-root ""
-            gnus-sum-thread-tree-false-root ""
-            gnus-sum-thread-tree-indent " "
-            gnus-sum-thread-tree-single-indent ""
-            gnus-sum-thread-tree-single-leaf "└─>"
-            gnus-sum-thread-tree-vertical "│"
-            gnus-sum-thread-tree-leaf-with-other "├─>")
-           (setq gnus-thread-sort-functions
-                 '((not gnus-thread-sort-by-date)
-                   (not gnus-thread-sort-by-number)))
-           (setq gnus-use-cache t)
-           (setq gnus-use-adaptive-scoring t)
-           (setq gnus-save-score t)
-           (setq nnmail-split-fancy
-        '(|
-            ("From" "\\(root\\|cron\\)@localhost" "system")
-            "normal"))
-           )
-    )
+(use-package gnus
+  :ensure t
+  :config
+  (progn
+    (setq user-full-name "Mitch Tishmack"
+          user-mail-address "mtishmack@cray.com")
+    (setq gnus-select-method '(nnnil ""))
+    (setq gnus-secondary-select-methods '((nnml "")))
+    (add-hook 'gnus-group-mode-hook 'gnus-topic-mode)
+    (setq gnus-mime-display-multipart-related-as-mixed t)
+    (setq gnus-auto-select-first nil)
+    (setq gnus-summary-display-arrow nil)
+    (setq nnmail-split-methods 'nnmail-split-fancy)
+    (setq gnus-nntp-server nil
+               gnus-read-active-file nil
+               gnus-save-newsrc-file nil
+               gnus-read-newsrc-file nil
+               gnus-check-new-newsgroups nil)
+         (setq nnml-directory "~/.emacs.d/mail")
+         (setq message-directory "~/.emacs.d/mail")
+
+         (setq gnus-select-method
+               '(nnimap "outlook"
+                        (nnimap-address "outlook.office365.com")
+                        (nnimap-server-port 993)))
+         (setq-default
+          gnus-summary-line-format "[%U%R%z](%i)  %(%&user-date;  %-15,15f  %B%s%)\n"
+          gnus-user-date-format-alist '((t . "%Y-%m-%d"))
+          gnus-summary-thread-gathering-function 'gnus-gather-threads-by-references
+          gnus-sum-thread-tree-root ""
+          gnus-sum-thread-tree-false-root ""
+          gnus-sum-thread-tree-indent " "
+          gnus-sum-thread-tree-single-indent ""
+          gnus-sum-thread-tree-single-leaf "└─>"
+          gnus-sum-thread-tree-vertical "│"
+          gnus-sum-thread-tree-leaf-with-other "├─>")
+         (setq gnus-thread-sort-functions
+               '((not gnus-thread-sort-by-date)
+                 (not gnus-thread-sort-by-number)))
+         (setq gnus-use-cache t)
+         (setq gnus-save-score t)
+         (setq gnus-use-adaptive-scoring '(word line))
+         (setq gnus-adaptive-word-length-limit 5)
+         (setq gnus-adaptive-word-no-group-words t)
+         (setq gnus-default-adaptive-score-alist
+               '((gnus-unread-mark)
+                 (gnus-ticked-mark (from 4))
+                 (gnus-dormant-mark (from 5))
+                 (gnus-del-mark (from -4) (subject -1))
+                 (gnus-read-mark (from 4) (subject 2))
+                 (gnus-expirable-mark (from -1) (subject -1))
+                 (gnus-killed-mark (from -1) (subject -3))
+                 (gnus-kill-file-mark)
+                 (gnus-ancient-mark)
+                 (gnus-low-score-mark)
+                 (gnus-catchup-mark (from -1) (subject -1))))
+         (setq nnmail-split-fancy
+               '(|
+                 ("From" "\\(root\\|cron\\)@localhost" "system")
+                 "normal"))
+         (setq nnimap­split­inbox "INBOX")
+         (setq nnimap­split­predicate "UNDELETED")
+         ;; (setq nnimap­split­rule
+         ;;       '(
+         ;;         ("INBOX.commitspam" "^From:.*(XT3.*Updates.*|.*xt3@cray.com.*)")
+         ;;         ))
+         )
+  )
 #+END_SRC
 
 ** ~/bin/essh

git.org

@@ -122,6 +122,13 @@ General git configuration split out into sections mostly.
   email = mitch.tishmack@gmail.com
 #+END_SRC
 
+*** for cray
+#+BEGIN_SRC conf :tangle (when (and (eq git-p t) (eq cray-p t)) "tmp/.gitconfig")
+[user]
+  name = Mitch Tishmack
+  email = mtishmack@cray.com
+#+END_SRC
+
 * ~/.gitignore
 :PROPERTIES:
 :header-args: :tangle tmp/.gitignore :comments no :padline no :cache yes :mkdirp yes