summaryrefslogtreecommitdiff
path: root/.config/emacs
diff options
context:
space:
mode:
Diffstat (limited to '.config/emacs')
-rw-r--r--.config/emacs/custom.el19
-rw-r--r--.config/emacs/init.el33
-rw-r--r--.config/emacs/wl.el77
3 files changed, 124 insertions, 5 deletions
diff --git a/.config/emacs/custom.el b/.config/emacs/custom.el
index dad3d8d..47bf654 100644
--- a/.config/emacs/custom.el
+++ b/.config/emacs/custom.el
@@ -3,11 +3,16 @@
;; If you edit it by hand, you could mess it up, so be careful.
;; Your init file should contain only one such instance.
;; If there is more than one, they won't work right.
- '(custom-enabled-themes (quote (zenburn)))
- '(custom-safe-themes (quote ("1e7e097ec8cb1f8c3a912d7e1e0331caeed49fef6cff220be63bd2a6ba4cc365" "71b172ea4aad108801421cc5251edb6c792f3adbaecfa1c52e94e3d99634dee7" "fc5fcb6f1f1c1bc01305694c59a1a861b008c534cae8d0e48e4d5e81ad718bc6" default)))
+ '(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"))
+ '(custom-enabled-themes (quote (tango-dark)))
+ '(custom-safe-themes (quote ("9f443833deb3412a34d2d2c912247349d4bd1b09e0f5eaba11a3ea7872892000" "bb08c73af94ee74453c90422485b29e5643b73b05e8de029a6909af6a3fb3f58" "82d2cac368ccdec2fcc7573f24c3f79654b78bf133096f9b40c20d97ec1d8016" "1b8d67b43ff1723960eb5e0cba512a2c7a2ad544ddb2533a90101fd1852b426e" "628278136f88aa1a151bb2d6c8a86bf2b7631fbea5f0f76cba2a0079cd910f7d" "06f0b439b62164c6f8f84fdda32b62fb50b6d00e8b01c2208e55543a6337433a" "1e7e097ec8cb1f8c3a912d7e1e0331caeed49fef6cff220be63bd2a6ba4cc365" "71b172ea4aad108801421cc5251edb6c792f3adbaecfa1c52e94e3d99634dee7" "fc5fcb6f1f1c1bc01305694c59a1a861b008c534cae8d0e48e4d5e81ad718bc6" default)))
'(erc-nick "lukeshu")
'(explicit-shell-file-name "/bin/bash")
+ '(fci-rule-color "#00346e")
+ '(global-whitespace-mode nil)
'(inhibit-startup-screen t)
+ '(maildir-mail-dir "~/Maildir")
'(mdmua-maildir "~/Maildir")
'(minibuffer-prompt-properties (quote (read-only t point-entered minibuffer-avoid-prompt face minibuffer-prompt)))
'(page-break-lines-char 45)
@@ -15,8 +20,16 @@
'(ruby-deep-indent-paren nil)
'(safe-local-variable-values (quote ((Nginx-indent-tabs-mode) (Nginx-indent-level . 4) (Nginx-indent-level . 8))))
'(scroll-bar-mode nil)
+ '(send-mail-function (quote smtpmail-send-it))
'(sh-basic-offset 8)
- '(sh-indent-comment t))
+ '(sh-indent-comment t)
+ '(smtpmail-smtp-server "plus.smtp.mail.yahoo.com")
+ '(smtpmail-smtp-service 587)
+ '(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")
+ '(wl-init-file "~/.emacs.d/wl.el")
+ '(wl-score-files-directory "~/.emacs.d/elmo"))
(custom-set-faces
;; custom-set-faces was added by Custom.
;; If you edit it by hand, you could mess it up, so be careful.
diff --git a/.config/emacs/init.el b/.config/emacs/init.el
index 402957a..2a7645f 100644
--- a/.config/emacs/init.el
+++ b/.config/emacs/init.el
@@ -1,6 +1,6 @@
;; Preliminary settings ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-(set-face-attribute 'default nil :height 75)
+(set-face-attribute 'default nil :height 80)
(setq notify-method 'notify-via-libnotify)
(add-to-list 'load-path "~/.emacs.d/")
(add-to-list 'load-path "~/.emacs.d/el-get/el-get")
@@ -91,11 +91,12 @@
;(load "mdmua")
(load "emacsutils")
+(set-default 'truncate-lines t)
(tool-bar-mode -1)
(ido-mode t)
(show-paren-mode 1)
-(setq org-hide-leading-stars t)
(setq org-log-done 'time)
+(setq gamegrid-user-score-file-directory "/var/games/emacs/")
;(xclip-mode 1)
(load "whitespace")
@@ -201,6 +202,8 @@
(add-to-list 'auto-mode-alist '("PKGBUILD" . sh-mode))
(add-to-list 'auto-mode-alist '("SRCBUILD" . sh-mode))
+(add-to-list 'auto-mode-alist '("\\.md\\'" . markdown-mode))
+(add-to-list 'auto-mode-alist '("\\.ronn\\'" . markdown-mode))
;(require 'flymake)
;(add-hook 'php-mode-hook (lambda() (flymake-mode 1)))
@@ -209,3 +212,29 @@
;(setq tramp-debug-buffer t)
;(setq tramp-verbose 10)
+
+;; (add-to-list 'load-path "/usr/share/emacs/site-lisp/mu4e")
+;; (require 'mu4e)
+;; (require 'mu4e-speedbar)
+
+;; (setq
+;; mu4e-maildir "~/Maildir" ;; top-level Maildir
+;; mu4e-sent-folder "/.Sent" ;; folder for sent messages
+;; mu4e-drafts-folder "/.Draft" ;; unfinished messages
+;; mu4e-trash-folder "/.Trash" ;; trashed messages
+;; mu4e-refile-folder "/archive") ;; saved messages
+;; (setq mu4e-get-mail-command "offlineimap")
+;; (setq mu4e-use-fancy-chars "t")
+;; ;; enable inline images
+;; (setq mu4e-view-show-images t)
+;; ;; use imagemagick, if available
+;; (when (fboundp 'imagemagick-register-types)
+;; (imagemagick-register-types))
+
+
+(defun sm-try-smerge ()
+ (save-excursion
+ (goto-char (point-min))
+ (when (re-search-forward "^<<<<<<< " nil t)
+ (smerge-mode 1))))
+(add-hook 'find-file-hook 'sm-try-smerge t)
diff --git a/.config/emacs/wl.el b/.config/emacs/wl.el
new file mode 100644
index 0000000..a169249
--- /dev/null
+++ b/.config/emacs/wl.el
@@ -0,0 +1,77 @@
+;; mode:-*-emacs-lisp-*-
+
+(setq user-mail-address "lukeshu@sbcglobal.net")
+
+;; wanderlust
+(setq
+ ;; Misc ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+ wl-local-domain "lukeshu.ath.cx"
+ wl-icon-directory "~/.emacs.d/el-get/wanderlust/icons"
+
+ ;; Network ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+ ;; This only deals with sending--I use offlineimap to fetch
+ wl-draft-send-mail-function 'wl-draft-send-mail-with-smtp
+ ;; The following settings are Yahoo!'s SMTP servers:
+ wl-smtp-connection-type (quote ssl)
+ wl-smtp-authenticate-type "login"
+ wl-smtp-posting-server "plus.smtp.mail.yahoo.com"
+ ;wl-smtp-posting-server "outbound.att.net"
+ wl-smtp-posting-port 465
+ wl-smtp-posting-user user-mail-address
+ wl-message-id-domain user-mail-address
+
+ ;; Folders/File system ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+ elmo-msgdb-directory "~/.emacs.d/elmo" ;; where elmo keeps all its stuff
+ elmo-cache-directory "~/.emacs.d/elmo-cache" ;; where elmo keeps all its stuff
+ elmo-maildir-folder-path "~/Maildir" ;; where I store my mail
+
+ ;; 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
+
+ ;; check this folder periodically, and update modeline
+ ;wl-biff-check-folder-list '(".todo") ;; check every 180 seconds
+ ;; (default: wl-biff-check-interval)
+
+ ;wl-folder-hierarchy-access-folders '("\.*")
+ wl-folder-hierarchy-access-folders '(
+ "^.\\([^/.]+[/.]\\)*[^/.]+\\(:\\|@\\|$\\)"
+ "^-[^.]*\\(:\\|@\\|$\\)"
+ "^@$"
+ "^'$")
+
+ ;; Writing
+ wl-from (concat user-full-name " <" user-mail-address ">") ;; From: line
+ ;;wl-organization "Foo Corp"
+ wl-fcc-force-as-read t ;; mark sent messages as read
+ mime-edit-split-message nil ;; don't split long messages
+
+ ;; Reading ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+ wl-stay-folder-window t ;; show the folder pane (left)
+ wl-folder-window-width 35 ;;
+ wl-message-auto-reassemble-message/partial t ;; reasemble split messages
+
+ wl-message-ignored-field-list '("^.*:") ;; default to hiding all headers
+ wl-message-visible-field-list ;; but then display these
+ '("^\\(To\\|Cc\\):"
+ "^Subject:"
+ "^\\(From\\|Reply-To\\):"
+ "^Organization:"
+ "^Message-Id:"
+ "^\\(Posted\\|Date\\):"
+ "^List-ID:"
+ )
+ wl-message-sort-field-list ;; in this order
+ '("^Date"
+ "^From"
+ "^Organization:"
+ "^X-Attribution:"
+ "^Subject"
+ "^To"
+ "^Cc")
+ )