Use org-journal without journal files, make nested yasnippets work properly

master
trémeur 1 year ago
parent 333e8d185a
commit 6a305b0147

@ -649,7 +649,19 @@ Automate a tiny part of something I was previously doing manually.
#+BEGIN_SRC emacs-lisp #+BEGIN_SRC emacs-lisp
(unless (string-equal system-type "android") (unless (string-equal system-type "android")
(unless (string-equal user-login-name "3055822") (if (string-equal user-login-name "3055822")
(progn
(use-package org-journal
:bind
("C-c j" . org-journal-new-entry)
:config
(setq org-journal-dir "~/Documents/drive/org")
(setq org-journal-file-type 'yearly)
(setq org-journal-file-format "journal-dump-%Y.org")
(setq org-journal-find-file 'find-file)
(setq org-journal-date-format "%Y-%m-%d")
(setq org-journal-time-format "%H:%M\n")))
(progn
(defun org-journal-file-header-func (time) (defun org-journal-file-header-func (time)
"Set the header for org-journal files" "Set the header for org-journal files"
(concat "<" (format-time-string "%Y-%m-%d %a") ">\n\n")) (concat "<" (format-time-string "%Y-%m-%d %a") ">\n\n"))
@ -662,7 +674,7 @@ Automate a tiny part of something I was previously doing manually.
(setq org-journal-find-file 'find-file) (setq org-journal-find-file 'find-file)
(setq org-journal-date-format "journal") (setq org-journal-date-format "journal")
(setq org-journal-time-format "%H:%M\n") (setq org-journal-time-format "%H:%M\n")
(setq org-journal-file-header 'org-journal-file-header-func)))) (setq org-journal-file-header 'org-journal-file-header-func)))))
#+END_SRC #+END_SRC
**** =org-modern= **** =org-modern=
@ -895,7 +907,8 @@ Per-mode text expansion. What a lifechanger.
(unless (string-equal system-type "android") (unless (string-equal system-type "android")
(use-package yasnippet (use-package yasnippet
:config :config
(setq yas-snippet-dirs '("~/.emacs.d/snippets"))) (setq yas-snippet-dirs '("~/.emacs.d/snippets"))
(setq yas-triggers-in-field t))
(yas-global-mode 1)) (yas-global-mode 1))
#+END_SRC #+END_SRC

@ -0,0 +1,4 @@
# name: fic-hosted-on-praze
# key: ficpraze
# --
https://tre.praze.net/fic/masterlist#fic$0

@ -1,4 +1,4 @@
# name: fanfiction-link # name: fanfiction-link
# key: ficlink # key: ficlink
# -- # --
@@html:<a href="$1">$2</a>$0&nbsp;<code>$3</code>@@ @@html:<a href="$1">$2</a>$3&nbsp;<code>$4</code>@@$0

@ -1,4 +1,4 @@
# name: fanfiction-link # name: fanfiction-link
# key: ficlink # key: ficlink
# -- # --
<a href="$1">$2</a>$0&nbsp;<code>$3</code> <a href="$1">$2</a>$3&nbsp;<code>$4</code>$0
Loading…
Cancel
Save