Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/riffm/dotfiles
Browse files Browse the repository at this point in the history
  • Loading branch information
@riffm
riffm committed Aug 5, 2014
2 parents 8e3656b + 37e289e commit 5e86eaf
Show file tree
Hide file tree
Showing 17 changed files with 7,618 additions and 28 deletions.
2 changes: 2 additions & 0 deletions .emacs.d/.org-id-locations
View file
@@ -0,0 +1,2 @@

(("~/org/tasks.org_archive" "DB7172EE-9AE5-4A89-BF61-91DE35D7FD03") ("~/org/tasks.org_archive" "CAC39796-6CE6-4BC7-8133-4457B9977B3B") ("~/org/tasks.org_archive" "B8C15BE1-25C9-4073-8AA1-F9893F6A45D3") ("~/org/tasks.org_archive" "E4A5067E-A371-4BED-882B-9233A5944966") ("~/org/tasks.org_archive" "1FD20590-5632-4020-B2AD-EAB0DBC83B1B") ("~/org/tasks.org_archive" "F79AE4AB-C63C-4B2D-AD02-12EC777FE9F3") ("~/org/tasks.org_archive" "D78F0FCD-F3BC-438E-962C-D502C7E55173") ("~/org/tasks.org_archive" "703D7953-78E4-4BCF-8BED-532085F5FAF7") ("~/org/tasks.org_archive" "70379C13-07D4-4B96-95A2-FE4BFACE6B46") ("~/org/tasks.org_archive" "0D572298-CE8D-499F-9CD9-61E1AC6001B5") ("~/org/tasks.org_archive" "A51BA2B7-D6AF-4F44-A5B5-0C7A49FAD608") ("~/org/tasks.org_archive" "6BA939E4-72FA-410C-BDA6-C6F885656992") ("~/org/tasks.org_archive" "3098B23F-D05E-4A0F-B900-EC4808A0402E") ("~/org/tasks.org_archive" "3FD2155C-9E72-4C21-9E83-3926122C5D43") ("~/org/tasks.org_archive" "E2FE0C33-4C6B-4085-BD68-F1CAF673CDE3") ("~/org/tasks.org_archive" "DFC867DF-C90C-470C-B9EE-4967E0048828") ("~/org/tasks.org_archive" "3F24ACAC-F814-416F-83E8-7E2622782BCD") ("~/org/tasks.org_archive" "4026BA85-1813-4536-B307-56349AABEE64") ("~/org/tasks.org_archive" "88CBBDBD-4E1A-4E0C-93D1-0D1638836C42") ("~/org/tasks.org_archive" "AC8AA5C8-D632-4C22-8FB7-41A5AF17ADE9") ("~/org/tasks.org_archive" "C2973CC6-D685-445A-B521-BDBC3369E10B") ("~/org/tasks.org_archive" "91F40397-6388-4C6E-ACA1-DE029E23A623") ("~/org/tasks.org_archive" "8EDF8CE9-6356-4856-B02F-4883BF1013C2") ("~/org/tasks.org_archive" "4CEE53B7-DF72-44A3-8D4F-16D5E146E414") ("~/org/tasks.org_archive" "A70F816D-DD72-42EC-BE78-599FAEE39AD8") ("~/org/tasks.org_archive" "0062C84E-764F-4AE7-B890-1B2D8ED7F7DE") ("~/org/tasks.org_archive" "E1BBFADD-1B15-4918-88F4-C170DEAB81DD") ("~/org/tasks.org" "F09B3865-062C-46F8-AC44-A475077A1BB9") ("~/Dropbox/tasks.org" "767F6C49-1E48-4428-9A6A-7A425CC34324") ("~/Dropbox/tasks.org" "9E620F43-193F-46C6-A6B2-50C9E12C03EE") ("~/Dropbox/tasks.org" "E83D8BDC-971D-40F7-8FDD-05724983E871") ("~/Dropbox/tasks.org" "65DE5564-2164-494E-8EE2-91639A07004D") ("~/Dropbox/tasks.org" "D8D6FBB2-B4FD-4A70-B158-283CCEB55F64") ("~/Dropbox/tasks.org" "33B93044-6BA5-41AD-9DBB-E84E45470402") ("~/Dropbox/tasks.org" "C5DC551D-11B1-459F-8F6D-B6277CC356FB") ("~/Dropbox/tasks.org" "945351AC-9B93-4FD1-B898-83C95AE8951F") ("~/Dropbox/tasks.org" "E46592C6-25C1-4910-A901-33D3BB329E09") ("~/Dropbox/tasks.org" "7BF98991-D31B-4ECE-BF77-9D258F42D23F") ("~/Dropbox/tasks.org" "060499A3-FFE0-4696-8D4F-22D4626096FC") ("~/Dropbox/tasks.org" "CE9A388C-B156-4B73-A4D1-1A3965ABBCF6") ("~/Dropbox/tasks.org" "1DC28CC3-B386-429D-95BD-3478E907B325") ("~/Dropbox/tasks.org" "3BE22181-12C7-4AFE-911B-28AC1F40631F") ("~/Dropbox/tasks.org" "91767689-5EA6-4D36-99F7-128A2BFB6EFE") ("~/Dropbox/tasks.org" "9CE9CBB4-536D-4299-B2CA-1E9F0386E8BC") ("~/Dropbox/tasks.org" "DC27FFA5-EE1D-4AED-A3EF-65064FB96372") ("~/Dropbox/tasks.org" "253DBE8A-531D-44EA-BFCE-1D6A9FB249F4"))
55 changes: 49 additions & 6 deletions .emacs.d/config.el
View file
Expand Up @@ -223,27 +223,70 @@

