Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Various updates

  • Loading branch information...
commit ad20b9a0327912fcc468af42f60036da3870bdd2 1 parent 6ed22d5
John Wiegley authored
Showing with 76 additions and 21 deletions.
  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
View
@@ -755,6 +755,7 @@ Summary: %s" product component version priority severity heading) ?\n ?\n)
(define-key org-todo-state-map [,(upcase key)]
',org-agenda-sym-no-logging)))))
+(bind-key "C-c x e" 'org-export)
(bind-key "C-c x l" 'org-insert-dtp-link)
(bind-key "C-c x L" 'org-set-dtp-link)
(bind-key "C-c x m" 'org-insert-message-link)
84 init.el
View
@@ -51,20 +51,24 @@
(cleanup-term-log)))))
;;;_ , Read system environment
-
-(let ((plist (expand-file-name "~/.MacOSX/environment.plist")))
- (when (file-readable-p plist)
- (let ((dict (cdr (assq 'dict (cdar (xml-parse-file plist))))))
- (while dict
- (if (and (listp (car dict))
- (eq 'key (caar dict)))
- (setenv (car (cddr (car dict)))
- (car (cddr (car (cddr dict))))))
- (setq dict (cdr dict))))
-
- ;; Configure exec-path based on the new PATH
- (setq exec-path nil)
- (mapc (apply-partially #'add-to-list 'exec-path)
+
+(defun read-system-environment ()
+ (let ((plist (expand-file-name "~/.MacOSX/environment.plist")))
+ (when (file-readable-p plist)
+ (let ((dict (cdr (assq 'dict (cdar (xml-parse-file plist))))))
+ (while dict
+ (if (and (listp (car dict))
+ (eq 'key (caar dict)))
+ (setenv (car (cddr (car dict)))
+ (car (cddr (car (cddr dict))))))
+ (setq dict (cdr dict))))
+
+ ;; Configure exec-path based on the new PATH
+ (setq exec-path nil)
+ (mapc (apply-partially #'add-to-list 'exec-path)
+ (nreverse (split-string (getenv "PATH") ":"))))))
+
+(read-system-environment)
(add-hook 'after-init-hook 'read-system-environment)
;;;_ , Load customization settings
@@ -1362,9 +1366,29 @@
(use-package compile
:defer t
- :config
- (add-hook 'compilation-finish-functions
- (lambda (buf why)
+ :config
+ (progn
+ (defun cmake-project-filename ()
+ (let ((filename (match-string-no-properties 1)))
+ (save-match-data
+ (with-temp-buffer
+ (insert-file-contents-literally "cmake_install.cmake")
+ (goto-char (point-min))
+ (re-search-forward "Install script for directory: \\(.+\\)")
+ (cons filename (match-string-no-properties 1))))))
+
+ (push 'cmake compilation-error-regexp-alist)
+
+ (push '(cmake "^CMake Error at \\(.+?\\):\\([0-9]+\\)"
+ (cmake-project-filename) 2 2 2)
+ compilation-error-regexp-alist-alist)
+
+ (push '(cmake "^\\(?:CMake Error at \\|  \\)\\(.+?\\):\\([0-9]+\\) ([A-Za-z_][A-Za-z0-9_]*)"
+ (cmake-project-filename) 2)
+ compilation-error-regexp-alist-alist)
+
+ (add-hook 'compilation-finish-functions
+ (lambda (buf why)
(display-buffer buf)))))
;;;_ , color-moccur
@@ -1706,9 +1730,10 @@ The output appears in the buffer `*Async Shell Command*'."
:user "johnw"
:type 'netrc
:port 6667))
- :secret)))
- (erc-tls :server "irc.oftc.net"
- :port 6697
+ :secret)))
+ ;(erc-tls :server "irc.oftc.net"
+ ; :port 6697
+ ; :nick "johnw")
)
(defun im ()
@@ -2971,6 +2996,25 @@ FORM => (eval FORM)."
(bind-key "<tab>" 'yas/expand-from-trigger-key ruby-mode-map))
(add-hook 'ruby-mode-hook 'my-ruby-mode-hook)))
+
+;;;_ , sage-mode
+
+(use-package sage
+ :load-path "/Applications/Misc/sage/data/emacs/"
+ :init
+ (progn
+ (setq sage-command "/Applications/Misc/sage/sage")
+
+ ;; If you want sage-view to typeset all your output and have plot()
+ ;; commands inline, uncomment the following line and configure sage-view:
+ (require 'sage-view "sage-view")
+ (add-hook 'sage-startup-before-prompt-hook 'compilation-setup)
+ (add-hook 'sage-startup-after-prompt-hook 'sage-view)
+ ;; You can use commands like
+ ;; (add-hook 'sage-startup-after-prompt-hook 'sage-view-disable-inline-output)
+ (add-hook 'sage-startup-after-prompt-hook 'sage-view-disable-inline-plots)
+ ;; to enable some combination of features
+ ))
;;;_ , selectkey
6 org-settings.el
View
@@ -29,6 +29,7 @@
'(org-agenda-start-with-log-mode t)
'(org-agenda-tags-column -100)
'(org-agenda-text-search-extra-files (quote (agenda-archives)))
+ '(org-agenda-use-time-grid nil)
'(org-archive-location "TODO-archive::")
'(org-archive-save-context-info (quote (time category itags)))
'(org-attach-method (quote mv))
@@ -57,6 +58,11 @@ SCHEDULED: %t
'(org-edit-src-content-indentation 0)
'(org-enforce-todo-dependencies t)
'(org-export-babel-evaluate nil)
+ '(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}
+\\usepackage{linalgjh}
+[DEFAULT-PACKAGES]
+[EXTRA]
+[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))))
'(org-extend-today-until 8)
'(org-fast-tag-selection-single-key (quote expert))
'(org-footnote-section nil)
6 settings.el
View
@@ -101,8 +101,9 @@
'(enable-recursive-minibuffers t)
'(erc-auto-query (quote window-noselect))
'(erc-autoaway-message "I'm away (after %i seconds of idle-time)")
- '(erc-autojoin-channels-alist (quote (("localhost" "&bitlbee") ("freenode.net" "#emacs" "#haskell" "#haskell-in-depth" "#haskell-overflow" "#haskell-blah" "#ledger") ("oftc.net" "#llvm"))))
+ '(erc-autojoin-channels-alist (quote (("localhost" "&bitlbee") ("freenode.net" "#emacs" "#haskell" "#haskell-in-depth" "#haskell-overflow" "#haskell-blah" "#ledger" "##categorytheory") ("oftc.net" "#llvm"))))
'(erc-autojoin-mode t)
+ '(erc-fill-function (quote erc-fill-variable))
'(erc-fill-static-center 12)
'(erc-fools (quote ("JordiGH")))
'(erc-generate-log-file-name-function (quote erc-generate-log-file-name-short))
@@ -249,6 +250,9 @@
'(regex-tool-backend (quote perl))
'(runner-init-file "~/.emacs.d/runner-conf.el")
'(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"))))
+ '(sage-view-anti-aliasing-level 4)
+ '(sage-view-margin (quote (20 . 20)))
+ '(sage-view-scale 2.0)
'(same-window-buffer-names (quote ("*eshell*" "*shell*" "*mail*" "*inferior-lisp*" "*ielm*" "*scheme*")))
'(save-abbrevs (quote silently))
'(save-interprogram-paste-before-kill t)
Please sign in to comment.
Something went wrong with that request. Please try again.