From b6eb47d59aff98167df8ebc4fcfbb39cf2900f4a Mon Sep 17 00:00:00 2001
From: Anthony Perkins <anthony@acperkins.com>
Date: Fri, 17 May 2024 10:59:30 +0100
Subject: [PATCH] Stop setting up user dirs

---
 roles/home-cli/files/profile        | 20 --------------------
 roles/home-cli/files/user-dirs.dirs |  8 --------
 roles/home-cli/tasks/dotfiles.yml   |  4 ----
 3 files changed, 32 deletions(-)
 delete mode 100644 roles/home-cli/files/user-dirs.dirs

diff --git a/roles/home-cli/files/profile b/roles/home-cli/files/profile
index 14cf9ac..fb81435 100644
--- a/roles/home-cli/files/profile
+++ b/roles/home-cli/files/profile
@@ -55,26 +55,6 @@ then
     install -d -m 0700 "$HOME/data"
 fi
 
-if [ -r "$XDG_CONFIG_HOME/user-dirs.dirs" ]
-then
-    (
-        . "$XDG_CONFIG_HOME/user-dirs.dirs"
-        mkdir -p "$XDG_DESKTOP_DIR"
-        mkdir -p "$XDG_DOCUMENTS_DIR"
-        mkdir -p "$XDG_DOWNLOAD_DIR"
-        mkdir -p "$XDG_MUSIC_DIR"
-        mkdir -p "$XDG_PICTURES_DIR"
-        mkdir -p "$XDG_PUBLICSHARE_DIR"
-        mkdir -p "$XDG_TEMPLATES_DIR"
-        mkdir -p "$XDG_VIDEOS_DIR"
-
-        if [ -d "$HOME/Documents" ]; then rmdir "$HOME/Documents"; fi
-        if [ -d "$HOME/Music"     ]; then rmdir "$HOME/Music"    ; fi
-        if [ -d "$HOME/Pictures"  ]; then rmdir "$HOME/Pictures" ; fi
-        if [ -d "$HOME/Videos"    ]; then rmdir "$HOME/Videos"   ; fi
-    )
-fi
-
 # Desktop files (used by desktop environments within both X11 and Wayland) are
 # looked for in XDG_DATA_DIRS; make sure it includes the relevant directory for
 # snappy applications' desktop files.
diff --git a/roles/home-cli/files/user-dirs.dirs b/roles/home-cli/files/user-dirs.dirs
deleted file mode 100644
index 768494a..0000000
--- a/roles/home-cli/files/user-dirs.dirs
+++ /dev/null
@@ -1,8 +0,0 @@
-XDG_DESKTOP_DIR="$HOME/Desktop"
-XDG_DOCUMENTS_DIR="$HOME/data/Documents"
-XDG_DOWNLOAD_DIR="$HOME/Downloads"
-XDG_MUSIC_DIR="$HOME/data/Music"
-XDG_PICTURES_DIR="$HOME/data/Pictures"
-XDG_PUBLICSHARE_DIR="$HOME/Public"
-XDG_TEMPLATES_DIR="$HOME/Templates"
-XDG_VIDEOS_DIR="$HOME/data/Videos"
diff --git a/roles/home-cli/tasks/dotfiles.yml b/roles/home-cli/tasks/dotfiles.yml
index 228c139..d71cf0a 100644
--- a/roles/home-cli/tasks/dotfiles.yml
+++ b/roles/home-cli/tasks/dotfiles.yml
@@ -80,10 +80,6 @@
     src: virtxp.sh
     dest: "{{ ansible_env.HOME }}/.local/bin/virtxp"
     mode: '0755'
-- name: Create $XDG_CONFIG_HOME/user-dirs.dirs
-  ansible.builtin.copy:
-    src: user-dirs.dirs
-    dest: "{{ ansible_env.XDG_CONFIG_HOME }}/user-dirs.dirs"
 - name: Create $XDG_CONFIG_HOME/containers/storage.conf
   ansible.builtin.copy:
     src: storage.conf