(setq org-log-done 'time)
(define-key mode-specific-map [?a] 'org-agenda)

(custom-set-variables
'(org-agenda-files (quote ("~/Dropbox/tasks.org")))
'(org-default-notes-file "~/Dropbox/notes.org")
'(org-directory "~/org")
'(org-agenda-files (quote ("~/org/tasks.org"
"~/org/tasks.org_archive")))
'(org-default-notes-file "~/org/notes.org")
'(org-agenda-show-all-dates t)
'(org-agenda-start-on-weekday nil)
'(org-deadline-warning-days 2)
'(org-deadline-warning-days 14)
'(org-agenda-show-all-dates t)
'(org-agenda-custom-commands
(quote (("d" todo "DELEGATED" nil)
("c" todo "DONE|DEFERRED|CANCELLED" nil)
("w" todo "WAITING" nil)
("W" agenda "" ((org-agenda-ndays 21)))
("A" agenda ""
((org-agenda-skip-function
(lambda nil
(org-agenda-skip-entry-if (quote notregexp) "\\=.*\\[#A\\]")))
(org-agenda-ndays 1)
(org-agenda-overriding-header "Today's Priority #A tasks: ")))
("u" alltodo ""
((org-agenda-skip-function
(lambda nil
(org-agenda-skip-entry-if (quote scheduled) (quote deadline)
(quote regexp) "\n]+>")))
(org-agenda-overriding-header "Unscheduled TODO entries: "))))))
'(org-agenda-skip-deadline-if-done t)
'(org-agenda-skip-scheduled-if-done t))
'(org-agenda-skip-scheduled-if-done t))

(custom-set-variables
'(org-todo-keywords
'((sequence "TODO(t)" "STARTED(s!)" "WAITING(w@)" "DELEGATED(l@)"
"|" "DONE(d!)" "DEFERRED(f@)" "CANCELLED(x@)"))))

(org-babel-do-load-languages
'org-babel-load-languages
'((emacs-lisp . t)
(plantuml . t)))

(custom-set-variables
'(org-plantuml-jar-path "~/Dropbox/bin/plantuml.jar")
'(org-confirm-babel-evaluate nil))

(add-to-list 'org-src-lang-modes (quote ("plantuml" . fundamental)))

;(custom-set-variables
; '(org-refile-targets
; (quote ((nil :maxlevel . 3)
; (org-agenda-files :maxlevel . 3)
; (org-default-notes-file :maxlevel . 3))))
; '(org-refile-use-outline-path 'file)
; '(org-refile-allow-creating-parent-nodes 'confirm))

