X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=.emacs;h=535c48410a77a4e1784217eedead8e6d2681cb8e;hb=055d581b10f5811f6b519c2baaeb6b8576501116;hp=b2918c10c32b35335f64a8e702281242df3f2d5a;hpb=ede21c03cb12f8ed1777cfc5538c758b3309417c;p=emacs.git
diff --git a/.emacs b/.emacs
index b2918c1..535c484 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,17 +47,27 @@
'(user-mail-address "don@donarmstrong.com")
'(vc-delete-logbuf-window nil)
'(vc-follow-symlinks t))
+
+
+;; 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/")
(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)
@@ -71,6 +80,119 @@
(require 'org-google-weather)
(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)
@@ -85,15 +207,27 @@
(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))
-(add-to-list 'auto-mode-alist '("muttngrc" . muttrc-mode))
+; use markdown mode for mdwn files
+(add-to-list 'auto-mode-alist '("\\.mdwn$" . markdown-mode))
-(add-to-list 'auto-mode-alist '("mutt-[a-z0-9]+-[0-9]+-" . post-mode))
-(add-to-list 'auto-mode-alist '("muttrc" . muttrc-mode))
-(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]+-" . message-mode))
+(add-to-list 'auto-mode-alist '("muttrc" . muttrc-mode))
+(add-hook 'mail-mode-hook
+ (lambda ()
+ (font-lock-add-keywords nil
+ '(("^[ \t]*>[ \t]*>[ \t]*>.*$"
+ (0 'mail-multiply-quoted-text-face))
+ ("^[ \t]*>[ \t]*>.*$"
+ (0 'mail-double-quoted-text-face))))))
+
+(setq mail-yank-prefix "> ")
(global-unset-key "\M-g")
(global-set-key "\M-g" 'goto-line)
@@ -108,10 +242,10 @@
;; which really should be,
;; if (-!-) {
;; }
-(setq-default cperl-hairy t
+(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
@@ -124,15 +258,15 @@
;(load-library "php-mode")
-(setq-default c-indent-level 8)
+(setq-default c-indent-level 4)
(setq-default c-brace-imaginary-offset 0)
-(setq-default c-brace-offset -8)
-(setq-default c-argdecl-indent 8)
-(setq-default c-label-offset -8)
-(setq-default c-continued-statement-offset 8)
+(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 8)
+(setq-default tab-width 4)
;; (autoload 'php-mode "php-mode" "PHP editing mode" t)
@@ -236,8 +370,10 @@
(auto-fill-mode nil)
)
-(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"
@@ -267,8 +403,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))
@@ -294,12 +430,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-")
@@ -349,3 +488,100 @@
; 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)