From f5edfd09cd40319b04f1011e766f86befb68b06b Mon Sep 17 00:00:00 2001
From: Alexander Hess <alexander@webartifex.biz>
Date: Wed, 17 Jan 2024 02:46:05 +0100
Subject: [PATCH] Use more traditional user folder names

---
 .config/Nextcloud/nextcloud.cfg |  2 +-
 .config/mackup/mackup.cfg       |  4 ++--
 .config/shell/utils.d/update.sh |  4 ++--
 .config/user-dirs.dirs          | 25 +++++++++++++++----------
 4 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/.config/Nextcloud/nextcloud.cfg b/.config/Nextcloud/nextcloud.cfg
index da61248..6f515cb 100644
--- a/.config/Nextcloud/nextcloud.cfg
+++ b/.config/Nextcloud/nextcloud.cfg
@@ -13,7 +13,7 @@ useNewBigFolderSizeLimit=false
 
 [Accounts]
 0\Folders\1\ignoreHiddenFiles=false
-0\Folders\1\localPath=/home/alexander/data/
+0\Folders\1\localPath=/home/alexander/Documents/
 0\Folders\1\paused=false
 0\Folders\1\targetPath=/
 0\Folders\1\version=2
diff --git a/.config/mackup/mackup.cfg b/.config/mackup/mackup.cfg
index 0f6a6e7..bcd0dcb 100644
--- a/.config/mackup/mackup.cfg
+++ b/.config/mackup/mackup.cfg
@@ -1,7 +1,7 @@
 [storage]
 engine = file_system
-path = /home/alexander/data/getraenkemarkt
-directory = mackup
+path = /home/alexander/Documents/Getraenkemarkt
+directory = Mackup
 
 [applications_to_ignore]
 # Do not sync configuration files managed by
diff --git a/.config/shell/utils.d/update.sh b/.config/shell/utils.d/update.sh
index cae7bae..a0f6bc4 100644
--- a/.config/shell/utils.d/update.sh
+++ b/.config/shell/utils.d/update.sh
@@ -179,8 +179,8 @@ _fix_locations() {
 run-private-scripts() {  # in the Nextcloud
     sudo --validate || return
 
-    if [ -d "$HOME/data/getraenkemarkt/shell" ]; then
-        for file in $HOME/data/getraenkemarkt/shell/*.sh; do
+    if [ -d "$HOME/Documents/Getraenkemarkt/Shell" ]; then
+        for file in $HOME/Documents/Getraenkemarkt/Shell/*.sh; do
             source $file
         done
     fi
diff --git a/.config/user-dirs.dirs b/.config/user-dirs.dirs
index b0a0849..ff5f7e0 100644
--- a/.config/user-dirs.dirs
+++ b/.config/user-dirs.dirs
@@ -1,10 +1,15 @@
-# Configure the XDG user directories to integrate Nextcloud
-
-XDG_DESKTOP_DIR="$HOME/desktop"
-XDG_DOCUMENTS_DIR="$HOME/data"
-XDG_DOWNLOAD_DIR="$HOME/downloads"
-XDG_MUSIC_DIR="$HOME/data"
-XDG_PICTURES_DIR="$HOME/data/photos"
-XDG_PUBLICSHARE_DIR="$HOME/data/shares/public"
-XDG_TEMPLATES_DIR="$HOME/data/templates"
-XDG_VIDEOS_DIR="$HOME/data/photos/videos"
+# This file is written by xdg-user-dirs-update
+# If you want to change or add directories, just edit the line you're
+# interested in. All local changes will be retained on the next run.
+# Format is XDG_xxx_DIR="$HOME/yyy", where yyy is a shell-escaped
+# homedir-relative path, or XDG_xxx_DIR="/yyy", where /yyy is an
+# absolute path. No other format is supported.
+# 
+XDG_DESKTOP_DIR="$HOME/Desktop"
+XDG_DOCUMENTS_DIR="$HOME/Documents"
+XDG_DOWNLOAD_DIR="$HOME/Downloads"
+XDG_MUSIC_DIR="$HOME/Documents/Gallery/Music"
+XDG_PICTURES_DIR="$HOME/Documents/Gallery"
+XDG_PUBLICSHARE_DIR="$HOME/Documents/Shared/Public"
+XDG_TEMPLATES_DIR="$HOME/Documents/Templates"
+XDG_VIDEOS_DIR="$HOME/Documents/Gallery/Videos"