(custom-set-variables
'(org-mobile-inbox-for-pull "~/org/from-mobile.org")
'(org-mobile-directory "~/Dropbox/Apps/MobileOrg"))

(add-hook 'remember-mode-hook 'org-remember-apply-template)
(define-key global-map [(control ?x) ( meta ?r)] 'remember)
(custom-set-variables
'(org-remember-store-without-prompt t)
'(org-remember-templates
(quote ((116 "* TODO %?\n %u" "~/Dropbox/tasks.org" "Tasks")
(110 "* %u %?" "~/Dropbox/notes.org" "Notes"))))
(quote ((116 "* TODO %?\n %u" "~/org/tasks.org" "Tasks")
(110 "* %u %?" "~/org/notes.org" "Notes"))))
'(remember-annotation-functions (quote (org-remember-annotation)))
'(remember-handler-functions (quote (org-remember-handler))))
Binary file modified .emacs.d/config.elc
View file
Binary file not shown.
61 changes: 55 additions & 6 deletions .emacs.d/config.org
View file
Expand Up @@ -317,15 +317,35 @@
#+BEGIN_SRC emacs-lisp
(setq org-log-done 'time)
(define-key mode-specific-map [?a] 'org-agenda)

(custom-set-variables
'(org-agenda-files (quote ("~/Dropbox/tasks.org")))
'(org-default-notes-file "~/Dropbox/notes.org")
'(org-directory "~/org")
'(org-agenda-files (quote ("~/org/tasks.org"
"~/org/tasks.org_archive")))
'(org-default-notes-file "~/org/notes.org")
'(org-agenda-show-all-dates t)
'(org-agenda-start-on-weekday nil)
'(org-deadline-warning-days 2)
'(org-deadline-warning-days 14)
'(org-agenda-show-all-dates t)
'(org-agenda-custom-commands
(quote (("d" todo "DELEGATED" nil)
("c" todo "DONE|DEFERRED|CANCELLED" nil)
("w" todo "WAITING" nil)
("W" agenda "" ((org-agenda-ndays 21)))
("A" agenda ""
((org-agenda-skip-function
(lambda nil
(org-agenda-skip-entry-if (quote notregexp) "\\=.*\\[#A\\]")))
(org-agenda-ndays 1)
(org-agenda-overriding-header "Today's Priority #A tasks: ")))
("u" alltodo ""
((org-agenda-skip-function
(lambda nil
(org-agenda-skip-entry-if (quote scheduled) (quote deadline)
(quote regexp) "\n]+>")))
(org-agenda-overriding-header "Unscheduled TODO entries: "))))))
'(org-agenda-skip-deadline-if-done t)
'(org-agenda-skip-scheduled-if-done t))
'(org-agenda-skip-scheduled-if-done t))
#+END_SRC
Custom task statuses and switches
#+BEGIN_SRC emacs-lisp
Expand All @@ -335,7 +355,36 @@
"|" "DONE(d!)" "DEFERRED(f@)" "CANCELLED(x@)"))))

#+END_SRC
Babel config
#+BEGIN_SRC emacs-lisp
(org-babel-do-load-languages
'org-babel-load-languages
'((emacs-lisp . t)
(plantuml . t)))

(custom-set-variables
'(org-plantuml-jar-path "~/Dropbox/bin/plantuml.jar")
'(org-confirm-babel-evaluate nil))

(add-to-list 'org-src-lang-modes (quote ("plantuml" . fundamental)))
#+END_SRC
Refile config
#+BEGIN_SRC emacs-lisp
;(custom-set-variables
; '(org-refile-targets
; (quote ((nil :maxlevel . 3)
; (org-agenda-files :maxlevel . 3)
; (org-default-notes-file :maxlevel . 3))))
; '(org-refile-use-outline-path 'file)
; '(org-refile-allow-creating-parent-nodes 'confirm))
#+END_SRC

