X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=.emacs;h=a685cb6435dc592ee0c69af1051e9ff1618ea9e2;hb=2c5d2f20398d8b5ba7883ab6f550537b17264e41;hp=78f27f9cd28a9a27ccf050b0590d20d208ce925f;hpb=f7f5372d7a12144a45acd3f1b3f1b1e5fe6665ff;p=emacs.git diff --git a/.emacs b/.emacs index 78f27f9..a685cb6 100644 --- a/.emacs +++ b/.emacs @@ -27,7 +27,6 @@ '(markdown-enable-math t) '(markdown-follow-wiki-link-on-enter nil) '(mutt-alias-file-list (quote ("~/.mutt/aliases" "~/.mail_aliases"))) - '(org-agenda-files (quote ("~/projects/debbugs/notes.org" "~/projects/notes/notes.org" "~/projects/origins_of_life/paper/figure_list.org" "~/projects/origins_of_life/ool.org" "~/projects/sysadmin/sndservers/sndservers.org" "~/projects/chaim/chaim.org" "~/projects/fh/fh.org" "~/projects/notes/library_books.org"))) '(post-email-address "don@donarmstrong.com") '(post-kill-quoted-sig nil) '(post-mail-message "mutt\\(ng\\|\\)-[a-z0-9]+-[0-9]+-.*") @@ -48,16 +47,30 @@ '(user-mail-address "don@donarmstrong.com") '(vc-delete-logbuf-window nil) '(vc-follow-symlinks t)) + +;; use git before SVN; use CVS earlier, because I have CVS +;; repositories inside of git directories +(setq vc-handled-backends (quote (CVS Git RCS SVN SCCS Bzr Hg Mtn Arch))) + +;; switch back to the old primary selection method +(setq x-select-enable-clipboard nil) +(setq x-select-enable-primary t) +; (setq mouse-drag-copy-region t) + (fset 'perl-mode 'cperl-mode) ;;(load-file "cperl-mode.el") (add-to-list 'load-path '"~/lib/emacs_el/") -(add-to-list 'load-path '"~/lib/emacs_el/tiny-tools/tiny") -(add-to-list 'load-path '"~/lib/emacs_el/tiny-tools/other") +;; this is the tiny-tools module from https://github.com/jaalto/project--emacs-tiny-tools.git +(add-to-list 'load-path '"~/lib/emacs_el/tiny-tools/lisp/tiny") +(add-to-list 'load-path '"~/lib/emacs_el/tiny-tools/lisp/other") ;;(add-to-list 'Tex-style-path '"~/lib/emacs_el/auctex/") -(require 'tiny-setup) +(setq tinyprocmail--procmail-version "v3.22") +(add-hook 'tinyprocmail--load-hook 'tinyprocmail-install) (require 'tinyprocmail) +(require 'vcl-mode) + (require 'tex-site) ;;(require 'psvn) (require 'cperl-mode) @@ -68,12 +81,125 @@ ;;(require 'fixme) (require 'google-weather) (require 'org-google-weather) -(setq org-google-weather-format "%i %c, [%l,%h] %s %C") +(setq-default org-google-weather-format "%i %c, [%l,%h] %s %C") + +; http://julien.danjou.info/projects/emacs-packages#rainbow-mode +; this colorizes color strings +(require 'rainbow-mode) +; add ess to the x major mode +(add-to-list 'rainbow-x-colors-major-mode-list 'ESS[S]) +(add-to-list 'rainbow-x-colors-major-mode-list 'ESS[R]) + +; org mode agenda files +(setq org-agenda-files + (quote ("~/projects/debbugs/debbugs.org" + "~/projects/notes/notes.org" + "~/projects/origins_of_life/ool.org" + "~/projects/sysadmin/sndservers/sndservers.org" + "~/projects/chaim/chaim.org" + "~/projects/fh/fh.org"))) + +(setq org-global-properties '(("Effort_ALL 0 0:10 0:30 1:00 2:00 3:00 4:00 5:00 6:00 7:00"))) +(setq org-columns-default-format "%40ITEM(Task) %TAGS %PRIORITY %TODO %17Effort(Estimated Effort){:} %CLOCKSUM") + +(setq org-default-notes-file "~/projects/notes/notes.org") +(setq org-capture-templates ;; mail-specific note template, identified by "m" + '(("m" "Mail" entry (file+headline "~/projects/notes/refile.org" "Mail") + "* %?\n\n Source: %u, %c\n %i") + ("t" "todo" entry (file "~/projects/notes/refile.org") + "* TODO %?\n%U\n%a\n" :clock-in t :clock-resume t) + ("r" "respond" entry (file "~/projects/notes/refile.org") + "* NEXT Respond to %:from on %:subject\nSCHEDULED: %t\n%U\n%a\n" :clock-in t :clock-resume t :immediate-finish t) + ("n" "note" entry (file "~/projects/notes/refile.org") + "* %? :NOTE:\n%U\n%a\n" :clock-in t :clock-resume t) + ("j" "Journal" entry (file+datetree "~/projects/notes/diary.org") + "* %?\n%U\n" :clock-in t :clock-resume t) + ("w" "org-protocol" entry (file "~/projects/notes/refile.org") + "* TODO Review %c\n%U\n" :immediate-finish t) + ("p" "Phone call" entry (file "~/projects/notes/refile.org") + "* PHONE %? :PHONE:\n%U" :clock-in t :clock-resume t) + ("h" "Habit" entry (file "~/projects/notes/refile.org") + "* NEXT %?\n%U\n%a\nSCHEDULED: %(format-time-string \"<%Y-%m-%d %a .+1d/3d>\")\n:PROPERTIES:\n:STYLE: habit\n:REPEAT_TO_STATE: NEXT\n:END:\n") + ) + ) + +;; Remove empty LOGBOOK drawers on clock out +(defun bh/remove-empty-drawer-on-clock-out () + (interactive) + (save-excursion + (beginning-of-line 0) + (org-remove-empty-drawer-at "LOGBOOK" (point)))) + +(add-hook 'org-clock-out-hook 'bh/remove-empty-drawer-on-clock-out 'append) + + +; this is from http://doc.norang.ca/org-mode.html#Capture +; use C-M-r for org mode capture +(global-set-key (kbd "C-M-r") 'org-capture) + +; Targets include this file and any file contributing to the agenda - up to 9 levels deep +(setq org-refile-targets (quote ((nil :maxlevel . 9) + (org-agenda-files :maxlevel . 9)))) + +; Use full outline paths for refile targets - we file directly with IDO +(setq org-refile-use-outline-path t) + +; Targets complete directly with IDO +(setq org-outline-path-complete-in-steps nil) + +; Allow refile to create parent tasks with confirmation +(setq org-refile-allow-creating-parent-nodes (quote confirm)) + +; Use IDO for both buffer and file completion and ido-everywhere to t +(setq org-completion-use-ido t) +(setq ido-everywhere t) +(setq ido-max-directory-size 100000) +(ido-mode (quote both)) + +;;;; Refile settings +; Exclude DONE state tasks from refile targets +(defun bh/verify-refile-target () + "Exclude todo keywords with a done state from refile targets" + (not (member (nth 2 (org-heading-components)) org-done-keywords))) + +(setq org-refile-target-verify-function 'bh/verify-refile-target) + +;; ensure that emacsclient will show just the note to be edited when invoked +;; from Mutt, and that it will shut down emacsclient once finished; +;; fallback to legacy behavior when not invoked via org-protocol. +(require 'org-protocol) +(add-hook 'org-capture-mode-hook 'delete-other-windows) +(setq my-org-protocol-flag nil) +(defadvice org-capture-finalize (after delete-frame-at-end activate) + "Delete frame at remember finalization" + (progn (if my-org-protocol-flag (delete-frame)) + (setq my-org-protocol-flag nil))) +(defadvice org-capture-kill (after delete-frame-at-end activate) + "Delete frame at remember abort" + (progn (if my-org-protocol-flag (delete-frame)) + (setq my-org-protocol-flag nil))) +(defadvice org-protocol-capture (before set-org-protocol-flag activate) + (setq my-org-protocol-flag t)) + + +; this comes from http://upsilon.cc/~zack/blog/posts/2010/02/integrating_Mutt_with_Org-mode/ +(defun open-mail-in-mutt (message) + "Open a mail message in Mutt, using an external terminal. + +Message can be specified either by a path pointing inside a +Maildir, or by Message-ID." + (interactive "MPath or Message-ID: ") + (shell-command + (format "xterm -e \"%s %s\"" + (substitute-in-file-name "$HOME/bin/mutt_open") message))) + +;; add support for "mutt:ID" links +(org-add-link-type "mutt" 'open-mail-in-mutt) (global-set-key "\C-xp" 'server-edit) -(setq auto-mode-alist (cons '("\.wml$" . +(setq-default auto-mode-alist (cons '("\.wml$" . (lambda () (html-mode) (auto-fill-mode))) auto-mode-alist)) @@ -84,16 +210,57 @@ (add-to-list 'interpreter-mode-alist '("perl5" . cperl-mode)) (add-to-list 'interpreter-mode-alist '("miniperl" . cperl-mode)) -(add-to-list 'auto-mode-alist '("muttng-[a-z0-9]+-[0-9]+-" . post-mode)) +; use markdown mode for mdwn files +(add-to-list 'auto-mode-alist '("\\.mdwn$" . markdown-mode)) + + + + +; mail configuration +(add-to-list 'auto-mode-alist '("muttng-[a-z0-9]+-[0-9]+-" . message-mode)) (add-to-list 'auto-mode-alist '("muttngrc" . muttrc-mode)) -(add-to-list 'auto-mode-alist '("mutt-[a-z0-9]+-[0-9]+-" . post-mode)) +(add-to-list 'auto-mode-alist '("mutt-[a-z0-9]+-[0-9]+-" . message-mode)) (add-to-list 'auto-mode-alist '("muttrc" . muttrc-mode)) +(defun my-message-mode-settings () + (font-lock-add-keywords nil + '(("^[ \t]*>[ \t]*>[ \t]*>.*$" + (0 'message-multiply-quoted-text-face)) + ("^[ \t]*>[ \t]*>.*$" + (0 'message-double-quoted-text-face)))) + (local-set-key (kbd "C-c C-a") 'my-post-attach-file) + ) +(add-hook 'message-mode-hook 'my-message-mode-settings) -(add-to-list 'auto-mode-alist '("\\.mdwn$" . markdown-mode)) +(defun my-post-attach-file () + "Prompt for an attachment." + (interactive) + (let ((file (read-file-name "Attach file: " nil nil t nil)) + (description (string-read "Description: "))) + (my-header-attach-file file description))) + +(symbol-function 'my-post-attach-file) +(defun my-header-attach-file (file description) + "Attach a FILE to the current message (works with Mutt). +Argument DESCRIPTION MIME description." + (interactive "fAttach file: \nsDescription: ") + (when (> (length file) 0) + (save-excursion + (save-match-data + (save-restriction + (widen) + (goto-char (point-min)) + (search-forward-regexp "^$") + (insert (concat "Attach: " (replace-regexp-in-string "\\([[:space:]\\]\\)" "\\\\\\1" (file-truename file)) " " + description "\n")) + (message (concat "Attached '" file "'.")) + (setq post-has-attachment t)))))) + +(setq mail-yank-prefix "> ") + (global-unset-key "\M-g") (global-set-key "\M-g" 'goto-line) @@ -109,8 +276,8 @@ ;; } (setq cperl-hairy t cperl-indent-level 4 -;; cperl-auto-newline t -;; cperl-auto-newline-after-colon t + cperl-auto-newline nil + cperl-auto-newline-after-colon nil cperl-continued-statement-offset 4 cperl-brace-offset -4 cperl-label-offset -4 @@ -123,14 +290,15 @@ ;(load-library "php-mode") -(setq c-indent-level 8) -(setq c-brace-imaginary-offset 0) -(setq c-brace-offset -8) -(setq c-argdecl-indent 8) -(setq c-label-offset -8) -(setq c-continued-statement-offset 8) -(setq indent-tabs-mode nil) -(setq tab-width 8) +(setq-default c-indent-level 4) +(setq-default c-brace-imaginary-offset 0) +(setq-default c-brace-offset -4) +(setq-default c-argdecl-indent 4) +(setq-default c-label-offset -4) +(setq-default c-continued-statement-offset 4) +; tabs are annoying +(setq-default indent-tabs-mode nil) +(setq-default tab-width 4) ;; (autoload 'php-mode "php-mode" "PHP editing mode" t) @@ -183,8 +351,8 @@ (add-to-list 'font-latex-match-function-keywords "aclu") (add-to-list 'font-latex-match-function-keywords "acused") (font-latex-match-function-make) -(setq TeX-parse-self t) -(setq TeX-auto-save t) +(setq-default TeX-parse-self t) +(setq-default TeX-auto-save t) (setq-default TeX-master nil) (defun insert-date () @@ -203,13 +371,13 @@ ;(iswitchb-default-keybindings) (column-number-mode t) -(setq reftex-plug-into-AUCTeX t) +(setq-default reftex-plug-into-AUCTeX t) (server-start) (require 'mode-compile) -(setq reftex-default-bibliography +(setq-default reftex-default-bibliography '("references.bib")) (defadvice server-process-filter (after post-mode-message first activate) @@ -221,7 +389,7 @@ ; This is also needed to see the magic message. Set to a higher ; number if you have a faster computer or read slower than me. '(font-lock-verbose 1000) -;(setq server-temp-file-regexp "mutt\(-\|ng-\)") +;(setq-default server-temp-file-regexp "mutt\(-\|ng-\)") ; (add-hook 'server-switch-hook ; (function (lambda() ; (cond ((string-match "Post" mode-name) @@ -233,9 +401,23 @@ (add-hook 'post-mode-hook (auto-fill-mode nil) ) +; abbrev mode settings +; load abbreviations from +(setq abbrev-file-name + "~/.emacs_abbrev_def") + +; read the abbrev file if it exists +(if (file-exists-p abbrev-file-name) + (quietly-read-abbrev-file)) + +; for now, use abbrev mode everywhere +(setq default-abbrev-mode t) + -(fset 'insert-function-documentation - [?\C-x ?i home ?\C-k ?/ ?h ?o ?m ?e ?/ ?d ?o ?n ?/ ?l ?i ?b ?/ ?t ?e ?m ?p ?l ?a ?t ?e ?s ?/ ?p ?e ?r ?l ?_ ?f ?u ?n ?c ?t ?i ?o ?n ?_ ?d ?o ?c ?u ?m ?e ?n ?t ?a ?t ?i ?o ?n return]) +(defun insert-function-documentation () + "Insert function documentation" + (interactive) + (insert-file-contents "/home/don/lib/templates/perl_function_documentation" nil)) (global-set-key "\M-f" 'insert-function-documentation) (eval-after-load "lilypond-mode" @@ -265,8 +447,8 @@ (setq default-directory (file-name-as-directory path)))) (put 'upcase-region 'disabled nil) - (put 'downcase-region 'disabled nil) +(put 'narrow-to-region 'disabled nil) ;; The following lines are always needed. Choose your own keys. (add-to-list 'auto-mode-alist '("\\.org\\'" . org-mode)) @@ -274,8 +456,8 @@ (global-set-key "\C-cl" 'org-store-link) (global-set-key "\C-ca" 'org-agenda) (global-set-key "\C-cb" 'org-iswitchb) -(setq org-log-done 'time) -(setq org-agenda-ndays 5) +(setq-default org-log-done 'time) +(setq-default org-agenda-ndays 5) (autoload 'flyspell-mode "flyspell" "On-the-fly spelling checker." t) @@ -292,12 +474,15 @@ ;;; outlining support for ess modes (add-hook 'ess-mode-hook - '(lambda () - (outline-minor-mode) - (setq outline-regexp "\\(^#\\{4,5\\} \\)\\|\\(^[a-zA-Z0-9_\.]+ ?<- ?function(.*{\\)") - (defun outline-level - (lambda () (interactive) (cond ((looking-at "^##### ") 1)((looking-at "^#### ") 2)((looking-at "^[a-zA-Z0-9_\.]+ ?<- ?function(.*{") 3) (t 1000))) - ))) + '(lambda () + (outline-minor-mode) + (setq outline-regexp "\\(^#\\{4,5\\} \\)\\|\\(^[a-zA-Z0-9_\.]+ ?<- ?function\\)") + (defun outline-level () + (cond ((looking-at "^##### ") 1) + ((looking-at "^#### ") 2) + ((looking-at "^[a-zA-Z0-9_\.]+ ?<- ?function(.*{") 3) + (t 1000))) + )) ; Outline-minor-mode key map (define-prefix-command 'cm-map nil "Outline-") @@ -323,19 +508,131 @@ (global-set-key "\M-o" cm-map) (defun my-org-mode-setup () - (when (and (buffer-file-name) - (file-exists-p (buffer-file-name))) (load-library "reftex") (and (buffer-file-name) - (file-exists-p (buffer-file-name)) - (reftex-parse-all)) - (reftex-set-cite-format - '((?b . "[[bib::%l]]") - (?n . "[[note::%l]]")))) - (define-key org-mode-map "\C-c\C-g" 'reftex-citation) -) + (file-exists-p (buffer-file-name)) + (progn + (reftex-parse-all) + (reftex-set-cite-format + '((?b . "[[bib::%l][%l-bib]]") + (?n . "[[note::%l][%l-notes]]") + (?h . "** %t\n:PROPERTIES:\n:Custom_ID: %l\n:END:\n[[papers:%l][%l-paper]]"))) + )) + (define-key org-mode-map (kbd "C-c )") 'reftex-citation) + (define-key org-mode-map (kbd "C-c (") 'org-mode-reftex-search) + ) (add-hook 'org-mode-hook 'my-org-mode-setup) -(setq org-mobile-directory "/rzlab.ucr.edu:/sites/dav.donarmstrong.com/root/org/") -(setq org-directory "/home/don/org-mode/") -(setq org-mobile-inbox-for-pull "/home/don/org-mode/from-mobile.org") +(defun org-mode-reftex-search () + (interactive) + (org-open-link-from-string (format "[[notes:%s]]" (reftex-citation t)))) + + +(setq-default org-mobile-directory "/rzlab.ucr.edu:/sites/dav.donarmstrong.com/root/org/") +(setq-default org-directory "/home/don/org-mode/") +(setq-default org-mobile-inbox-for-pull "/home/don/org-mode/from-mobile.org") + +; debian stuff +(setq-default debian-changelog-mailing-address "don@debian.org") +(setq-default debian-changelog-full-name "Don Armstrong") + +; use iedit +(require 'iedit) +(define-key global-map (kbd "C-;") 'iedit-mode) +(global-set-key (kbd "C-;") 'iedit-mode) + +; fix up css mode to not be silly +; from http://www.stokebloke.com/wordpress/2008/03/21/css-mode-indent-buffer-fix/ +(setq cssm-indent-level 4) +(setq cssm-newline-before-closing-bracket t) +(setq cssm-indent-function #'cssm-c-style-indenter) +(setq cssm-mirror-mode nil) + +(require 'multi-web-mode) +(setq mweb-default-major-mode 'html-mode) +(setq mweb-tags '((php-mode "<\\?php\\|<\\? \\|<\\?=" "\\?>") + (js-mode "") + (css-mode ""))) +(setq mweb-filename-extensions '("php" "htm" "html" "ctp" "phtml" "php4" "php5")) +(multi-web-global-mode 1) + +; clean-mode-line from http://www.masteringemacs.org/articles/2012/09/10/hiding-replacing-modeline-strings/ +(defvar mode-line-cleaner-alist + `((auto-complete-mode . " α") + (yas/minor-mode . " υ") + (paredit-mode . " π") + (eldoc-mode . "") + (abbrev-mode . "") + (my-keys-minor-mode . "") + ;; Major modes + (lisp-interaction-mode . "λ") + (hi-lock-mode . "") + (python-mode . "Py") + (cperl-mode . "ρ") + (auctex-mode . "Lχ") + (org-agenda-mode . "øα") + (org-mode . "ø") + (emacs-lisp-mode . "EL") + (nxhtml-mode . "nx")) + "Alist for `clean-mode-line'. + +When you add a new element to the alist, keep in mind that you +must pass the correct minor/major mode symbol and a string you +want to use in the modeline *in lieu of* the original.") + + +(defun clean-mode-line () + (interactive) + (loop for cleaner in mode-line-cleaner-alist + do (let* ((mode (car cleaner)) + (mode-str (cdr cleaner)) + (old-mode-str (cdr (assq mode minor-mode-alist)))) + (when old-mode-str + (setcar old-mode-str mode-str)) + ;; major mode + (when (eq mode major-mode) + (setq mode-name mode-str))))) + + +(add-hook 'after-change-major-mode-hook 'clean-mode-line) + +;;; alias the new `flymake-report-status-slim' to +;;; `flymake-report-status' +(defalias 'flymake-report-status 'flymake-report-status-slim) +(defun flymake-report-status-slim (e-w &optional status) + "Show \"slim\" flymake status in mode line." + (when e-w + (setq flymake-mode-line-e-w e-w)) + (when status + (setq flymake-mode-line-status status)) + (let* ((mode-line " Φ")) + (when (> (length flymake-mode-line-e-w) 0) + (setq mode-line (concat mode-line ":" flymake-mode-line-e-w))) + (setq mode-line (concat mode-line flymake-mode-line-status)) + (setq flymake-mode-line mode-line) + (force-mode-line-update))) + +; apparently things like to step on C-;, so we'll use a hack from +; http://stackoverflow.com/questions/683425/globally-override-key-binding-in-emacs/5340797#5340797 to fix this + +(defvar my-keys-minor-mode-map (make-keymap) "my-keys-minor-mode keymap.") + +; use iedit everywhere +(define-key my-keys-minor-mode-map (kbd "C-;") 'iedit-mode) + +(define-minor-mode my-keys-minor-mode + "A minor mode so that my key settings override annoying major modes." + t " my-keys" 'my-keys-minor-mode-map) + +(my-keys-minor-mode 1) +(defun my-minibuffer-setup-hook () + (my-keys-minor-mode 0)) + +(add-hook 'minibuffer-setup-hook 'my-minibuffer-setup-hook) +(defadvice load (after give-my-keybindings-priority) + "Try to ensure that my keybindings always have priority." + (if (not (eq (car (car minor-mode-map-alist)) 'my-keys-minor-mode)) + (let ((mykeys (assq 'my-keys-minor-mode minor-mode-map-alist))) + (assq-delete-all 'my-keys-minor-mode minor-mode-map-alist) + (add-to-list 'minor-mode-map-alist mykeys)))) +(ad-activate 'load)