From: Maximilian Friedersdorff <max@friedersdorff.com>
Date: Fri, 4 Nov 2016 09:20:42 +0000 (+0000)
Subject: Merge branch 'master' of git.friedersdorff.com:max/dotfiles
X-Git-Url: https://git.friedersdorff.com/?a=commitdiff_plain;h=0e7ea48dce808af8002b8b994afe0214930d5a53;hp=4d9f38422bf0d994a6bda0b486c43c7e06a01296;p=max%2Fdotfiles.git

Merge branch 'master' of git.friedersdorff.com:max/dotfiles
---

diff --git a/X/.Xresources.palladium b/X/.Xresources.palladium
new file mode 100644
index 0000000..5a4ccf4
--- /dev/null
+++ b/X/.Xresources.palladium
@@ -0,0 +1 @@
+*faceSize: 9
\ No newline at end of file
diff --git a/X/.xinitrc b/X/.xinitrc
index 0c2dc6b..a031825 100644
--- a/X/.xinitrc
+++ b/X/.xinitrc
@@ -15,6 +15,9 @@ fi
 
 # Load .Xresources
 xrdb -merge ~/.Xresources &> /dev/null
+if [ -f ~/.Xresources.$HOSTNAME ]; then
+    xrdb -merge ~/.Xresources.$HOSTNAME &> /dev/null
+fi
 
 # Set keyboard layout
 case $HOSTNAME in
diff --git a/emacs/.emacs b/emacs/.emacs
index e6bc5f6..7fd25c7 100644
--- a/emacs/.emacs
+++ b/emacs/.emacs
@@ -22,7 +22,7 @@
     ("#CC9393" "#DFAF8F" "#F0DFAF" "#7F9F7F" "#BFEBBF" "#93E0E3" "#94BFF3" "#DC8CC3")))
  '(package-selected-packages
    (quote
-    (yaml-mode minimap js2-mode editorconfig evil-magit evil-leader evil-org molokai-theme org-evil flycheck-mypy jinja2 jinja2-mode highlight-indent-guides projectile helm-projectile zenburn-theme helm helm-config use-package flycheck company-jedi company org evil)))
+    (yaml-mode minimap js2-mode editorconfig wanderlust evil-magit evil-leader evil-org molokai-theme org-evil flycheck-mypy jinja2 jinja2-mode highlight-indent-guides projectile helm-projectile zenburn-theme helm helm-config use-package flycheck company-jedi company org evil)))
  '(pdf-view-midnight-colors (quote ("#DCDCCC" . "#383838")))
  '(vc-annotate-background "#2B2B2B")
  '(vc-annotate-color-map
@@ -94,7 +94,7 @@
   :config
   (add-hook 'prog-mode-hook 'highlight-indent-guides-mode)
   (setq highlight-indent-guides-method 'character)
-  (setq highlight-indend-guides-character ?\|)
+  (setq highlight-indent-guides-character ?\|)
   (set-face-foreground 'highlight-indent-guides-character-face "darkgray"))
 
 (use-package jinja2-mode
@@ -131,6 +131,11 @@
 
 
 (add-hook 'after-init-hook 'global-company-mode)
+(use-package wanderlust
+  :ensure t)
+
+
+
 
 (add-hook 'prog-mode-hook 'electric-pair-mode)
 
diff --git a/wanderlust/.folders b/wanderlust/.folders
new file mode 100644
index 0000000..292edb6
--- /dev/null
+++ b/wanderlust/.folders
@@ -0,0 +1,9 @@
+PERSONAL{
+    %INBOX:max/clear@mail.friedersdorff.com:993!	"INBOX"
+    %slackware:max/clear@mail.friedersdorff.com:993!	"slackware"
+    %todo:max/clear@mail.friedersdorff.com:993!		"todo"
+    %quicknote:max/clear@mail.friedersdorff.com:993!	"quicknote"
+    %Sent:max/clear@mail.friedersdorff.com:993!		"Sent"
+    %Trash:max/clear@mail.friedersdorff.com:993!	"Trash"
+    %Spam:max/clear@mail.friedersdorff.com:993!		"Spam"
+}
\ No newline at end of file
diff --git a/wanderlust/.wl b/wanderlust/.wl
new file mode 100644
index 0000000..992deb0
--- /dev/null
+++ b/wanderlust/.wl
@@ -0,0 +1,24 @@
+(setq wl-from "Maximilian Friedersdorff <max@friedersdorff.com>")
+
+;; Mail Addresses
+(setq wl-user-mail-address-list (quote ("max@friedersdorff.com")))
+
+;; Match parent folder
+(setq wl-draft-config-alist
+      '(((string-match "friedersdorff.com" wl-draft-parent-folder)
+	 (template . "personal"))
+	(reply "\\(To\\|Cc\\|Delivered-To\\): .*friedersdorff.com.*"
+	       (template . "personal"))))
+
+;; Templates
+(setq wl-template-alist
+      '(("personal"
+	 (wl-from . "Maximilian Friedersdorff <max@friedersdorff.com>")
+	 (wl-smtp-posting-user . "max")
+	 (wl-smtp-posting-server . "mail.friedersdorff.com")
+	 (wl-smtp-authenticate-type . "plain")
+	 (wl-smtp-connection-type . 'starttls)
+	 (wl-smtp-posting-port . 587)
+	 (wl-local-domain . "friedersdorff.com")
+	 (wl-message-id-domain . "mail.friedersdorff.com"))
+	))