** MobileOrg
#+BEGIN_SRC emacs-lisp
(custom-set-variables
'(org-mobile-inbox-for-pull "~/org/from-mobile.org")
'(org-mobile-directory "~/Dropbox/Apps/MobileOrg"))
#+END_SRC
** remember
Using global shortcut
#+BEGIN_SRC emacs-lisp
Expand All @@ -344,8 +393,8 @@
(custom-set-variables
'(org-remember-store-without-prompt t)
'(org-remember-templates
(quote ((116 "* TODO %?\n %u" "~/Dropbox/tasks.org" "Tasks")
(110 "* %u %?" "~/Dropbox/notes.org" "Notes"))))
(quote ((116 "* TODO %?\n %u" "~/org/tasks.org" "Tasks")
(110 "* %u %?" "~/org/notes.org" "Notes"))))
'(remember-annotation-functions (quote (org-remember-annotation)))
'(remember-handler-functions (quote (org-remember-handler))))
#+END_SRC
93 changes: 93 additions & 0 deletions .emacs.d/elpa/gnuplot-20130206.1701/gnuplot-autoloads.el
View file
@@ -0,0 +1,93 @@
;;; gnuplot-autoloads.el --- automatically extracted autoloads
;;
;;; Code:


;;;### (autoloads (gnuplot-make-buffer gnuplot-mode) "gnuplot" "gnuplot.el"
;;;;;; (21467 40717 0 0))
;;; Generated autoloads from gnuplot.el

(autoload 'gnuplot-mode "gnuplot" "\
Major mode for editing and executing GNUPLOT scripts.
This was written with version 4.6 of gnuplot in mind, but should
work with newer and older versions.
Report bugs in `gnuplot-mode' using \\[gnuplot-bug-report].
------O------
Gnuplot-mode includes two different systems for keyword
completion and documentation lookup: a newer one,
`gnuplot-context-sensitive-mode' (enabled by default), and a
older one which extracts keywords from gnuplot's Info file. Both
systems allow looking up documentation in the Info file. The
older system also depends having the info file properly installed
to make a list of keywords.
The info file should be installed by default with the Gnuplot
distribution, or is available at the `gnuplot-mode' web page:
http://github.com/bruceravel/gnuplot-mode/
With the new context-sensitive mode active, gnuplot-mode can also
provide `eldoc-mode' syntax hints as you type. This requires a
separate file of strings, `gnuplot-eldoc.el', which is also
provided by recent Gnuplot distributions.
------O------
There are several known shortcomings of `gnuplot-mode', version 0.5g
and up. Many of the shortcomings involve the graphical interface
\(refered to as the GUI) to setting arguments to plot options. Here is
a list:
1. Currently there is no way for `gnuplot-mode' to know if information
sent to gnuplot was correctly plotted.
2. \"plot\", \"splot\", and \"fit\" are handled in the GUI, but are
a bit flaky. Their arguments may not be read correctly from
existing text, and continuation lines (common for plot and splot)
are not supported.
3. The GUI does not know how to read from continuation lines.
4. Comma separated position arguments to plot options are
unsupported in the GUI. Colon separated datafile modifiers (used
for plot, splot, and fit) are not supported either. Arguments
not yet supported by the GUI generate messages printed in grey
text.
5. The GUI handling of \"hidden3d\" is flaky and \"cntrparam\" is
unsupported.
------O------
Key bindings:
\\{gnuplot-mode-map}
\(fn)" t nil)

(autoload 'gnuplot-make-buffer "gnuplot" "\
Open a new buffer in `gnuplot-mode'.
When invoked, it switches to a new, empty buffer visiting no file
and then starts `gnuplot-mode'.
It is convenient to bind this function to a global key sequence. For
example, to make the F10 key open a gnuplot script buffer, put the
following in your .emacs file:
(autoload 'gnuplot-make-buffer \"gnuplot\"
\"open a buffer in gnuplot mode\" t)
(global-set-key [(f10)] 'gnuplot-make-buffer)
\(fn)" t nil)

;;;***

;;;### (autoloads nil nil ("gnuplot-context.el" "gnuplot-gui.el"
;;;;;; "gnuplot-pkg.el") (21467 40717 64587 0))

;;;***

(provide 'gnuplot-autoloads)
;; Local Variables:
;; version-control: never
;; no-byte-compile: t
;; no-update-autoloads: t
;; coding: utf-8
;; End:
;;; gnuplot-autoloads.el ends here

0 comments on commit 5e86eaf

Please sign in to comment.