From db7558105a800bacfa841d68f8e1d5cf41a9526f Mon Sep 17 00:00:00 2001
From: xeruf <27jf@pm.me>
Date: Tue, 23 Nov 2021 13:02:12 +0100
Subject: [PATCH] config: move notes to box

---
 .config/jrnl/jrnl.yaml | 8 ++++----
 .zprofile              | 7 ++++---
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/.config/jrnl/jrnl.yaml b/.config/jrnl/jrnl.yaml
index cfb7224..9d7c745 100644
--- a/.config/jrnl/jrnl.yaml
+++ b/.config/jrnl/jrnl.yaml
@@ -10,10 +10,10 @@ encrypt: false
 highlight: true
 indent_character: '|'
 journals:
-  default: ~/data/2-standards/notes/journal/jrnl.txt
-  intentions: ~/data/2-standards/notes/journal/intentions.txt
-  intentions-nug: ~/data/2-standards/notes/journal/intentions-nug.txt
-  nug: ~/data/2-standards/notes/journal/nugnug.txt
+  default: ~/data/2-standards/box/journal/jrnl.txt
+  intentions: ~/data/2-standards/box/journal/intentions.txt
+  intentions-nug: ~/data/2-standards/box/journal/intentions-nug.txt
+  nug: ~/data/2-standards/box/journal/nugnug.txt
 linewrap: 99
 tagsymbols: '@'
 template: false
diff --git a/.zprofile b/.zprofile
index eb67215..9fc59ed 100644
--- a/.zprofile
+++ b/.zprofile
@@ -1,12 +1,13 @@
-export DATA="$(test -d $HOME/data && echo $HOME/data || echo $HOME/daten)"
+export DATA="$(test -d $HOME/daten && echo $HOME/daten || echo $HOME/data)"
 export MUSIC="$DATA/music"
-export JOURNAL="$DATA/2-standards/notes/journal"
 
 # xdg
 export XDG_DATA_HOME="$HOME/.local/share"
 export XDG_STATE_HOME="$HOME/.local/state"
 export XDG_CACHE_HOME="$HOME/.local/cache"
 export XDG_CONFIG_HOME="$HOME/.config"
+export JOURNAL="$(eval "dirname $(grep -1 journals $XDG_CONFIG_HOME/jrnl/jrnl.yaml | tail -1 | cut -d':' -f2-)" ||
+	echo "$DATA/2-standards/box/journal")"
 export PATH="$HOME/.local/bin/scripts:$HOME/.local/bin:$PATH:$XDG_CONFIG_HOME/emacs/bin"
  # adjust programs to use xdg
 export MNT="$XDG_RUNTIME_DIR"/mnt
@@ -107,7 +108,7 @@ export CTEST_PROGRESS_OUTPUT=1
 export CTEST_OUTPUT_ON_FAILURE=1
 export CTEST_PARALLEL_LEVEL=3
 
-if test -z "$DISPLAY" && test "$XDG_VTNR" -eq 1 && test -d "$JOURNAL"; then
+if test -z "$DISPLAY" && test "$XDG_VTNR" -eq 1 && test -e "$JOURNAL"; then
   echo "What do you want to do?"
   while test $(echo "$intention" | wc -c) -lt 6
   do read intention