stuff

3 files changed, 11 insertions, 9 deletions

diff --git a/.config/emacs/custom.el b/.config/emacs/custom.el
index 47bf654..e801e02 100644
--- a/.config/emacs/custom.el
+++ b/.config/emacs/custom.el
@@ -5,6 +5,7 @@
  ;; If there is more than one, they won't work right.
  '(ansi-color-faces-vector [default bold shadow italic underline bold bold-italic bold])
  '(ansi-color-names-vector (vector "#ffffff" "#ff9da4" "#d1f1a9" "#ffeead" "#bbdaff" "#ebbbff" "#99ffff" "#002451"))
+ '(asm-comment-char 35)
  '(custom-enabled-themes (quote (tango-dark)))
  '(custom-safe-themes (quote ("9f443833deb3412a34d2d2c912247349d4bd1b09e0f5eaba11a3ea7872892000" "bb08c73af94ee74453c90422485b29e5643b73b05e8de029a6909af6a3fb3f58" "82d2cac368ccdec2fcc7573f24c3f79654b78bf133096f9b40c20d97ec1d8016" "1b8d67b43ff1723960eb5e0cba512a2c7a2ad544ddb2533a90101fd1852b426e" "628278136f88aa1a151bb2d6c8a86bf2b7631fbea5f0f76cba2a0079cd910f7d" "06f0b439b62164c6f8f84fdda32b62fb50b6d00e8b01c2208e55543a6337433a" "1e7e097ec8cb1f8c3a912d7e1e0331caeed49fef6cff220be63bd2a6ba4cc365" "71b172ea4aad108801421cc5251edb6c792f3adbaecfa1c52e94e3d99634dee7" "fc5fcb6f1f1c1bc01305694c59a1a861b008c534cae8d0e48e4d5e81ad718bc6" default)))
  '(erc-nick "lukeshu")
@@ -25,6 +26,7 @@
  '(sh-indent-comment t)
  '(smtpmail-smtp-server "plus.smtp.mail.yahoo.com")
  '(smtpmail-smtp-service 587)
+ '(uniquify-buffer-name-style (quote post-forward-angle-brackets) nil (uniquify))
  '(vc-annotate-background "#2b2b2b")
  '(vc-annotate-color-map (quote ((20 . "#bc8383") (40 . "#cc9393") (60 . "#dfaf8f") (80 . "#d0bf8f") (100 . "#e0cf9f") (120 . "#f0dfaf") (140 . "#5f7f5f") (160 . "#7f9f7f") (180 . "#8fb28f") (200 . "#9fc59f") (220 . "#afd8af") (240 . "#bfebbf") (260 . "#93e0e3") (280 . "#6ca0a3") (300 . "#7cb8bb") (320 . "#8cd0d3") (340 . "#94bff3") (360 . "#dc8cc3"))))
  '(vc-annotate-very-old-color "#dc8cc3")
diff --git a/.config/emacs/init.el b/.config/emacs/init.el
index 2a7645f..11765b0 100644
--- a/.config/emacs/init.el
+++ b/.config/emacs/init.el
@@ -17,7 +17,7 @@
     (eval-region (point) (point-max))
     (kill-buffer (current-buffer)))))
 
- ;; ELPA stuff ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; ELPA stuff ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 (unless (require 'package nil t)
   (eval-url "http://tromey.com/elpa/package-install.el"))
@@ -59,6 +59,7 @@
 ;; General settings ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 (require 'go-mode-load)
+(require 'uniquify)
 
 (require 'mailcrypt)
 (mc-setversion "gpg")
@@ -127,8 +128,7 @@
       inhibit-startup-screen t
       line-number-mode t
       server-use-tcp t
-      server-mode t
-      show-paren-mode t)
+      server-mode t)
 
 (setq browse-url-generic-program (executable-find "v-www-browser")
       browse-url-browser-function 'browse-url-generic)
diff --git a/.config/emacs/wl.el b/.config/emacs/wl.el
index a169249..815c97c 100644
--- a/.config/emacs/wl.el
+++ b/.config/emacs/wl.el
@@ -27,12 +27,12 @@
 
   ;; note: all below are dirs (Maildirs) under elmo-maildir-folder-path
   ;; the '.'-prefix is for marking them as maildirs
-  wl-fcc            "..Sent"       ;; sent msgs go to the "sent"-folder
-  wl-default-folder "..Ham"        ;; my main inbox
-  wl-draft-folder   "..Draft"      ;; store drafts in 'postponed'
-  wl-trash-folder   "..Trash"      ;; put trash in 'trash'
-  wl-spam-folder    "..Bulk Mail"  ;; put spam in 'Bulk Mail'
-  wl-queue-folder   "..queue"      ;; we don't use this
+  wl-fcc            ".Sent"                   ;; sent msgs go to the "sent"-folder
+  wl-default-folder ".FOLDERS.Ham"            ;; my main inbox
+  wl-draft-folder   ".Draft"                  ;; store drafts in 'postponed'
+  wl-trash-folder   ".Trash"                  ;; put trash in 'trash'
+  wl-spam-folder    ".FOLDERS.Spam.training"  ;; put spam in 'Bulk Mail'
+  wl-queue-folder   ".FOLDERS.queue"          ;; we don't use this
 
   ;; check this folder periodically, and update modeline
   ;wl-biff-check-folder-list '(".todo") ;; check every 180 seconds