diff --git a/config.org b/config.org
index 6dc3418..01b32f5 100644
--- a/config.org
+++ b/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
diff --git a/snippets/fundamental-mode/ficpraze b/snippets/fundamental-mode/ficpraze
new file mode 100644
index 0000000..8db4c22
--- /dev/null
+++ b/snippets/fundamental-mode/ficpraze
@@ -0,0 +1,4 @@
+# name: fic-hosted-on-praze
+# key: ficpraze
+# --
+https://tre.praze.net/fic/masterlist#fic$0
\ No newline at end of file
diff --git a/snippets/org-mode/ficlink b/snippets/org-mode/ficlink
index 3fa7778..45b453a 100644
--- a/snippets/org-mode/ficlink
+++ b/snippets/org-mode/ficlink
@@ -1,4 +1,4 @@
# name: fanfiction-link
# key: ficlink
# --
-@@html:$2$0 $3
@@
\ No newline at end of file
+@@html:$2$3 $4
@@$0
\ No newline at end of file
diff --git a/snippets/web-mode/ficlink b/snippets/web-mode/ficlink
index 78f50b3..c86883a 100644
--- a/snippets/web-mode/ficlink
+++ b/snippets/web-mode/ficlink
@@ -1,4 +1,4 @@
# name: fanfiction-link
# key: ficlink
# --
-$2$0 $3
\ No newline at end of file
+$2$3 $4
$0
\ No newline at end of file