From 82cf021b78d235ca98df61d4ce55d4c0969c2e5f Mon Sep 17 00:00:00 2001 From: Dennis Lee Date: Sat, 4 Apr 2020 12:55:06 -0700 Subject: [PATCH] substitute ~/.local/share with $XDG_DATA_HOME --- .config/aliasrc | 2 +- .config/i3/config | 2 +- .config/mimeapps.list | 2 +- .config/ncmpcpp/config | 2 +- .local/bin/dmenuunicode | 2 +- .local/bin/getkeys | 4 ++-- .local/bin/podentr | 2 +- .local/bin/statusbar/help | 2 +- .local/bin/statusbar/mailbox | 2 +- .profile | 6 +++--- 10 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.config/aliasrc b/.config/aliasrc index e07ee7a..1806d50 100644 --- a/.config/aliasrc +++ b/.config/aliasrc @@ -43,4 +43,4 @@ alias mpv="mpv --input-ipc-server=/tmp/mpvsoc$(date +%s)" alias \ magit="nvim -c MagitOnly" \ ref="shortcuts >/dev/null; source ~/.config/shortcutrc" \ - weath="less -S ~/.local/share/weatherreport" \ + weath="less -S $XDG_DATA_HOME/weatherreport" \ diff --git a/.config/i3/config b/.config/i3/config index a22fe8e..e965b7c 100644 --- a/.config/i3/config +++ b/.config/i3/config @@ -222,7 +222,7 @@ for_window [title="mpvfloat"] border pixel 0 no_focus [title="mpvfloat"] # #---Function Buttons---# # -bindsym $mod+F1 exec --no-startup-id groff -mom ~/.local/share/larbs/readme.mom -Tpdf | zathura - +bindsym $mod+F1 exec --no-startup-id groff -mom $XDG_DATA_HOME/larbs/readme.mom -Tpdf | zathura - bindsym $mod+F2 restart bindsym $mod+F3 exec --no-startup-id displayselect bindsym $mod+F4 exec --no-startup-id prompt "Hibernate computer?" "$hibernate" diff --git a/.config/mimeapps.list b/.config/mimeapps.list index 30988cc..5c1c093 100644 --- a/.config/mimeapps.list +++ b/.config/mimeapps.list @@ -1,7 +1,7 @@ [Default Applications] # xdg-open will use these settings to determine how to open filetypes. -# These .desktop entries can also be seen and changed in ~/.local/share/applications/ +# These .desktop entries can also be seen and changed in $XDG_DATA_HOME/applications/ text/x-shellscript=text.desktop; x-scheme-handler/magnet=torrent.desktop; diff --git a/.config/ncmpcpp/config b/.config/ncmpcpp/config index 2c9eda4..40fcbc6 100644 --- a/.config/ncmpcpp/config +++ b/.config/ncmpcpp/config @@ -10,7 +10,7 @@ ncmpcpp_directory = ~/.config/ncmpcpp ## MPD clients (eg. ncmpc) also use that location. ## # -lyrics_directory = ~/.local/share/lyrics +lyrics_directory = $XDG_DATA_HOME/lyrics # ##### connection settings ##### # diff --git a/.local/bin/dmenuunicode b/.local/bin/dmenuunicode index 12240e7..df8c7a0 100755 --- a/.local/bin/dmenuunicode +++ b/.local/bin/dmenuunicode @@ -5,7 +5,7 @@ # Must have xclip installed to even show menu. xclip -h 2>/dev/null || exit 1 -chosen=$(cut -d ';' -f1 ~/.local/share/larbs/emoji | dmenu -i -l 20 | sed "s/ .*//") +chosen=$(cut -d ';' -f1 $XDG_DATA_HOME/larbs/emoji | dmenu -i -l 20 | sed "s/ .*//") [ "$chosen" != "" ] || exit diff --git a/.local/bin/getkeys b/.local/bin/getkeys index 8871d41..0a12d22 100755 --- a/.local/bin/getkeys +++ b/.local/bin/getkeys @@ -1,5 +1,5 @@ #!/bin/sh -cat ~/.local/share/larbs/getkeys/"$1" 2>/dev/null && exit +cat $XDG_DATA_HOME/larbs/getkeys/"$1" 2>/dev/null && exit echo "Run command with one of the following arguments for info about that program:" -ls ~/.local/share/larbs/getkeys +ls $XDG_DATA_HOME/larbs/getkeys diff --git a/.local/bin/podentr b/.local/bin/podentr index e765c58..5bdc0ca 100755 --- a/.local/bin/podentr +++ b/.local/bin/podentr @@ -4,4 +4,4 @@ [ "$(pgrep -x $(basename $0) | wc -l)" -gt 2 ] && exit -echo ~/.local/share/newsboat/queue | entr -p queueandnotify 2>/dev/null +echo $XDG_DATA_HOME/newsboat/queue | entr -p queueandnotify 2>/dev/null diff --git a/.local/bin/statusbar/help b/.local/bin/statusbar/help index d7345dc..d58f5cc 100755 --- a/.local/bin/statusbar/help +++ b/.local/bin/statusbar/help @@ -1,7 +1,7 @@ #!/bin/sh case $BLOCK_BUTTON in - 1) groff -mom ~/.local/share/larbs/readme.mom -Tpdf | zathura - ;; + 1) groff -mom $XDG_DATA_HOME/larbs/readme.mom -Tpdf | zathura - ;; 2) i3 restart ;; 3) pgrep -x dunst >/dev/null && notify-send "❓ Help module" "\- Left click to open LARBS guide. - Middle click to refresh i3.";; diff --git a/.local/bin/statusbar/mailbox b/.local/bin/statusbar/mailbox index 3ace5f5..72d4511 100755 --- a/.local/bin/statusbar/mailbox +++ b/.local/bin/statusbar/mailbox @@ -13,7 +13,7 @@ case $BLOCK_BUTTON in - Middle click syncs mail" ;; esac -unread="$(find ~/.local/share/mail/*/INBOX/new/* -type f | wc -l 2>/dev/null)" +unread="$(find $XDG_DATA_HOME/mail/*/INBOX/new/* -type f | wc -l 2>/dev/null)" icon="$(cat "/tmp/imapsyncicon_$USER")" diff --git a/.profile b/.profile index 0f4a835..74a99bf 100644 --- a/.profile +++ b/.profile @@ -3,8 +3,8 @@ # Adds `~/.local/bin` to $PATH export PATH="$PATH:$(du "$HOME/.local/bin/" | cut -f2 | tr '\n' ':' | sed 's/:*$//')" -# Get default LARBS WM from ~/.local/share/larbs/wm -export LARBSWM="$(cat ~/.local/share/larbs/wm 2>/dev/null)" && +# Get default LARBS WM from $XDG_DATA_HOME/larbs/wm +export LARBSWM="$(cat $XDG_DATA_HOME/larbs/wm 2>/dev/null)" && [ "$LARBSWM" = "dwm" ] || export LARBSWM="i3" # Default programs: @@ -46,4 +46,4 @@ export LESS_TERMCAP_ue="$(printf '%b' '')" [ "$(tty)" = "/dev/tty1" ] && ! pgrep -x Xorg >/dev/null && exec startx # Switch escape and caps if tty and no passwd required: -sudo -n loadkeys ~/.local/share/larbs/ttymaps.kmap 2>/dev/null +sudo -n loadkeys $XDG_DATA_HOME/larbs/ttymaps.kmap 2>/dev/null