Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Various updates

  • Loading branch information...
commit ad20b9a0327912fcc468af42f60036da3870bdd2 1 parent 6ed22d5
John Wiegley authored

Showing 4 changed files with 76 additions and 21 deletions. Show diff stats Hide diff stats

  1. +1 0  dot-org.el
  2. +64 20 init.el
  3. +6 0 org-settings.el
  4. +5 1 settings.el
1  dot-org.el
@@ -755,6 +755,7 @@ Summary: %s" product component version priority severity heading) ?\n ?\n)
755 755 (define-key org-todo-state-map [,(upcase key)]
756 756 ',org-agenda-sym-no-logging)))))
757 757
  758 +(bind-key "C-c x e" 'org-export)
758 759 (bind-key "C-c x l" 'org-insert-dtp-link)
759 760 (bind-key "C-c x L" 'org-set-dtp-link)
760 761 (bind-key "C-c x m" 'org-insert-message-link)
84 init.el
@@ -51,20 +51,24 @@
51 51
52 52 ;;;_ , Read system environment
53 53
54   -(let ((plist (expand-file-name "~/.MacOSX/environment.plist")))
55   - (when (file-readable-p plist)
56   - (let ((dict (cdr (assq 'dict (cdar (xml-parse-file plist))))))
57   - (while dict
58   - (if (and (listp (car dict))
59   - (eq 'key (caar dict)))
60   - (setenv (car (cddr (car dict)))
61   - (car (cddr (car (cddr dict))))))
62   - (setq dict (cdr dict))))
63   -
64   - ;; Configure exec-path based on the new PATH
65   - (setq exec-path nil)
66   - (mapc (apply-partially #'add-to-list 'exec-path)
67   - (nreverse (split-string (getenv "PATH") ":")))))
  54 +(defun read-system-environment ()
  55 + (let ((plist (expand-file-name "~/.MacOSX/environment.plist")))
  56 + (when (file-readable-p plist)
  57 + (let ((dict (cdr (assq 'dict (cdar (xml-parse-file plist))))))
  58 + (while dict
  59 + (if (and (listp (car dict))
  60 + (eq 'key (caar dict)))
  61 + (setenv (car (cddr (car dict)))
  62 + (car (cddr (car (cddr dict))))))
  63 + (setq dict (cdr dict))))
  64 +
  65 + ;; Configure exec-path based on the new PATH
  66 + (setq exec-path nil)
  67 + (mapc (apply-partially #'add-to-list 'exec-path)
  68 + (nreverse (split-string (getenv "PATH") ":"))))))
  69 +
  70 +(read-system-environment)
  71 +(add-hook 'after-init-hook 'read-system-environment)
68 72
69 73 ;;;_ , Load customization settings
70 74
@@ -1362,9 +1366,29 @@
1362 1366 (use-package compile
1363 1367 :defer t
1364 1368 :config
1365   - (add-hook 'compilation-finish-functions
1366   - (lambda (buf why)
1367   - (display-buffer buf))))
  1369 + (progn
  1370 + (defun cmake-project-filename ()
  1371 + (let ((filename (match-string-no-properties 1)))
  1372 + (save-match-data
  1373 + (with-temp-buffer
  1374 + (insert-file-contents-literally "cmake_install.cmake")
  1375 + (goto-char (point-min))
  1376 + (re-search-forward "Install script for directory: \\(.+\\)")
  1377 + (cons filename (match-string-no-properties 1))))))
  1378 +
  1379 + (push 'cmake compilation-error-regexp-alist)
  1380 +
  1381 + (push '(cmake "^CMake Error at \\(.+?\\):\\([0-9]+\\)"
  1382 + (cmake-project-filename) 2 2 2)
  1383 + compilation-error-regexp-alist-alist)
  1384 +
  1385 + (push '(cmake "^\\(?:CMake Error at \\|  \\)\\(.+?\\):\\([0-9]+\\) ([A-Za-z_][A-Za-z0-9_]*)"
  1386 + (cmake-project-filename) 2)
  1387 + compilation-error-regexp-alist-alist)
  1388 +
  1389 + (add-hook 'compilation-finish-functions
  1390 + (lambda (buf why)
  1391 + (display-buffer buf)))))
1368 1392
1369 1393 ;;;_ , color-moccur
1370 1394
@@ -1706,9 +1730,10 @@ The output appears in the buffer `*Async Shell Command*'."
1706 1730 :type 'netrc
1707 1731 :port 6667))
1708 1732 :secret)))
1709   - (erc-tls :server "irc.oftc.net"
1710   - :port 6697
1711   - :nick "johnw"))
  1733 + ;(erc-tls :server "irc.oftc.net"
  1734 + ; :port 6697
  1735 + ; :nick "johnw")
  1736 + )
1712 1737
1713 1738 (defun im ()
1714 1739 (interactive)
@@ -2971,6 +2996,25 @@ FORM => (eval FORM)."
2971 2996
2972 2997 (add-hook 'ruby-mode-hook 'my-ruby-mode-hook)))
2973 2998
  2999 +;;;_ , sage-mode
  3000 +
  3001 +(use-package sage
  3002 + :load-path "/Applications/Misc/sage/data/emacs/"
  3003 + :init
  3004 + (progn
  3005 + (setq sage-command "/Applications/Misc/sage/sage")
  3006 +
  3007 + ;; If you want sage-view to typeset all your output and have plot()
  3008 + ;; commands inline, uncomment the following line and configure sage-view:
  3009 + (require 'sage-view "sage-view")
  3010 + (add-hook 'sage-startup-before-prompt-hook 'compilation-setup)
  3011 + (add-hook 'sage-startup-after-prompt-hook 'sage-view)
  3012 + ;; You can use commands like
  3013 + ;; (add-hook 'sage-startup-after-prompt-hook 'sage-view-disable-inline-output)
  3014 + (add-hook 'sage-startup-after-prompt-hook 'sage-view-disable-inline-plots)
  3015 + ;; to enable some combination of features
  3016 + ))
  3017 +
2974 3018 ;;;_ , selectkey
2975 3019
2976 3020 (use-package selectkey
6 org-settings.el
@@ -29,6 +29,7 @@
29 29 '(org-agenda-start-with-log-mode t)
30 30 '(org-agenda-tags-column -100)
31 31 '(org-agenda-text-search-extra-files (quote (agenda-archives)))
  32 + '(org-agenda-use-time-grid nil)
32 33 '(org-archive-location "TODO-archive::")
33 34 '(org-archive-save-context-info (quote (time category itags)))
34 35 '(org-attach-method (quote mv))
@@ -57,6 +58,11 @@ SCHEDULED: %t
57 58 '(org-edit-src-content-indentation 0)
58 59 '(org-enforce-todo-dependencies t)
59 60 '(org-export-babel-evaluate nil)
  61 + '(org-export-latex-classes (quote (("article" "\\documentclass[11pt]{article}" ("\\section{%s}" . "\\section*{%s}") ("\\subsection{%s}" . "\\subsection*{%s}") ("\\subsubsection{%s}" . "\\subsubsection*{%s}") ("\\paragraph{%s}" . "\\paragraph*{%s}") ("\\subparagraph{%s}" . "\\subparagraph*{%s}")) ("linalg" "\\documentclass{article}
  62 +\\usepackage{linalgjh}
  63 +[DEFAULT-PACKAGES]
  64 +[EXTRA]
  65 +[PACKAGES]" ("\\section{%s}" . "\\section*{%s}") ("\\subsection{%s}" . "\\subsection*{%s}") ("\\subsubsection{%s}" . "\\subsubsection*{%s}") ("\\paragraph{%s}" . "\\paragraph*{%s}") ("\\subparagraph{%s}" . "\\subparagraph*{%s}")) ("report" "\\documentclass[11pt]{report}" ("\\part{%s}" . "\\part*{%s}") ("\\chapter{%s}" . "\\chapter*{%s}") ("\\section{%s}" . "\\section*{%s}") ("\\subsection{%s}" . "\\subsection*{%s}") ("\\subsubsection{%s}" . "\\subsubsection*{%s}")) ("book" "\\documentclass[11pt]{book}" ("\\part{%s}" . "\\part*{%s}") ("\\chapter{%s}" . "\\chapter*{%s}") ("\\section{%s}" . "\\section*{%s}") ("\\subsection{%s}" . "\\subsection*{%s}") ("\\subsubsection{%s}" . "\\subsubsection*{%s}")) ("beamer" "\\documentclass{beamer}" org-beamer-sectioning))))
60 66 '(org-extend-today-until 8)
61 67 '(org-fast-tag-selection-single-key (quote expert))
62 68 '(org-footnote-section nil)
6 settings.el
@@ -101,8 +101,9 @@
101 101 '(enable-recursive-minibuffers t)
102 102 '(erc-auto-query (quote window-noselect))
103 103 '(erc-autoaway-message "I'm away (after %i seconds of idle-time)")
104   - '(erc-autojoin-channels-alist (quote (("localhost" "&bitlbee") ("freenode.net" "#emacs" "#haskell" "#haskell-in-depth" "#haskell-overflow" "#haskell-blah" "#ledger") ("oftc.net" "#llvm"))))
  104 + '(erc-autojoin-channels-alist (quote (("localhost" "&bitlbee") ("freenode.net" "#emacs" "#haskell" "#haskell-in-depth" "#haskell-overflow" "#haskell-blah" "#ledger" "##categorytheory") ("oftc.net" "#llvm"))))
105 105 '(erc-autojoin-mode t)
  106 + '(erc-fill-function (quote erc-fill-variable))
106 107 '(erc-fill-static-center 12)
107 108 '(erc-fools (quote ("JordiGH")))
108 109 '(erc-generate-log-file-name-function (quote erc-generate-log-file-name-short))
@@ -249,6 +250,9 @@
249 250 '(regex-tool-backend (quote perl))
250 251 '(runner-init-file "~/.emacs.d/runner-conf.el")
251 252 '(safe-local-variable-values (quote ((eval require (quote edg)) (eval ignore-errors (require (quote edg))) (after-save-hook my-byte-recompile-file) (after-save-hook git-commit-changes) (org-refer-by-number-id . "1C72AB51-33C2-4FF8-9367-2B494D125027"))))
  253 + '(sage-view-anti-aliasing-level 4)
  254 + '(sage-view-margin (quote (20 . 20)))
  255 + '(sage-view-scale 2.0)
252 256 '(same-window-buffer-names (quote ("*eshell*" "*shell*" "*mail*" "*inferior-lisp*" "*ielm*" "*scheme*")))
253 257 '(save-abbrevs (quote silently))
254 258 '(save-interprogram-paste-before-kill t)

0 comments on commit ad20b9a

Please sign in to comment.
Something went wrong with that request. Please try again.