update vawad's settings

git-svn-id: file:///svn/tfheen/trunk/dotfiles@721 8da78d58-1cd3-0310-bee5-d77bd1b3e8bf

diff --git a/gnus b/gnus
index 75cc35f913c3290898ee457785965a2749a9f9b8..12be3ca75d5c3c3266c679d611be765fdbc47a4c 100644 (file)
--- a/gnus
+++ b/gnus
@@ -52,7 +52,14 @@
   )
 
 (cw/for-host "vawad"
-  (setq gnus-select-method '(nntp "news.raw.no")))
+  (setq gnus-select-method '(nntp "news.raw.no")
+        gnus-secondary-select-methods '((nnimap "raw"
+                                                (nnimap-address "mail.raw.no")
+                                                (nnimap-server-port 993)
+                                                (nnimap-stream ssl)))
+        gnus-auto-subscribed-groups "^nnml\\|^nnfolder\\|^nnmbox\\|^nnmh\\|^nnbabyl\\|^nnmaildir\\|^nnimap"))
+  
+  
 
 (setq nnml-crosspost nil
       nnmail-crosspost nil
@@ -502,7 +509,7 @@ inserts \" characters."
 
 (setq gnus-summary-gather-subject-limit 'fuzzy
       gnus-simplify-subject-fuzzy-regexp "^\\([Aa][Dd]: \\|[Ss][Vv]: \\|[Rr][Ee]: \\)+"
-      mc-gpg-comment "Please see my GPG key at http://raw.no/gpgkey.asc"
+      mc-gpg-comment "Please see my GPG key at http://err.no/gpgkey.asc"
       gnus-simplify-ignored-prefixes "^\\([Aa][Dd]: \\|[Ss][Vv]: \\|[Rr][Ee]: \\)+"
       message-yank-prefix "| "
       message-yank-cited-prefix "| "
@@ -548,7 +555,7 @@ inserts \" characters."
   '(
     ; Default-verdier
     (".*" 
-     (address "tfheen@raw.no")
+     (address "tfheen@err.no")
      (Organization "Private"))
 
     ;; Du vil sikkert ha mer her enn det følgende:
@@ -601,7 +608,7 @@ OBS: <URL:http://www.stud.ifi.uio.no/~jani/OBS/no-alt-gullkorn.shtml>")))
 ;    ((and (message-mail-p) (stringp gnus-newsgroup-name) (tfheen-debian-group-p))
 ;     (to (tfheen-debian-find-recipients))
 ;     (cc nil))
-    ("nnml:in-"
+    ("in-"
      (address (let ((addr 
                      (mapconcat '(lambda(x) 
                                    (if (string-match gnus-ignored-from-addresses
@@ -609,27 +616,31 @@ OBS: <URL:http://www.stud.ifi.uio.no/~jani/OBS/no-alt-gullkorn.shtml>")))
                                        (car x) nil))
                                 (tfheen-get-recipients-parsed)
                                                nil)))
-                (if (string-equal addr "") "tfheen@raw.no" addr))))
+                (if (string-equal addr "") "tfheen@err.no" addr))))
     ; ITK/Samfundet-ting
-    ("nnml:drift.\\(itk\\|samfundet\\)"
+    ("drift.\\(itk\\|samfundet\\)"
      (address "tfheen@samfundet.no")
      (Organization "Samfundet - ITK")
      (x-url "http://www.samfundet.no"))
     ; Hardware.no-ting
-    ("nnml:drift.hardware.*\\|nntp\\+news.hardware.no"
+    ("drift.hardware.*\\|nntp\\+news.hardware.no"
      (address "tfheen@hardware.no")
      (Organization "Hardware.no - drift")
      (x-url "http://www.hardware.no"))
     ; PVV
-    ("nnml:drift.pvv.*"
+    ("drift.pvv.*"
      (address "tfheen@pvv.ntnu.no")
      (Organization "Programvareverkstedet i Trondheim")
      (x-url "http://www.pvv.ntnu.no"))
     ; Kpro
-    ("nnml:div.ntnu.*"
+    ("div.ntnu.*"
      (address "tfheen@stud.ntnu.no")
      (Organization "Norges Teknisk-Naturvitenskaplige Universitet")
      (x-url "http://www.ntnu.no"))
+    ("warthogs\\.*"
+     (address "tfheen@canonical.com")
+     (Organization "Canonical Ltd")
+     (x-url "http://www.canonical.com"))
 ))
 
 
@@ -797,7 +808,7 @@ on multiple mail-followup-to headers"
 
 (add-hook 'message-header-setup-hook 'message-subject-strip-any-re)
 (setq gnus-treat-display-smileys nil
-      gnus-ignored-from-addresses "tfheen@\\(add\\.no\\|idi\\.ntnu\\.no\\|debian\\.org\\|stud\\.ntnu\\.no\\|hardware\\.no\\|raw\\.no\\|samfundet\\.no\\|uka\\.no\\|pvv\\.\\(org\\|ntnu.no\\)\\)\\|tollef@add\\.no\\|tollef-[^@]*@add\\.no")
+      gnus-ignored-from-addresses "tfheen@\\(add\\.no\\|idi\\.ntnu\\.no\\|debian\\.org\\|stud\\.ntnu\\.no\\|hardware\\.no\\|raw\\.no\\|err.no\\|samfundet\\.no\\|uka\\.no\\|pvv\\.\\(org\\|ntnu.no\\)\\)\\|tollef@add\\.no\\|tfheen@canonical.com\\|tollef-[^@]*@add\\.no")
 
 (cw/requiring-package (deuglify))