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

config.org

@@ -649,20 +649,32 @@ Automate a tiny part of something I was previously doing manually.
 
 #+BEGIN_SRC emacs-lisp
   (unless (string-equal system-type "android")
-    (unless (string-equal user-login-name "3055822")
-      (defun org-journal-file-header-func (time)
-        "Set the header for org-journal files"
-        (concat "<" (format-time-string "%Y-%m-%d %a") ">\n\n"))
-      (use-package org-journal
-        :bind
-        ("C-c j" . org-journal-new-entry)
-        :config
-        (setq org-journal-dir "~/Documents/drive/org/journal")
-        (setq org-journal-file-format "%Y/%m/%Y-%m-%d.org")
-        (setq org-journal-find-file 'find-file)
-        (setq org-journal-date-format "journal")
-        (setq org-journal-time-format "%H:%M\n")
-        (setq org-journal-file-header 'org-journal-file-header-func))))
+    (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)
+          "Set the header for org-journal files"
+          (concat "<" (format-time-string "%Y-%m-%d %a") ">\n\n"))
+        (use-package org-journal
+          :bind
+          ("C-c j" . org-journal-new-entry)
+          :config
+          (setq org-journal-dir "~/Documents/drive/org/journal")
+          (setq org-journal-file-format "%Y/%m/%Y-%m-%d.org")
+          (setq org-journal-find-file 'find-file)
+          (setq org-journal-date-format "journal")
+          (setq org-journal-time-format "%H:%M\n")
+          (setq org-journal-file-header 'org-journal-file-header-func)))))
 #+END_SRC
 
 **** =org-modern=
@@ -892,11 +904,12 @@ This is good for auto indentation, folding, killing elements, apparently XPath??
 Per-mode text expansion. What a lifechanger.
 
 #+BEGIN_SRC emacs-lisp
-  (unless (string-equal system-type "android")
-    (use-package yasnippet
-      :config
-      (setq yas-snippet-dirs '("~/.emacs.d/snippets")))
-    (yas-global-mode 1))
+    (unless (string-equal system-type "android")
+      (use-package yasnippet
+        :config
+        (setq yas-snippet-dirs '("~/.emacs.d/snippets"))
+        (setq yas-triggers-in-field t))
+      (yas-global-mode 1))
 #+END_SRC
 
 * Aesthetics

snippets/fundamental-mode/ficpraze

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

snippets/org-mode/ficlink

@@ -1,4 +1,4 @@
 # name: fanfiction-link
 # 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

snippets/web-mode/ficlink

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