hippie expand is hippie-exp

[lib.git] / emacs_el / configuration / don-configuration.org

diff --git a/emacs_el/configuration/don-configuration.org b/emacs_el/configuration/don-configuration.org
index 8ff96f79db1be3dc1836d1edfafbd6eb8367d0ec..3c5cd98efb575200e8633fcc58c217565df42277 100644 (file)
--- a/emacs_el/configuration/don-configuration.org
+++ b/emacs_el/configuration/don-configuration.org
@@ -115,7 +115,7 @@ load  [[https://github.com/jwiegley/use-package/][use-package]] even faster
 * Modules
 ** Hippie Expand
 #+BEGIN_SRC emacs-lisp
-  (use-package hippie-expand
+  (use-package hippie-exp
     :bind* (("M-<SPC>" . hippie-expand))
     )
 #+END_SRC
@@ -1057,7 +1057,7 @@ From http://julien.danjou.info/projects/emacs-packages#rainbow-mode, this colori
 #+BEGIN_SRC emacs-lisp
   (use-package password-store
     :ensure f
-    :commands password-store-edit password-store-create
+    :commands password-store-edit password-store-generate
     )
 #+END_SRC
 ** CSS mode
@@ -1162,15 +1162,13 @@ From http://julien.danjou.info/projects/emacs-packages#rainbow-mode, this colori
 
   (use-package org
     :delight (org-mode "ø")
-    :config 
-
+    :mode ("\\.\\(org\\|org_archive\\|txt\\)\\'" . org-mode)
+    :bind (("C-c l"  . org-store-link)
+           ("C-c a"  . org-agenda)
+           ("C-c b"  . org-iswitchb))
 #+END_SRC
 ** Agenda Configuration
 #+BEGIN_SRC emacs-lisp
-  :mode ("\\.\\(org\\|org_archive\\|txt\\)\\'" . org-mode)
-  :bind (("C-c l"  . org-store-link)
-         ("C-c a"  . org-agenda)
-         ("C-c b"  . org-iswitchb))
   :config
   (setq-default org-log-done 'time)
   (setq-default org-agenda-ndays 5)
@@ -1303,35 +1301,37 @@ From http://julien.danjou.info/projects/emacs-packages#rainbow-mode, this colori
 #+END_SRC
 ** Capture Templates
 #+BEGIN_SRC emacs-lisp
-  (setq org-capture-templates  ;; mail-specific note template, identified by "m"
-        '(("m" "Mail" entry (file "~/projects/org-notes/refile.org")
-           "* %?\n\n  Source: %u, [[%:link][%:description]]\n  %:initial")
-          ("t" "todo" entry (file "~/projects/org-notes/refile.org")
-           "* TODO %?\n  :PROPERTIES:\n  :END:\n  :LOGBOOK:\n  :END:\n%U\n%a\n" :clock-in t :clock-resume t)
-          ("r" "respond" entry (file "~/projects/org-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/org-notes/refile.org")
-           "* %? :NOTE:\n%U\n%a\n" :clock-in t :clock-resume t)
-          ("s" "schedule" entry (file "~/projects/org-notes/refile.org")
-           "* %? :cal:\n%^{scheduled:}t\n%U\n%a\n" :clock-in t :clock-resume t)
-          ("j" "Journal" entry (file+datetree "~/projects/org-notes/diary.org")
-           "* %?\n%U\n" :clock-in t :clock-resume t)
-          ("w" "org-protocol" entry (file "~/projects/org-notes/refile.org")
-           "* TODO Review %c\n%U\n" :immediate-finish t)
-          ("M" "Meeting" entry (file "~/projects/org-notes/refile.org")
-           "* MEETING with %? :MEETING:\n%U" :clock-in t :clock-resume t)
-          ("S" "Seminar" entry (file "~/projects/org-notes/refile.org")
-           "* SEMINAR notes %? :SEMINAR:\n%U" :clock-in t :clock-resume t)
-          ("P" "Paper to read" entry (file+headline "~/projects/research/papers_to_read.org" "Refile")
-           "* TODO Get/Read %? \n%U" :clock-in t :clock-resume t)
-          ("p" "Phone call" entry (file "~/projects/org-notes/refile.org")
-           "* PHONE %? :PHONE:\n%U" :clock-in t :clock-resume t)
-          ("J" "job" entry (file "~/projects/org-notes/refile.org")
-           "* TODO Apply for %a%? :job:\nSCHEDULED: %(format-time-string \"<%Y-%m-%d 17:00-17:30>\")\n%U\n%a\n" :clock-in t :clock-resume t)
-          ("h" "Habit" entry (file "~/projects/org-notes/refile.org")
-           "* NEXT %?\n%U\n%a\nSCHEDULED: %(format-time-string \"<%Y-%m-%d .+1d/3d>\")\n:PROPERTIES:\n:STYLE: habit\n:REPEAT_TO_STATE: NEXT\n:END:\n%a\n")
+    (setq org-capture-templates  ;; mail-specific note template, identified by "m"
+          `(("m" "Mail" entry (file "~/projects/org-notes/refile.org")
+             "* %?\n\n  Source: %u, [[%:link][%:description]]\n  %:initial")
+            ("t" "todo" entry (file "~/projects/org-notes/refile.org")
+             "* TODO %?\n  :PROPERTIES:\n  :END:\n  :LOGBOOK:\n  :END:\n%U\n%a\n" :clock-in t :clock-resume t)
+            ("r" "respond" entry (file "~/projects/org-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/org-notes/refile.org")
+             "* %? :NOTE:\n%U\n%a\n" :clock-in t :clock-resume t)
+            ("s" "schedule" entry (file "~/projects/org-notes/refile.org")
+             "* %? :cal:\n%^{scheduled:}t\n%U\n%a\n" :clock-in t :clock-resume t)
+            ("j" "Journal" entry (file+datetree "~/projects/org-notes/diary.org")
+             "* %?\n%U\n" :clock-in t :clock-resume t)
+            ("w" "org-protocol" entry (file "~/projects/org-notes/refile.org")
+             "* TODO Review %c\n%U\n" :immediate-finish t)
+            ("M" "Meeting" entry (file "~/projects/org-notes/refile.org")
+             "* MEETING with %? :MEETING:\n%U" :clock-in t :clock-resume t)
+            ("S" "Seminar" entry (file "~/projects/org-notes/refile.org")
+             "* SEMINAR notes %? :SEMINAR:\n%U" :clock-in t :clock-resume t)
+            ("P" "Paper to read" entry (file+headline "~/projects/research/papers_to_read.org" "Refile")
+             "* TODO Get/Read %? \n%U" :clock-in t :clock-resume t)
+            ("p" "Phone call" entry (file "~/projects/org-notes/refile.org")
+             "* PHONE %? :PHONE:\n%U" :clock-in t :clock-resume t)
+             ("J" "job" entry (file+olp "~/projects/org-notes/notes.org"
+                                         "Jobs"
+                                         ,(format-time-string "Positions %Y"))
+             "* TODO Apply for %? :job:\nSCHEDULED: <%<%Y-%m-%d>>\n%U\n%x\n" :clock-in t :clock-resume t)
+            ("h" "Habit" entry (file "~/projects/org-notes/refile.org")
+             "* NEXT %?\n%U\n%a\nSCHEDULED: %(format-time-string \"<%Y-%m-%d .+1d/3d>\")\n:PROPERTIES:\n:STYLE: habit\n:REPEAT_TO_STATE: NEXT\n:END:\n%a\n")
+            )
           )
-        )
 
   ;; Remove empty LOGBOOK drawers on clock out
   (defun bh/remove-empty-drawer-on-clock-out ()