X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=.emacs;h=672e569c2058286d6fd12a8a2ada2c170a3fabb8;hb=3967556124a5af953e44d032d92b59e6981fe593;hp=f37d936892081ae7023327f571051168e121091a;hpb=5d29561746b27218b3832146ce00cc75077360a9;p=emacs.git diff --git a/.emacs b/.emacs index f37d936..672e569 100644 --- a/.emacs +++ b/.emacs @@ -1,15 +1,15 @@ (custom-set-variables - ;; custom-set-variables was added by Custom. - ;; 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-set-variables was added by Custom. + ;; 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. '(bibtex-user-optional-fields (quote (("annote" "Personal annotation (ignored)") ("abstract" "") ("pmid" "") ("doi" "")))) '(calendar-latitude [33 57 north]) '(calendar-longitude [117 24 west]) '(case-fold-search t) '(confirm-kill-emacs (quote y-or-n-p)) '(cperl-lazy-help-time nil) - '(debian-changelog-mailing-address "don@debian.org") + '(debian-changelog-mailing-address "don@debian.org" t) '(display-time t) '(display-time-24hr-format t) '(display-time-day-and-date t) @@ -59,6 +59,7 @@ (fset 'perl-mode 'cperl-mode) ;;(load-file "cperl-mode.el") +(add-to-list 'load-path '"~/lib/emacs_el/configuration/") (add-to-list 'load-path '"~/lib/emacs_el/") ;; 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") @@ -79,9 +80,9 @@ (require 'bibtex) (require 'post) ;;(require 'fixme) -(require 'google-weather) -(require 'org-google-weather) -(setq-default org-google-weather-format "%i %c, [%l,%h] %s %C") +; (require 'google-weather) +; (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 @@ -90,113 +91,6 @@ (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 %13SCHEDULED %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-default auto-mode-alist (cons '("\.wml$" . @@ -279,12 +173,15 @@ Argument DESCRIPTION MIME description." cperl-auto-newline nil cperl-auto-newline-after-colon nil cperl-continued-statement-offset 4 - cperl-brace-offset -4 + cperl-brace-offset -1 + cperl-continued-brace-offset 0 cperl-label-offset -4 cperl-highlight-variables-indiscriminately t cperl-electric-lbrace-space nil - ) -(add-hook 'cperl-mode-hook (lambda () (cperl-set-style "PerlStyle"))) + cperl-indent-parens-as-block nil + cperl-close-paren-offset -1 + cperl-tab-always-indent t) +;(add-hook 'cperl-mode-hook (lambda () (cperl-set-style "PerlStyle"))) @@ -318,6 +215,11 @@ Argument DESCRIPTION MIME description." (add-hook 'LaTeX-mode-hook 'outline-minor-mode) ; with AUCTeX LaTeX mode (add-hook 'latex-mode-hook 'outline-minor-mode) ; with Emacs latex mode +; use smart quotes by default instead of `` and '' +; taken from http://kieranhealy.org/esk/kjhealy.html +(setq TeX-open-quote "“") +(setq TeX-close-quote "”") + ;; (TeX-add-style-hook ;; "latex" ;; (lambda () @@ -331,30 +233,47 @@ Argument DESCRIPTION MIME description." ;; ) (require 'font-latex) -(add-to-list 'font-latex-match-reference-keywords "fref") -(add-to-list 'font-latex-match-reference-keywords "Fref") -(add-to-list 'font-latex-match-reference-keywords "citep") -(add-to-list 'font-latex-match-reference-keywords "citet") -(font-latex-match-reference-make) -(add-to-list 'font-latex-match-function-keywords "DLA") -(add-to-list 'font-latex-match-function-keywords "RZ") -(add-to-list 'font-latex-match-function-keywords "OM") -(add-to-list 'font-latex-match-function-keywords "DL") -(add-to-list 'font-latex-match-function-keywords "fixme") -(add-to-list 'font-latex-match-function-keywords "acs") -(add-to-list 'font-latex-match-function-keywords "acsp") -(add-to-list 'font-latex-match-function-keywords "ac") -(add-to-list 'font-latex-match-function-keywords "acp") -(add-to-list 'font-latex-match-function-keywords "acl") -(add-to-list 'font-latex-match-function-keywords "aclp") -(add-to-list 'font-latex-match-function-keywords "acsu") -(add-to-list 'font-latex-match-function-keywords "aclu") -(add-to-list 'font-latex-match-function-keywords "acused") -(font-latex-match-function-make) +(setq font-latex-match-reference-keywords + '( + ("fref" "{") + ("Fref" "{") + ("citep" "{") + ("citet" "{") + ("acs" "{") + ("acsp" "{") + ("ac" "{") + ("acp" "{") + ("acl" "{") + ("aclp" "{") + ("acsu" "{") + ("aclu" "{") + ("acused" "{") +; )) +; (setq font-latex-match-warning-keywords +; '( + ("DLA" "{") + ("RZ" "{") + ("OM" "{") + ("DL" "{") + ("fixme" "{"))) + (setq-default TeX-parse-self t) (setq-default TeX-auto-save t) (setq-default TeX-master nil) +;; this doesn't seem to work; not currently sure why +; (setq font-latex-user-keyword-classes +; '(("my-warning-commands" +; (("DLA" "{") +; ("RZ" "{") +; ("OM" "{") +; ("DL" "{") +; ("fixme" "{") +; ) +; (:foreground "red" :weight bold :underline (:color foreground-color :style line))) +; )) + + (defun insert-date () "Insert date at point." (interactive) @@ -378,7 +297,7 @@ Argument DESCRIPTION MIME description." (require 'mode-compile) (setq-default reftex-default-bibliography - '("references.bib")) + '("~/projects/research/references.bib")) (defadvice server-process-filter (after post-mode-message first activate) "If the buffer is in post mode, overwrite the server-edit @@ -431,10 +350,10 @@ Argument DESCRIPTION MIME description." (desktop-read) '(iswitchb-mode on) (custom-set-faces - ;; custom-set-faces was added by Custom. - ;; 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-set-faces was added by Custom. + ;; 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. '(menu ((((type x-toolkit)) (:background "black" :foreground "grey90"))))) (defun ess-change-directory (path) @@ -450,15 +369,6 @@ Argument DESCRIPTION MIME description." (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)) -(add-hook 'org-mode-hook 'turn-on-font-lock) ; not needed when global-font-lock-mode is on -(global-set-key "\C-cl" 'org-store-link) -(global-set-key "\C-ca" 'org-agenda) -(global-set-key "\C-cb" 'org-iswitchb) -(setq-default org-log-done 'time) -(setq-default org-agenda-ndays 5) - (autoload 'flyspell-mode "flyspell" "On-the-fly spelling checker." t) (add-hook 'message-mode-hook 'turn-on-flyspell) @@ -507,35 +417,15 @@ Argument DESCRIPTION MIME description." (define-key cm-map "b" 'outline-backward-same-level) ; Backward - same level (global-set-key "\M-o" cm-map) -(defun my-org-mode-setup () - (load-library "reftex") - (and (buffer-file-name) - (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) - -(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") +; ediff configuration +; don't use the multi-window configuration +(setq ediff-window-setup-function 'ediff-setup-windows-plain) + ; use iedit (require 'iedit) (define-key global-map (kbd "C-;") 'iedit-mode) @@ -556,46 +446,6 @@ Argument DESCRIPTION MIME description." (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) @@ -612,6 +462,104 @@ want to use in the modeline *in lieu of* the original.") (setq flymake-mode-line mode-line) (force-mode-line-update))) +; load sql-indent when sql is loaded +(eval-after-load "sql" + '(load-library "sql-indent")) + +; fix up tmux xterm keys +; stolen from http://unix.stackexchange.com/questions/24414/shift-arrow-not-working-in-emacs-within-tmux +(if (getenv "TMUX") + (progn + (let ((x 2) (tkey "")) + (while (<= x 8) + ;; shift + (if (= x 2) + (setq tkey "S-")) + ;; alt + (if (= x 3) + (setq tkey "M-")) + ;; alt + shift + (if (= x 4) + (setq tkey "M-S-")) + ;; ctrl + (if (= x 5) + (setq tkey "C-")) + ;; ctrl + shift + (if (= x 6) + (setq tkey "C-S-")) + ;; ctrl + alt + (if (= x 7) + (setq tkey "C-M-")) + ;; ctrl + alt + shift + (if (= x 8) + (setq tkey "C-M-S-")) + + ;; arrows + (define-key key-translation-map (kbd (format "M-[ 1 ; %d A" x)) (kbd (format "%s" tkey))) + (define-key key-translation-map (kbd (format "M-[ 1 ; %d B" x)) (kbd (format "%s" tkey))) + (define-key key-translation-map (kbd (format "M-[ 1 ; %d C" x)) (kbd (format "%s" tkey))) + (define-key key-translation-map (kbd (format "M-[ 1 ; %d D" x)) (kbd (format "%s" tkey))) + ;; home + (define-key key-translation-map (kbd (format "M-[ 1 ; %d H" x)) (kbd (format "%s" tkey))) + ;; end + (define-key key-translation-map (kbd (format "M-[ 1 ; %d F" x)) (kbd (format "%s" tkey))) + ;; page up + (define-key key-translation-map (kbd (format "M-[ 5 ; %d ~" x)) (kbd (format "%s" tkey))) + ;; page down + (define-key key-translation-map (kbd (format "M-[ 6 ; %d ~" x)) (kbd (format "%s" tkey))) + ;; insert + (define-key key-translation-map (kbd (format "M-[ 2 ; %d ~" x)) (kbd (format "%s" tkey))) + ;; delete + (define-key key-translation-map (kbd (format "M-[ 3 ; %d ~" x)) (kbd (format "%s" tkey))) + ;; f1 + (define-key key-translation-map (kbd (format "M-[ 1 ; %d P" x)) (kbd (format "%s" tkey))) + ;; f2 + (define-key key-translation-map (kbd (format "M-[ 1 ; %d Q" x)) (kbd (format "%s" tkey))) + ;; f3 + (define-key key-translation-map (kbd (format "M-[ 1 ; %d R" x)) (kbd (format "%s" tkey))) + ;; f4 + (define-key key-translation-map (kbd (format "M-[ 1 ; %d S" x)) (kbd (format "%s" tkey))) + ;; f5 + (define-key key-translation-map (kbd (format "M-[ 15 ; %d ~" x)) (kbd (format "%s" tkey))) + ;; f6 + (define-key key-translation-map (kbd (format "M-[ 17 ; %d ~" x)) (kbd (format "%s" tkey))) + ;; f7 + (define-key key-translation-map (kbd (format "M-[ 18 ; %d ~" x)) (kbd (format "%s" tkey))) + ;; f8 + (define-key key-translation-map (kbd (format "M-[ 19 ; %d ~" x)) (kbd (format "%s" tkey))) + ;; f9 + (define-key key-translation-map (kbd (format "M-[ 20 ; %d ~" x)) (kbd (format "%s" tkey))) + ;; f10 + (define-key key-translation-map (kbd (format "M-[ 21 ; %d ~" x)) (kbd (format "%s" tkey))) + ;; f11 + (define-key key-translation-map (kbd (format "M-[ 23 ; %d ~" x)) (kbd (format "%s" tkey))) + ;; f12 + (define-key key-translation-map (kbd (format "M-[ 24 ; %d ~" x)) (kbd (format "%s" tkey))) + ;; f13 + (define-key key-translation-map (kbd (format "M-[ 25 ; %d ~" x)) (kbd (format "%s" tkey))) + ;; f14 + (define-key key-translation-map (kbd (format "M-[ 26 ; %d ~" x)) (kbd (format "%s" tkey))) + ;; f15 + (define-key key-translation-map (kbd (format "M-[ 28 ; %d ~" x)) (kbd (format "%s" tkey))) + ;; f16 + (define-key key-translation-map (kbd (format "M-[ 29 ; %d ~" x)) (kbd (format "%s" tkey))) + ;; f17 + (define-key key-translation-map (kbd (format "M-[ 31 ; %d ~" x)) (kbd (format "%s" tkey))) + ;; f18 + (define-key key-translation-map (kbd (format "M-[ 32 ; %d ~" x)) (kbd (format "%s" tkey))) + ;; f19 + (define-key key-translation-map (kbd (format "M-[ 33 ; %d ~" x)) (kbd (format "%s" tkey))) + ;; f20 + (define-key key-translation-map (kbd (format "M-[ 34 ; %d ~" x)) (kbd (format "%s" tkey))) + + (setq x (+ x 1)) + )) + ) + ) + +; require org mode +(load "org-mode-configuration") + ; 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