From 4f315f2af8ce6e7b6b6f25d8b346e97bfdac6e18 Mon Sep 17 00:00:00 2001 From: Quinn Date: Tue, 13 Jan 2026 12:46:36 +0100 Subject: [PATCH] Include user-dirs.dirs in .profile, and use capitalised versions of the set names. We already use auto-capitalisation in the shell, so we actually benefit from having capitalised names, considering it reduces headaches induced by hardcoded paths. Also, now that we've accepted that the home directory will be a mess, it will aid standing out. Also source the file in .profile, because it should've been from the start. --- .config/user-dirs.dirs | 20 ++++++++++---------- .fehbg | 2 ++ .local/bin/satallite-wp-update | 2 +- .profile | 1 + 4 files changed, 14 insertions(+), 11 deletions(-) create mode 100755 .fehbg diff --git a/.config/user-dirs.dirs b/.config/user-dirs.dirs index 287d208..f24b91d 100644 --- a/.config/user-dirs.dirs +++ b/.config/user-dirs.dirs @@ -4,13 +4,13 @@ # 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_DOWNLOAD_DIR="$HOME/downloads" -XDG_TEMPLATES_DIR="$HOME/templates" -XDG_PUBLICSHARE_DIR="$HOME/public" -XDG_DOCUMENTS_DIR="$HOME/documents" -XDG_MUSIC_DIR="$HOME/music" -XDG_PICTURES_DIR="$HOME/photos" -XDG_VIDEOS_DIR="$HOME/videos" -XDG_PUBLIC_DIR="$HOME/public" +# +export XDG_PICTURES_DIR="$HOME/Photos" +export XDG_DESKTOP_DIR="$HOME/Desktop" +export XDG_DOWNLOAD_DIR="$HOME/Downloads" +export XDG_TEMPLATES_DIR="$HOME/Templates" +export XDG_PUBLICSHARE_DIR="$HOME/Public" +export XDG_DOCUMENTS_DIR="$HOME/Documents" +export XDG_MUSIC_DIR="$HOME/Music" +export XDG_PICTURES_DIR="$HOME/Pictures" +export XDG_VIDEOS_DIR="$HOME/Videos" diff --git a/.fehbg b/.fehbg new file mode 100755 index 0000000..1bc1619 --- /dev/null +++ b/.fehbg @@ -0,0 +1,2 @@ +#!/bin/sh +feh --no-fehbg --image-bg black --bg-center "$(xdg-user-dir PICTURES)/eumetsat/curr.png" diff --git a/.local/bin/satallite-wp-update b/.local/bin/satallite-wp-update index a181887..0049f3c 100755 --- a/.local/bin/satallite-wp-update +++ b/.local/bin/satallite-wp-update @@ -3,7 +3,7 @@ # set -xv -OUTDIR="$HOME/photos/eumetsat" +OUTDIR="$(xdg-user-dir PICTURES)/eumetsat" # full screen coverage # PRJ=AUTO:42004,52,5,0 diff --git a/.profile b/.profile index 53b04a9..048c86e 100644 --- a/.profile +++ b/.profile @@ -24,6 +24,7 @@ export XDG_CONFIG_HOME="$HOME/.config" # ~/.config /etc export XDG_DATA_HOME="$HOME/.local/share" # ~/.local/share /usr/share export XDG_STATE_HOME="$HOME/.var/lib" # ~/.local/state /var/lib export XDG_CACHE_HOME="$HOME/.var/cache" # ~/.cache /var/cache +[ -r "$XDG_CONFIG_HOME/user-dirs.dirs" ] && . "$XDG_CONFIG_HOME/user-dirs.dirs" # I am not going to set environment variables such as HISTFILE, # Since, cleaning up my $HOME is a losing battle, *every* application