From 5014b636817e8eb1d55c3935ae92ef86fde3862f Mon Sep 17 00:00:00 2001 From: Dennis Lee Date: Tue, 31 Mar 2020 11:51:30 -0700 Subject: [PATCH 01/14] clean up android, tmux --- .profile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.profile b/.profile index 1b5460a0..889dd8b7 100644 --- a/.profile +++ b/.profile @@ -23,6 +23,8 @@ export WGETRC="$HOME/.config/wget/wgetrc" export INPUTRC="$HOME/.config/inputrc" export ZDOTDIR="$HOME/.config/zsh" export PASSWORD_STORE_DIR="$HOME/.local/share/password-store" +export TMUX_TMPDIR="$XDG_RUNTIME_DIR" +export ANDROID_SDK_HOME="$XDG_CONFIG_HOME/android" # Other program settings: export DICS="/usr/share/stardict/dic/" From 4f496fa189d9b953a4ab487ea6b7a8eaccc0e9ee Mon Sep 17 00:00:00 2001 From: Dennis Lee Date: Sat, 4 Apr 2020 12:32:21 -0700 Subject: [PATCH 02/14] clean up cargo --- .profile | 1 + 1 file changed, 1 insertion(+) diff --git a/.profile b/.profile index 889dd8b7..70e23fb4 100644 --- a/.profile +++ b/.profile @@ -25,6 +25,7 @@ export ZDOTDIR="$HOME/.config/zsh" export PASSWORD_STORE_DIR="$HOME/.local/share/password-store" export TMUX_TMPDIR="$XDG_RUNTIME_DIR" export ANDROID_SDK_HOME="$XDG_CONFIG_HOME/android" +export CARGO_HOME="$XDG_DATA_HOME/cargo" # Other program settings: export DICS="/usr/share/stardict/dic/" From fa67562835fc4cfd8f87c2abc622b9c1b4358ffe Mon Sep 17 00:00:00 2001 From: Dennis Lee Date: Sat, 4 Apr 2020 12:45:33 -0700 Subject: [PATCH 03/14] substitute $HOME/.config with $XDG_CONFIG_HOME --- .config/zsh/.zshrc | 4 ++-- .local/bin/rssadd | 2 +- .local/bin/shortcuts | 10 +++++----- .profile | 10 +++++----- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc index 63c0049b..371d2192 100644 --- a/.config/zsh/.zshrc +++ b/.config/zsh/.zshrc @@ -4,8 +4,8 @@ autoload -U colors && colors PS1="%B%{$fg[red]%}[%{$fg[yellow]%}%n%{$fg[green]%}@%{$fg[blue]%}%M %{$fg[magenta]%}%~%{$fg[red]%}]%{$reset_color%}$%b " # Load aliases and shortcuts if existent. -[ -f "$HOME/.config/shortcutrc" ] && source "$HOME/.config/shortcutrc" -[ -f "$HOME/.config/aliasrc" ] && source "$HOME/.config/aliasrc" +[ -f "$XDG_CONFIG_HOME/shortcutrc" ] && source "$XDG_CONFIG_HOME/shortcutrc" +[ -f "$XDG_CONFIG_HOME/aliasrc" ] && source "$XDG_CONFIG_HOME/aliasrc" autoload -U compinit zstyle ':completion:*' menu select diff --git a/.local/bin/rssadd b/.local/bin/rssadd index 4ef31a4c..9dcdd7b3 100755 --- a/.local/bin/rssadd +++ b/.local/bin/rssadd @@ -2,7 +2,7 @@ ! echo "$1" | grep "https*://\S\+\.[A-Za-z]\+\S*" >/dev/null && notify-send "That doesn't look like a full URL." && exit -RSSFILE="$HOME/.config/newsboat/urls" +RSSFILE="$XDG_CONFIG_HOME/newsboat/urls" if awk '{print $1}' "$RSSFILE" | grep "^$1$" >/dev/null; then notify-send "You already have this RSS feed." else diff --git a/.local/bin/shortcuts b/.local/bin/shortcuts index 55ce30ae..112d1405 100755 --- a/.local/bin/shortcuts +++ b/.local/bin/shortcuts @@ -1,11 +1,11 @@ #!/usr/bin/env bash # Output locations. Unactivated progs should go to /dev/null. -shell_shortcuts="$HOME/.config/shortcutrc" -ranger_shortcuts="$HOME/.config/ranger/shortcuts.conf" +shell_shortcuts="$XDG_CONFIG_HOME/shortcutrc" +ranger_shortcuts="$XDG_CONFIG_HOME/ranger/shortcuts.conf" qute_shortcuts="/dev/null" fish_shortcuts="/dev/null" -vifm_shortcuts="$HOME/.config/vifm/vifmshortcuts" +vifm_shortcuts="$XDG_CONFIG_HOME/vifm/vifmshortcuts" # Remove, prepare files rm -f "$ranger_shortcuts" "$qute_shortcuts" 2>/dev/null @@ -14,14 +14,14 @@ printf "# vim: filetype=sh\\nalias " > "$shell_shortcuts" printf "\" vim: filetype=vim\\n" > "$vifm_shortcuts" # Format the `directories` file in the correct syntax and sent it to all three configs. -sed "s/\s*#.*$//;/^\s*$/d" "$HOME/.config/directories" | tee >(awk '{print $1"=\"cd "$2" && ls -a\" \\"}' >> "$shell_shortcuts") \ +sed "s/\s*#.*$//;/^\s*$/d" "$XDG_CONFIG_HOME/directories" | tee >(awk '{print $1"=\"cd "$2" && ls -a\" \\"}' >> "$shell_shortcuts") \ >(awk '{print "abbr", $1, "\"cd " $2 "; and ls -a\""}' >> "$fish_shortcuts") \ >(awk '{print "map g" $1, ":cd", $2 "\nmap t" $1, ":cd", $2 "\nmap M" $1, ":cd", $2 ":mo\nmap Y" $1, ":cd", $2 ":co" }' >> "$vifm_shortcuts") \ >(awk '{print "config.bind(\";"$1"\", \"set downloads.location.directory "$2" ;; hint links download\")"}' >> "$qute_shortcuts") \ | awk '{print "map g"$1" cd "$2"\nmap t"$1" tab_new "$2"\nmap m"$1" shell mv -v %s "$2"\nmap Y"$1" shell cp -rv %s "$2}' >> "$ranger_shortcuts" # Format the `files` file in the correct syntax and sent it to both configs. -sed "s/\s*#.*$//;/^\s*$/d" "$HOME/.config/files" | tee >(awk '{print $1"=\"$EDITOR "$2"\" \\"}' >> "$shell_shortcuts") \ +sed "s/\s*#.*$//;/^\s*$/d" "$XDG_CONFIG_HOME/files" | tee >(awk '{print $1"=\"$EDITOR "$2"\" \\"}' >> "$shell_shortcuts") \ >(awk '{print "abbr", $1, "\"$EDITOR "$2"\""}' >> "$fish_shortcuts") \ >(awk '{print "map", $1, ":e", $2 "" }' >> "$vifm_shortcuts") \ | awk '{print "map "$1" shell $EDITOR "$2}' >> "$ranger_shortcuts" diff --git a/.profile b/.profile index 70e23fb4..51b737a6 100644 --- a/.profile +++ b/.profile @@ -16,12 +16,12 @@ export STATUSBAR="${LARBSWM}blocks" # ~/ Clean-up: #export XAUTHORITY="$XDG_RUNTIME_DIR/Xauthority" # This line will break some DMs. -export NOTMUCH_CONFIG="$HOME/.config/notmuch-config" -export GTK2_RC_FILES="$HOME/.config/gtk-2.0/gtkrc-2.0" +export NOTMUCH_CONFIG="$XDG_CONFIG_HOME/notmuch-config" +export GTK2_RC_FILES="$XDG_CONFIG_HOME/gtk-2.0/gtkrc-2.0" export LESSHISTFILE="-" -export WGETRC="$HOME/.config/wget/wgetrc" -export INPUTRC="$HOME/.config/inputrc" -export ZDOTDIR="$HOME/.config/zsh" +export WGETRC="$XDG_CONFIG_HOME/wget/wgetrc" +export INPUTRC="$XDG_CONFIG_HOME/inputrc" +export ZDOTDIR="$XDG_CONFIG_HOME/zsh" export PASSWORD_STORE_DIR="$HOME/.local/share/password-store" export TMUX_TMPDIR="$XDG_RUNTIME_DIR" export ANDROID_SDK_HOME="$XDG_CONFIG_HOME/android" From 2b572b2a89de8aca631de686e25f2f5d306a91bd Mon Sep 17 00:00:00 2001 From: Dennis Lee Date: Sat, 4 Apr 2020 12:52:29 -0700 Subject: [PATCH 04/14] substitute $HOME/.local/share with $XDG_DATA_HOME --- .config/sxhkd/sxhkdrc | 4 ++-- .local/bin/i3cmds/toggle-welcome | 2 +- .local/bin/queueandnotify | 2 +- .local/bin/statusbar/weather | 10 +++++----- .profile | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.config/sxhkd/sxhkdrc b/.config/sxhkd/sxhkdrc index 0b05a3df..c07d7809 100644 --- a/.config/sxhkd/sxhkdrc +++ b/.config/sxhkd/sxhkdrc @@ -137,10 +137,10 @@ XF86MyComputer # Function keys super + shift + F1 - grep LARBSWELCOME ~/.xprofile && ( sed -i "/LARBSWELCOME/d" ~/.xprofile && notify-send "LARBS welcome message" "Welcome message disabled. Press Super+Shift+F1 again to reverse." ) || ( echo "notify-send -i "$HOME/.local/share/larbs/larbs.png" \"Welcome to LARBS\" \"Press super+F1 for the help menu.\" # LARBSWELCOME" >> ~/.xprofile && notify-send "LARBS welcome message" "Welcome message re-enabled." ) + grep LARBSWELCOME ~/.xprofile && ( sed -i "/LARBSWELCOME/d" ~/.xprofile && notify-send "LARBS welcome message" "Welcome message disabled. Press Super+Shift+F1 again to reverse." ) || ( echo "notify-send -i "$XDG_DATA_HOME/larbs/larbs.png" \"Welcome to LARBS\" \"Press super+F1 for the help menu.\" # LARBSWELCOME" >> ~/.xprofile && notify-send "LARBS welcome message" "Welcome message re-enabled." ) # Show readme super + F1 - groff -mom $HOME/.local/share/larbs/readme.mom -Tpdf | zathura - + groff -mom $XDG_DATA_HOME/larbs/readme.mom -Tpdf | zathura - # F2 restarts either dwm or i3 and is bound in each. # Change display super + F3 diff --git a/.local/bin/i3cmds/toggle-welcome b/.local/bin/i3cmds/toggle-welcome index 715db09e..d8cc0eff 100755 --- a/.local/bin/i3cmds/toggle-welcome +++ b/.local/bin/i3cmds/toggle-welcome @@ -2,7 +2,7 @@ # Toggles the LARBS welcome message. -PIC="$HOME/.local/share/larbs/larbs.png" +PIC="$XDG_DATA_HOME/larbs/larbs.png" grep LARBSWELCOME "$HOME/.xprofile" && ( sed -i "/LARBSWELCOME/d" ~/.xprofile && notify-send -i "$PIC" "LARBS welcome message" "Welcome message disabled. Press Super+Shift+F1 again to reverse." ) || diff --git a/.local/bin/queueandnotify b/.local/bin/queueandnotify index 867b15e6..24746c8b 100755 --- a/.local/bin/queueandnotify +++ b/.local/bin/queueandnotify @@ -3,7 +3,7 @@ # Podboat sucks. This script replaces it. # It reads the newsboat queue, queuing downloads with taskspooler. # It also removes the junk from extentions. -queuefile="$HOME/.local/share/newsboat/queue" +queuefile="$XDG_DATA_HOME/newsboat/queue" while read -r line; do [ -z "$line" ] && continue diff --git a/.local/bin/statusbar/weather b/.local/bin/statusbar/weather index 285ac917..bc9f20cd 100755 --- a/.local/bin/statusbar/weather +++ b/.local/bin/statusbar/weather @@ -1,13 +1,13 @@ #!/bin/sh getforecast() { ping -q -c 1 1.1.1.1 >/dev/null || exit 1 -curl -sf "wttr.in/$LOCATION" > "$HOME/.local/share/weatherreport" || exit 1 ;} +curl -sf "wttr.in/$LOCATION" > "$XDG_DATA_HOME/weatherreport" || exit 1 ;} -showweather() { printf "%s" "$(sed '16q;d' "$HOME/.local/share/weatherreport" | grep -wo "[0-9]*%" | sort -n | sed -e '$!d' | sed -e "s/^/☔ /g" | tr -d '\n')" -sed '13q;d' "$HOME/.local/share/weatherreport" | grep -o "m\\(-+\\)*[0-9]\\+" | sort -n -t 'm' -k 2n | sed -e 1b -e '$!d' | tr '\n|m' ' ' | awk '{print " ❄️",$1 "°","🌞",$2 "°"}' ;} +showweather() { printf "%s" "$(sed '16q;d' "$XDG_DATA_HOME/weatherreport" | grep -wo "[0-9]*%" | sort -n | sed -e '$!d' | sed -e "s/^/☔ /g" | tr -d '\n')" +sed '13q;d' "$XDG_DATA_HOME/weatherreport" | grep -o "m\\(-+\\)*[0-9]\\+" | sort -n -t 'm' -k 2n | sed -e 1b -e '$!d' | tr '\n|m' ' ' | awk '{print " ❄️",$1 "°","🌞",$2 "°"}' ;} case $BLOCK_BUTTON in - 1) $TERMINAL -e less -Srf "$HOME/.local/share/weatherreport" ;; + 1) $TERMINAL -e less -Srf "$XDG_DATA_HOME/weatherreport" ;; 2) getforecast && showweather ;; 3) pgrep -x dunst >/dev/null && notify-send "🌈 Weather module" "\- Left click for full forecast. - Middle click to update forecast. @@ -16,7 +16,7 @@ case $BLOCK_BUTTON in 🌞: Daily high" ;; esac -if [ "$(stat -c %y "$HOME/.local/share/weatherreport" 2>/dev/null | awk '{print $1}')" != "$(date '+%Y-%m-%d')" ] +if [ "$(stat -c %y "$XDG_DATA_HOME/weatherreport" 2>/dev/null | awk '{print $1}')" != "$(date '+%Y-%m-%d')" ] then getforecast && showweather else showweather fi diff --git a/.profile b/.profile index 51b737a6..0f4a835a 100644 --- a/.profile +++ b/.profile @@ -22,7 +22,7 @@ export LESSHISTFILE="-" export WGETRC="$XDG_CONFIG_HOME/wget/wgetrc" export INPUTRC="$XDG_CONFIG_HOME/inputrc" export ZDOTDIR="$XDG_CONFIG_HOME/zsh" -export PASSWORD_STORE_DIR="$HOME/.local/share/password-store" +export PASSWORD_STORE_DIR="$XDG_DATA_HOME/password-store" export TMUX_TMPDIR="$XDG_RUNTIME_DIR" export ANDROID_SDK_HOME="$XDG_CONFIG_HOME/android" export CARGO_HOME="$XDG_DATA_HOME/cargo" From 82cf021b78d235ca98df61d4ce55d4c0969c2e5f Mon Sep 17 00:00:00 2001 From: Dennis Lee Date: Sat, 4 Apr 2020 12:55:06 -0700 Subject: [PATCH 05/14] 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 e07ee7a8..1806d50e 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 a22fe8ec..e965b7cc 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 30988ccf..5c1c093e 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 2c9eda4c..40fcbc6f 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 12240e74..df8c7a03 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 8871d414..0a12d22d 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 e765c584..5bdc0ca3 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 d7345dc9..d58f5cca 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 3ace5f5b..72d45111 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 0f4a835a..74a99bfa 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 From a29eaec506a7ce9e42d64a3ec1d17690387def30 Mon Sep 17 00:00:00 2001 From: Dennis Lee Date: Sat, 4 Apr 2020 13:00:08 -0700 Subject: [PATCH 06/14] substitute ~/.config with $XDG_CONFIG_HOME --- .config/aliasrc | 2 +- .config/directories | 2 +- .config/files | 26 +++++++++++++------------- .config/lf/lfrc | 10 +++++----- .config/mpd/mpd.conf | 12 ++++++------ .config/ncmpcpp/config | 2 +- .config/nvim/init.vim | 8 ++++---- .config/ranger/commands.py | 2 +- .config/ranger/luke_ranger_readme.md | 6 +++--- .config/ranger/rc.conf | 4 ++-- .config/sxiv/exec/key-handler | 4 ++-- .config/vifm/vifmrc | 2 +- .local/bin/cron/crontog | 2 +- .local/bin/statusbar/clock | 2 +- .local/bin/statusbar/iplocate | 2 +- .local/bin/statusbar/news | 2 +- .local/share/larbs/getkeys/sxiv | 2 +- .local/share/larbs/readme.mom | 10 +++++----- .profile | 2 +- .xprofile | 2 +- README.md | 8 ++++---- 21 files changed, 56 insertions(+), 56 deletions(-) diff --git a/.config/aliasrc b/.config/aliasrc index 1806d50e..34bf437b 100644 --- a/.config/aliasrc +++ b/.config/aliasrc @@ -42,5 +42,5 @@ alias mpv="mpv --input-ipc-server=/tmp/mpvsoc$(date +%s)" # Some other stuff alias \ magit="nvim -c MagitOnly" \ - ref="shortcuts >/dev/null; source ~/.config/shortcutrc" \ + ref="shortcuts >/dev/null; source $XDG_CONFIG_HOME/shortcutrc" \ weath="less -S $XDG_DATA_HOME/weatherreport" \ diff --git a/.config/directories b/.config/directories index 24bdd218..cd3aafb7 100644 --- a/.config/directories +++ b/.config/directories @@ -5,6 +5,6 @@ D ~/Downloads m ~/Music pp ~/Pictures vv ~/Videos -cf ~/.config +cf $XDG_CONFIG_HOME sc ~/.local/bin mn /mnt diff --git a/.config/files b/.config/files index b34f1849..6aee4602 100644 --- a/.config/files +++ b/.config/files @@ -1,15 +1,15 @@ -bf ~/.config/files -bd ~/.config/directories -bw ~/.config/bookmarks -cfa ~/.config/aliasrc +bf $XDG_CONFIG_HOME/files +bd $XDG_CONFIG_HOME/directories +bw $XDG_CONFIG_HOME/bookmarks +cfa $XDG_CONFIG_HOME/aliasrc cfz $ZDOTDIR/.zshrc -cfv ~/.config/nvim/init.vim -cfm ~/.config/mutt/muttrc +cfv $XDG_CONFIG_HOME/nvim/init.vim +cfm $XDG_CONFIG_HOME/mutt/muttrc cfd ~/.Xdefaults -cfu ~/.config/newsboat/urls -cfn ~/.config/newsboat/config -cfmb ~/.config/ncmpcpp/bindings -cfmc ~/.config/ncmpcpp/config -cfk ~/.config/sxhkd/sxhkdrc -cfi ~/.config/i3/config -cfb ~/.config/i3blocks/config +cfu $XDG_CONFIG_HOME/newsboat/urls +cfn $XDG_CONFIG_HOME/newsboat/config +cfmb $XDG_CONFIG_HOME/ncmpcpp/bindings +cfmc $XDG_CONFIG_HOME/ncmpcpp/config +cfk $XDG_CONFIG_HOME/sxhkd/sxhkdrc +cfi $XDG_CONFIG_HOME/i3/config +cfb $XDG_CONFIG_HOME/i3blocks/config diff --git a/.config/lf/lfrc b/.config/lf/lfrc index 27900a1d..3b4cc14f 100644 --- a/.config/lf/lfrc +++ b/.config/lf/lfrc @@ -2,7 +2,7 @@ # Basic vars set shell sh -set previewer ~/.config/lf/scope +set previewer $XDG_CONFIG_HOME/lf/scope set shellopts '-eu' set ifs "\n" set scrolloff 10 @@ -36,7 +36,7 @@ cmd delete ${{ cmd moveto ${{ set -f clear; echo "Move to where?" - dest="$(cut -d' ' -f2- ~/.config/directories | fzf)" && + dest="$(cut -d' ' -f2- $XDG_CONFIG_HOME/directories | fzf)" && eval mv -iv $fx $dest && notify-send "🚚 File(s) moved." "File(s) moved to $dest." }} @@ -44,7 +44,7 @@ cmd moveto ${{ cmd copyto ${{ set -f clear; echo "Copy to where?" - dest="$(cut -d' ' -f2- ~/.config/directories | fzf)" && + dest="$(cut -d' ' -f2- $XDG_CONFIG_HOME/directories | fzf)" && eval cp -ivr $fx $dest && notify-send "📋 File(s) copied." "File(s) copies to $dest." }} @@ -54,9 +54,9 @@ cmd bulkrename ${{ }} # Bindings -map c $lf -remote "send $id cd $(cut -d' ' -f2 ~/.config/directories | fzf)" +map c $lf -remote "send $id cd $(cut -d' ' -f2 $XDG_CONFIG_HOME/directories | fzf)" map $lf -remote "send $id select '$(fzf)'" -map J $lf -remote "send $id cd $(cut -d' ' -f2 ~/.config/directories | fzf)" +map J $lf -remote "send $id cd $(cut -d' ' -f2 $XDG_CONFIG_HOME/directories | fzf)" map gh map g top map D delete diff --git a/.config/mpd/mpd.conf b/.config/mpd/mpd.conf index a0548ecd..8a30ca5f 100644 --- a/.config/mpd/mpd.conf +++ b/.config/mpd/mpd.conf @@ -1,10 +1,10 @@ -db_file "~/.config/mpd/database" -log_file "~/.config/mpd/log" +db_file "$XDG_CONFIG_HOME/mpd/database" +log_file "$XDG_CONFIG_HOME/mpd/log" music_directory "~/Music" -playlist_directory "~/.config/mpd/playlists" -pid_file "~/.config/mpd/pid" -state_file "~/.config/mpd/state" -sticker_file "~/.config/mpd/sticker.sql" +playlist_directory "$XDG_CONFIG_HOME/mpd/playlists" +pid_file "$XDG_CONFIG_HOME/mpd/pid" +state_file "$XDG_CONFIG_HOME/mpd/state" +sticker_file "$XDG_CONFIG_HOME/mpd/sticker.sql" auto_update "yes" diff --git a/.config/ncmpcpp/config b/.config/ncmpcpp/config index 40fcbc6f..d2e11326 100644 --- a/.config/ncmpcpp/config +++ b/.config/ncmpcpp/config @@ -3,7 +3,7 @@ ## or $XDG_CONFIG_HOME/ncmpcpp/config and set up your preferences. ## ############################################################################## # -ncmpcpp_directory = ~/.config/ncmpcpp +ncmpcpp_directory = $XDG_CONFIG_HOME/ncmpcpp # ## ## Directory for storing downloaded lyrics. It defaults to ~/.lyrics since other diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim index d8b0ba20..ae94ae1d 100644 --- a/.config/nvim/init.vim +++ b/.config/nvim/init.vim @@ -1,13 +1,13 @@ let mapleader ="," -if ! filereadable(expand('~/.config/nvim/autoload/plug.vim')) +if ! filereadable(expand('$XDG_CONFIG_HOME/nvim/autoload/plug.vim')) echo "Downloading junegunn/vim-plug to manage plugins..." - silent !mkdir -p ~/.config/nvim/autoload/ - silent !curl "https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim" > ~/.config/nvim/autoload/plug.vim + silent !mkdir -p $XDG_CONFIG_HOME/nvim/autoload/ + silent !curl "https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim" > $XDG_CONFIG_HOME/nvim/autoload/plug.vim autocmd VimEnter * PlugInstall endif -call plug#begin('~/.config/nvim/plugged') +call plug#begin('$XDG_CONFIG_HOME/nvim/plugged') Plug 'tpope/vim-surround' Plug 'scrooloose/nerdtree' Plug 'junegunn/goyo.vim' diff --git a/.config/ranger/commands.py b/.config/ranger/commands.py index 71fd2a24..5b1acd2d 100755 --- a/.config/ranger/commands.py +++ b/.config/ranger/commands.py @@ -60,7 +60,7 @@ class my_edit(Command): # https://github.com/ranger/ranger/wiki/Integrating-File-Search-with-fzf -# Now, simply bind this function to a key, by adding this to your ~/.config/ranger/rc.conf: map fzf_select +# Now, simply bind this function to a key, by adding this to your $XDG_CONFIG_HOME/ranger/rc.conf: map fzf_select class fzf_select(Command): """ :fzf_select diff --git a/.config/ranger/luke_ranger_readme.md b/.config/ranger/luke_ranger_readme.md index 51c5dd10..f6ee93fc 100644 --- a/.config/ranger/luke_ranger_readme.md +++ b/.config/ranger/luke_ranger_readme.md @@ -32,10 +32,10 @@ These "verbs" take "nouns" or "arguments," like these: + d -- "~/Documents" + D -- "~/Downloads" -+ cf -- "~/.config" ++ cf -- "$XDG_CONFIG_HOME" + And many others, including those you add to `~/.bmdirs`. -Press any "verb" followed by any "argument" to perform a folder operation. "gd" will cd to ~/Documents, for example. "mD" will move the selected file(s) to ~/Downloads. "tcf" will create a new tab in ~/.config, etc. etc. +Press any "verb" followed by any "argument" to perform a folder operation. "gd" will cd to ~/Documents, for example. "mD" will move the selected file(s) to ~/Downloads. "tcf" will create a new tab in $XDG_CONFIG_HOME, etc. etc. ## Many little additions! @@ -60,7 +60,7 @@ Press any "verb" followed by any "argument" to perform a folder operation. "gd" + Txs -- copy slideshow/beamer template to new file + Txh -- copy handout template to new file + Image commands: - + bg -- (for i3 users) makes an image your background (assuming i3 is looking at ~/.config/wall.png for your background) + + bg -- (for i3 users) makes an image your background (assuming i3 is looking at $XDG_CONFIG_HOME/wall.png for your background) + bw -- runs Pywal on the selected image, making it your background and generating a color scheme based off of it. + C -- rotates an image (requires imagemagick) + F -- flips an image (requires imagemagick) diff --git a/.config/ranger/rc.conf b/.config/ranger/rc.conf index 89b4b8c2..ff0d5069 100644 --- a/.config/ranger/rc.conf +++ b/.config/ranger/rc.conf @@ -5,7 +5,7 @@ set column_ratios 1,3,4 set hidden_filter ^\.|\.(?:pyc|vrb|pyo|lof|bak|swp|aux|log|nav|out|snm|toc|bcf|run\.xml|synctex\.gz|blg|bbl)$|^lost\+found$|^__(py)?cache__$ set show_hidden false set confirm_on_delete multiple -set preview_script ~/.config/ranger/scope.sh +set preview_script $XDG_CONFIG_HOME/ranger/scope.sh set use_preview_script true set automatically_count_files true set open_all_images true @@ -505,4 +505,4 @@ map Tn eval fm.open_console('shell eyeD3 -n "" ' + fm.thisfile.relative_path, po #Downloading map ytv console shell youtube-dl -ic%space map yta console shell youtube-dl -xic%space -source ~/.config/ranger/shortcuts.conf +source $XDG_CONFIG_HOME/ranger/shortcuts.conf diff --git a/.config/sxiv/exec/key-handler b/.config/sxiv/exec/key-handler index d9f18254..e096f6e4 100755 --- a/.config/sxiv/exec/key-handler +++ b/.config/sxiv/exec/key-handler @@ -4,12 +4,12 @@ do case "$1" in "w") setbg "$file" & ;; "c") - [ -z "$destdir" ] && destdir="$(sed "s/\s.*#.*$//;/^\s*$/d" ~/.config/directories | awk '{print $2}' | dmenu -l 20 -i -p "Copy file(s) to where?" | sed "s|~|$HOME|g")" + [ -z "$destdir" ] && destdir="$(sed "s/\s.*#.*$//;/^\s*$/d" $XDG_CONFIG_HOME/directories | awk '{print $2}' | dmenu -l 20 -i -p "Copy file(s) to where?" | sed "s|~|$HOME|g")" [ -z "$destdir" ] && exit cp "$file" "$destdir" && notify-send -i "$(readlink -f "$file")" "$file copied to $destdir." & ;; "m") - [ -z "$destdir" ] && destdir="$(sed "s/\s.*#.*$//;/^\s*$/d" ~/.config/directories | awk '{print $2}' | dmenu -l 20 -i -p "Move file(s) to where?" | sed "s|~|$HOME|g")" + [ -z "$destdir" ] && destdir="$(sed "s/\s.*#.*$//;/^\s*$/d" $XDG_CONFIG_HOME/directories | awk '{print $2}' | dmenu -l 20 -i -p "Move file(s) to where?" | sed "s|~|$HOME|g")" [ -z "$destdir" ] && exit mv "$file" "$destdir" && notify-send -i "$(readlink -f "$file")" "$file moved to $destdir." & ;; diff --git a/.config/vifm/vifmrc b/.config/vifm/vifmrc index b327786c..ed77ea83 100644 --- a/.config/vifm/vifmrc +++ b/.config/vifm/vifmrc @@ -1,5 +1,5 @@ " vim: filetype=vifm -source ~/.config/vifm/vifmshortcuts +source $XDG_CONFIG_HOME/vifm/vifmshortcuts set vicmd=$EDITOR set syscalls diff --git a/.local/bin/cron/crontog b/.local/bin/cron/crontog index 67f620b9..9889d769 100755 --- a/.local/bin/cron/crontog +++ b/.local/bin/cron/crontog @@ -3,4 +3,4 @@ # Toggles all cronjobs off/on. # Stores disabled crontabs in ~/.consaved until restored. -([ -f ~/.config/cronsaved ] && crontab - < ~/.config/cronsaved && rm ~/.config/cronsaved && notify-send "🕓 Cronjobs re-enabled.") || ( crontab -l > ~/.config/cronsaved && crontab -r && notify-send "🕓 Cronjobs saved and disabled.") +([ -f $XDG_CONFIG_HOME/cronsaved ] && crontab - < $XDG_CONFIG_HOME/cronsaved && rm $XDG_CONFIG_HOME/cronsaved && notify-send "🕓 Cronjobs re-enabled.") || ( crontab -l > $XDG_CONFIG_HOME/cronsaved && crontab -r && notify-send "🕓 Cronjobs saved and disabled.") diff --git a/.local/bin/statusbar/clock b/.local/bin/statusbar/clock index d17f3c63..f412bcb9 100755 --- a/.local/bin/statusbar/clock +++ b/.local/bin/statusbar/clock @@ -4,7 +4,7 @@ date '+%Y %b %d (%a) %I:%M%p' case $BLOCK_BUTTON in 1) pgrep -x dunst >/dev/null && notify-send "This Month" "$(cal --color=always | sed "s/..7m//;s/..27m/<\/span><\/b>/")" && notify-send "Appointments" "$(calcurse -d3)" ;; - 2) $TERMINAL -e calcurse -D ~/.config/calcurse ;; + 2) $TERMINAL -e calcurse -D $XDG_CONFIG_HOME/calcurse ;; 3) pgrep -x dunst >/dev/null && notify-send "📅 Time/date module" "\- Left click to show upcoming appointments for the next three days via \`calcurse -d3\` and show the month via \`cal\` - Middle click opens calcurse if installed" ;; esac diff --git a/.local/bin/statusbar/iplocate b/.local/bin/statusbar/iplocate index 4ca4f107..6d1038cb 100755 --- a/.local/bin/statusbar/iplocate +++ b/.local/bin/statusbar/iplocate @@ -6,4 +6,4 @@ # https://www.maketecheasier.com/ip-address-geolocation-lookups-linux/ ifinstalled "geoiplookup" || exit addr="$(curl ifconfig.me 2>/dev/null)" || exit -grep "flag: " ~/.config/emoji | grep "$(geoiplookup $addr | sed 's/.*, //')" | sed "s/flag: //;s/;.*//" +grep "flag: " $XDG_CONFIG_HOME/emoji | grep "$(geoiplookup $addr | sed 's/.*, //')" | sed "s/flag: //;s/;.*//" diff --git a/.local/bin/statusbar/news b/.local/bin/statusbar/news index a8842ad8..e72ef570 100755 --- a/.local/bin/statusbar/news +++ b/.local/bin/statusbar/news @@ -14,4 +14,4 @@ case $BLOCK_BUTTON in Note: Only one instance of newsboat (including updates) may be running at a time." ;; esac - cat /tmp/newsupdate 2>/dev/null || echo "$(newsboat -x print-unread | awk '{ print "📰 " $1}' | sed s/^0$//g)$(cat ~/.config/newsboat/.update 2>/dev/null)" + cat /tmp/newsupdate 2>/dev/null || echo "$(newsboat -x print-unread | awk '{ print "📰 " $1}' | sed s/^0$//g)$(cat $XDG_CONFIG_HOME/newsboat/.update 2>/dev/null)" diff --git a/.local/share/larbs/getkeys/sxiv b/.local/share/larbs/getkeys/sxiv index df5cb1e0..40310393 100644 --- a/.local/share/larbs/getkeys/sxiv +++ b/.local/share/larbs/getkeys/sxiv @@ -12,4 +12,4 @@ sxiv is the image viewer. r - Reload image if changed m - Mark/unmark image w - Zoom to fit window - ctrl-x - Run external command (see ~/.config/sxiv/exec/key-handler for options) + ctrl-x - Run external command (see $XDG_CONFIG_HOME/sxiv/exec/key-handler for options) diff --git a/.local/share/larbs/readme.mom b/.local/share/larbs/readme.mom index c46b1a82..03151a70 100644 --- a/.local/share/larbs/readme.mom +++ b/.local/share/larbs/readme.mom @@ -64,7 +64,7 @@ Below in this document, there is information about where to change programs/comp .PP Additionally, while this isn't a part of the desktop environment, the default editing mode in the shell is using vi bindings. If you want to learn more of this, run \f(CWMod+Shift+E\fP and type and select the option for "vi mode in shell". -This setting can be changed if you don't like it by deleting or commenting out the contents of \f(CW~/.config/inputrc\fP. +This setting can be changed if you don't like it by deleting or commenting out the contents of \f(CW$XDG_CONFIG_HOME/inputrc\fP. .HEADING 2 "The Status Bar" .PP To the left, you'll see the numbers of your current workspace/tag(s). @@ -73,7 +73,7 @@ Each module on the right of the status bar is a script located in \f(CW~/.local/ You can see what they do and modify them from there. I'm sure you can figure it out. .PP -In i3, the program i3blocks controls what modules appear in the statusbar; its config file is in \f(CW~/.config/i3blocks/config\fP. +In i3, the program i3blocks controls what modules appear in the statusbar; its config file is in \f(CW$XDG_CONFIG_HOME/i3blocks/config\fP. .HEADING 2 "Deeper Tutorials" .PP Press \f(CWmod+shift+e\fP at any time to get a menu of programs to watch videos about streaming directly from YouTube. @@ -252,7 +252,7 @@ buttons, screen brightness, email, web browsing buttons, etc.) to what you would expect. .HEADING 1 "Configuration" .PP -Dotfiles/settings files are located in \f(CW~/.config/\fP, note that dotfiles to programs not included in LARBS are there as well by requests of users. I do not necessarily maintain all these dotfiles, but they remain as legacy. +Dotfiles/settings files are located in \f(CW$XDG_CONFIG_HOME/\fP, note that dotfiles to programs not included in LARBS are there as well by requests of users. I do not necessarily maintain all these dotfiles, but they remain as legacy. .PP Suckless programs, st (the terminal) and dmenu among others do not have traditional config files, but have their source code location in \f(CW~/.local/src/\fP. There you can modify their \f(CWconfig.h\fP files, then \f(CWsudo make install\fP to reinstall. @@ -278,7 +278,7 @@ In the Linux terminal, those binds have other more important purposes, so you ca Additionally, I've set vim to use the clipboard as the default buffer, which means when you copy or delete something in vim, it will be in your system clipboard as well, so you can \f(CWctrl-v\fP it into your browser instance, etc. You can also paste material copied from other programs into vim with the typical vim bindings. .HEADING 2 "How do I change the background/wallpaper?" .PP -The system will always read the file \f(CW~/.config/wall.png\fP as the wallpaper. +The system will always read the file \f(CW$XDG_CONFIG_HOME/wall.png\fP as the wallpaper. The script \f(CWsetbg\fP, if run on an image will set it as the persistent background. When using the file manager, you can simply hover over an image name and type \f(CWbg\fP and this will run \f(CWsetbg\fP. .HEADING 2 "How I change the colorscheme?" @@ -296,7 +296,7 @@ You can sync your mail by pressing \f(CWMod+F8\fP and you can set a cronjob to s .HEADING 2 "How do I set up my music?" .PP By default, mpd, the music daemon assumes that \f(CW~/Music\fP is your music directory. -This can be changed in \f(CW~/.config/mpd/mpd.conf\fP. +This can be changed in \f(CW$XDG_CONFIG_HOME/mpd/mpd.conf\fP. When you add music to your music folder, you may have to run \f(CWmpc up\fP in the terminal to update the database. mpd is controlled by ncmpcpp, which is accessible by \f(CWMod+m\fP. .HEADING 2 "How do I update LARBS?" diff --git a/.profile b/.profile index 74a99bfa..b62ae218 100644 --- a/.profile +++ b/.profile @@ -40,7 +40,7 @@ export LESS_TERMCAP_se="$(printf '%b' '')" export LESS_TERMCAP_us="$(printf '%b' '')" export LESS_TERMCAP_ue="$(printf '%b' '')" -[ ! -f ~/.config/shortcutrc ] && shortcuts >/dev/null 2>&1 +[ ! -f $XDG_CONFIG_HOME/shortcutrc ] && shortcuts >/dev/null 2>&1 # Start graphical server on tty1 if not already running. [ "$(tty)" = "/dev/tty1" ] && ! pgrep -x Xorg >/dev/null && exec startx diff --git a/.xprofile b/.xprofile index 677eff10..853aa584 100644 --- a/.xprofile +++ b/.xprofile @@ -10,7 +10,7 @@ dbus-update-activation-environment --systemd DBUS_SESSION_BUS_ADDRESS DISPLAY XA mpd & # music player daemon-you might prefer it as a service though remaps & # run the remaps script, switching caps/esc and more; check it for more info setbg & # set the background with the `setbg` script -#xrdb ~/.config/Xresources & # Uncomment to use Xresources colors/settings on startup +#xrdb $XDG_CONFIG_HOME/Xresources & # Uncomment to use Xresources colors/settings on startup xcompmgr & # xcompmgr for transparency $STATUSBAR & # start the statusbar dunst & # dunst for notifications diff --git a/README.md b/README.md index 069055d1..a7881481 100644 --- a/README.md +++ b/README.md @@ -18,11 +18,11 @@ These are the dotfiles deployed by [LARBS](https://larbs.xyz) and as seen on [my - tmux - other stuff like xdg default programs, inputrc and more, etc. - I try to minimize what's directly in `~` so: - - All configs that can be in `~/.config/` are. - - Some environmental variables have been set in `~/.zprofile` to move configs into `~/.config/` + - All configs that can be in `$XDG_CONFIG_HOME/` are. + - Some environmental variables have been set in `~/.zprofile` to move configs into `$XDG_CONFIG_HOME/` - Bookmarks in text files used by various scripts (like `~/.local/bin/shortcuts`) - - File bookmarks in `~/.config/files` - - Directory bookmarks in `~/.config/directories` + - File bookmarks in `$XDG_CONFIG_HOME/files` + - Directory bookmarks in `$XDG_CONFIG_HOME/directories` ## Want even more? From 2135dbdc4a4efe4337aacbba183968cbf0bd3c54 Mon Sep 17 00:00:00 2001 From: Dennis Lee Date: Sun, 5 Apr 2020 09:50:58 -0700 Subject: [PATCH 07/14] revert README.md to use hardcoded xdg paths --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index a7881481..069055d1 100644 --- a/README.md +++ b/README.md @@ -18,11 +18,11 @@ These are the dotfiles deployed by [LARBS](https://larbs.xyz) and as seen on [my - tmux - other stuff like xdg default programs, inputrc and more, etc. - I try to minimize what's directly in `~` so: - - All configs that can be in `$XDG_CONFIG_HOME/` are. - - Some environmental variables have been set in `~/.zprofile` to move configs into `$XDG_CONFIG_HOME/` + - All configs that can be in `~/.config/` are. + - Some environmental variables have been set in `~/.zprofile` to move configs into `~/.config/` - Bookmarks in text files used by various scripts (like `~/.local/bin/shortcuts`) - - File bookmarks in `$XDG_CONFIG_HOME/files` - - Directory bookmarks in `$XDG_CONFIG_HOME/directories` + - File bookmarks in `~/.config/files` + - Directory bookmarks in `~/.config/directories` ## Want even more? From 4da6d64600223bf8431416d944f0d1953ed01ef6 Mon Sep 17 00:00:00 2001 From: Dennis Lee Date: Sun, 5 Apr 2020 09:51:46 -0700 Subject: [PATCH 08/14] revert readme.mom to use hardcoded xdg paths --- .local/share/larbs/readme.mom | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.local/share/larbs/readme.mom b/.local/share/larbs/readme.mom index 03151a70..c46b1a82 100644 --- a/.local/share/larbs/readme.mom +++ b/.local/share/larbs/readme.mom @@ -64,7 +64,7 @@ Below in this document, there is information about where to change programs/comp .PP Additionally, while this isn't a part of the desktop environment, the default editing mode in the shell is using vi bindings. If you want to learn more of this, run \f(CWMod+Shift+E\fP and type and select the option for "vi mode in shell". -This setting can be changed if you don't like it by deleting or commenting out the contents of \f(CW$XDG_CONFIG_HOME/inputrc\fP. +This setting can be changed if you don't like it by deleting or commenting out the contents of \f(CW~/.config/inputrc\fP. .HEADING 2 "The Status Bar" .PP To the left, you'll see the numbers of your current workspace/tag(s). @@ -73,7 +73,7 @@ Each module on the right of the status bar is a script located in \f(CW~/.local/ You can see what they do and modify them from there. I'm sure you can figure it out. .PP -In i3, the program i3blocks controls what modules appear in the statusbar; its config file is in \f(CW$XDG_CONFIG_HOME/i3blocks/config\fP. +In i3, the program i3blocks controls what modules appear in the statusbar; its config file is in \f(CW~/.config/i3blocks/config\fP. .HEADING 2 "Deeper Tutorials" .PP Press \f(CWmod+shift+e\fP at any time to get a menu of programs to watch videos about streaming directly from YouTube. @@ -252,7 +252,7 @@ buttons, screen brightness, email, web browsing buttons, etc.) to what you would expect. .HEADING 1 "Configuration" .PP -Dotfiles/settings files are located in \f(CW$XDG_CONFIG_HOME/\fP, note that dotfiles to programs not included in LARBS are there as well by requests of users. I do not necessarily maintain all these dotfiles, but they remain as legacy. +Dotfiles/settings files are located in \f(CW~/.config/\fP, note that dotfiles to programs not included in LARBS are there as well by requests of users. I do not necessarily maintain all these dotfiles, but they remain as legacy. .PP Suckless programs, st (the terminal) and dmenu among others do not have traditional config files, but have their source code location in \f(CW~/.local/src/\fP. There you can modify their \f(CWconfig.h\fP files, then \f(CWsudo make install\fP to reinstall. @@ -278,7 +278,7 @@ In the Linux terminal, those binds have other more important purposes, so you ca Additionally, I've set vim to use the clipboard as the default buffer, which means when you copy or delete something in vim, it will be in your system clipboard as well, so you can \f(CWctrl-v\fP it into your browser instance, etc. You can also paste material copied from other programs into vim with the typical vim bindings. .HEADING 2 "How do I change the background/wallpaper?" .PP -The system will always read the file \f(CW$XDG_CONFIG_HOME/wall.png\fP as the wallpaper. +The system will always read the file \f(CW~/.config/wall.png\fP as the wallpaper. The script \f(CWsetbg\fP, if run on an image will set it as the persistent background. When using the file manager, you can simply hover over an image name and type \f(CWbg\fP and this will run \f(CWsetbg\fP. .HEADING 2 "How I change the colorscheme?" @@ -296,7 +296,7 @@ You can sync your mail by pressing \f(CWMod+F8\fP and you can set a cronjob to s .HEADING 2 "How do I set up my music?" .PP By default, mpd, the music daemon assumes that \f(CW~/Music\fP is your music directory. -This can be changed in \f(CW$XDG_CONFIG_HOME/mpd/mpd.conf\fP. +This can be changed in \f(CW~/.config/mpd/mpd.conf\fP. When you add music to your music folder, you may have to run \f(CWmpc up\fP in the terminal to update the database. mpd is controlled by ncmpcpp, which is accessible by \f(CWMod+m\fP. .HEADING 2 "How do I update LARBS?" From cd2a1633cf3c12f8f60cd9d05847b4b8e9e8096f Mon Sep 17 00:00:00 2001 From: Dennis Lee Date: Mon, 6 Apr 2020 10:39:36 -0700 Subject: [PATCH 09/14] use "~/.config" in .local/share/larbs/getkeys/sxiv --- .local/share/larbs/getkeys/sxiv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.local/share/larbs/getkeys/sxiv b/.local/share/larbs/getkeys/sxiv index 40310393..df5cb1e0 100644 --- a/.local/share/larbs/getkeys/sxiv +++ b/.local/share/larbs/getkeys/sxiv @@ -12,4 +12,4 @@ sxiv is the image viewer. r - Reload image if changed m - Mark/unmark image w - Zoom to fit window - ctrl-x - Run external command (see $XDG_CONFIG_HOME/sxiv/exec/key-handler for options) + ctrl-x - Run external command (see ~/.config/sxiv/exec/key-handler for options) From fb456c4d98ac44497294617411c1100943d14a40 Mon Sep 17 00:00:00 2001 From: Dennis Lee Date: Tue, 7 Apr 2020 21:47:39 -0700 Subject: [PATCH 10/14] statusbar weather HOME/.local/share:=XDG_DATA_HOME --- .local/bin/statusbar/weather | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.local/bin/statusbar/weather b/.local/bin/statusbar/weather index 0a501e3c..63415b4d 100755 --- a/.local/bin/statusbar/weather +++ b/.local/bin/statusbar/weather @@ -7,18 +7,18 @@ # You could set up a shell alias to view the full file in a pager in the # terminal if desired. This function will only be run once a day when needed. getforecast() { ping -q -c 1 1.1.1.1 >/dev/null && -curl -sf "wttr.in/$LOCATION" > "$HOME/.local/share/weatherreport" || exit 1 ;} +curl -sf "wttr.in/$LOCATION" > "$XDG_DATA_HOME/weatherreport" || exit 1 ;} # Some very particular and terse stream manipulation. We get the maximum # precipication chance and the daily high and low from the downloaded file and # display them with coresponding emojis. -showweather() { printf "%s" "$(sed '16q;d' "$HOME/.local/share/weatherreport" | +showweather() { printf "%s" "$(sed '16q;d' "$XDG_DATA_HOME/weatherreport" | grep -wo "[0-9]*%" | sort -rn | sed "s/^/☔ /g;1q" | tr -d '\n')" -sed '13q;d' "$HOME/.local/share/weatherreport" | grep -o "m\\([-+]\\)*[0-9]\\+" | sort -n -t 'm' -k 2n | sed -e 1b -e '$!d' | tr '\n|m' ' ' | awk '{print " ❄️",$1 "°","🌞",$2 "°"}' ;} +sed '13q;d' "$XDG_DATA_HOME/weatherreport" | grep -o "m\\([-+]\\)*[0-9]\\+" | sort -n -t 'm' -k 2n | sed -e 1b -e '$!d' | tr '\n|m' ' ' | awk '{print " ❄️",$1 "°","🌞",$2 "°"}' ;} # The BLOCK_BUTTON bloat for clicking in i3. case $BLOCK_BUTTON in - 1) $TERMINAL -e less -Srf "$HOME/.local/share/weatherreport" ;; + 1) $TERMINAL -e less -Srf "$XDG_DATA_HOME/weatherreport" ;; 2) getforecast && showweather ;; 3) pgrep -x dunst >/dev/null && notify-send "🌈 Weather module" "\- Left click for full forecast. - Middle click to update forecast. @@ -29,7 +29,7 @@ esac # The test if our forcecast is updated to the day. If it isn't download a new # weather report from wttr.in with the above function. -[ "$(stat -c %y "$HOME/.local/share/weatherreport" 2>/dev/null | cut -d' ' -f1)" = "$(date '+%Y-%m-%d')" ] || +[ "$(stat -c %y "$XDG_DATA_HOME/weatherreport" 2>/dev/null | cut -d' ' -f1)" = "$(date '+%Y-%m-%d')" ] || getforecast showweather From fd930553a31e4693502c5f41745bc76d5c8b172b Mon Sep 17 00:00:00 2001 From: Dennis Lee Date: Tue, 7 Apr 2020 19:48:39 -0700 Subject: [PATCH 11/14] aliasrc: clean up mbsync from ~/ --- .config/aliasrc | 1 + 1 file changed, 1 insertion(+) diff --git a/.config/aliasrc b/.config/aliasrc index 34bf437b..915690cc 100644 --- a/.config/aliasrc +++ b/.config/aliasrc @@ -44,3 +44,4 @@ alias \ magit="nvim -c MagitOnly" \ ref="shortcuts >/dev/null; source $XDG_CONFIG_HOME/shortcutrc" \ weath="less -S $XDG_DATA_HOME/weatherreport" \ + mbsync="mbsync -c $XDG_CONFIG_HOME/isync/mbsyncrc" From bcbfd066cf90cd5aa83225d468680473b8f66ad6 Mon Sep 17 00:00:00 2001 From: Dennis Lee Date: Wed, 8 Apr 2020 10:59:19 -0700 Subject: [PATCH 12/14] revert .mbsyncrc back to default location in ~ This reverts commit fd930553a31e4693502c5f41745bc76d5c8b172b. --- .config/aliasrc | 1 - 1 file changed, 1 deletion(-) diff --git a/.config/aliasrc b/.config/aliasrc index 915690cc..34bf437b 100644 --- a/.config/aliasrc +++ b/.config/aliasrc @@ -44,4 +44,3 @@ alias \ magit="nvim -c MagitOnly" \ ref="shortcuts >/dev/null; source $XDG_CONFIG_HOME/shortcutrc" \ weath="less -S $XDG_DATA_HOME/weatherreport" \ - mbsync="mbsync -c $XDG_CONFIG_HOME/isync/mbsyncrc" From 2c06dd36c61dea7383d2a12900eb83ee1751115a Mon Sep 17 00:00:00 2001 From: Luke Smith Date: Wed, 8 Apr 2020 17:06:21 -0400 Subject: [PATCH 13/14] shortcut to xresources --- .config/files | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.config/files b/.config/files index 6aee4602..54c5999d 100644 --- a/.config/files +++ b/.config/files @@ -5,7 +5,7 @@ cfa $XDG_CONFIG_HOME/aliasrc cfz $ZDOTDIR/.zshrc cfv $XDG_CONFIG_HOME/nvim/init.vim cfm $XDG_CONFIG_HOME/mutt/muttrc -cfd ~/.Xdefaults +cfx $XDG_CONFIG_HOME/Xresources cfu $XDG_CONFIG_HOME/newsboat/urls cfn $XDG_CONFIG_HOME/newsboat/config cfmb $XDG_CONFIG_HOME/ncmpcpp/bindings From 422d106fbab5505f3810fa845f4f71547c7a4332 Mon Sep 17 00:00:00 2001 From: Luke Smith Date: Wed, 8 Apr 2020 17:21:40 -0400 Subject: [PATCH 14/14] assume default values if xdg dirs not set --- .config/aliasrc | 4 ++-- .config/directories | 2 +- .config/files | 28 ++++++++++++++-------------- .config/i3/config | 2 +- .config/lf/lfrc | 10 +++++----- .config/mimeapps.list | 2 +- .config/mpd/mpd.conf | 12 ++++++------ .config/ncmpcpp/config | 9 ++------- .config/nvim/init.vim | 8 ++++---- .config/ranger/commands.py | 4 ++-- .config/ranger/luke_ranger_readme.md | 6 +++--- .config/ranger/rc.conf | 4 ++-- .config/sxhkd/sxhkdrc | 4 ++-- .config/sxiv/exec/key-handler | 4 ++-- .config/vifm/vifmrc | 2 +- .config/zsh/.zshrc | 4 ++-- .local/bin/cron/crontog | 2 +- .local/bin/dmenuunicode | 2 +- .local/bin/getkeys | 4 ++-- .local/bin/i3cmds/toggle-welcome | 2 +- .local/bin/podentr | 2 +- .local/bin/queueandnotify | 2 +- .local/bin/rssadd | 2 +- .local/bin/shortcuts | 10 +++++----- .local/bin/statusbar/clock | 2 +- .local/bin/statusbar/help | 2 +- .local/bin/statusbar/iplocate | 2 +- .local/bin/statusbar/mailbox | 2 +- .local/bin/statusbar/news | 2 +- .local/bin/statusbar/weather | 10 +++++----- .profile | 24 ++++++++++++------------ .xprofile | 2 +- 32 files changed, 86 insertions(+), 91 deletions(-) diff --git a/.config/aliasrc b/.config/aliasrc index 34bf437b..57b6f631 100644 --- a/.config/aliasrc +++ b/.config/aliasrc @@ -42,5 +42,5 @@ alias mpv="mpv --input-ipc-server=/tmp/mpvsoc$(date +%s)" # Some other stuff alias \ magit="nvim -c MagitOnly" \ - ref="shortcuts >/dev/null; source $XDG_CONFIG_HOME/shortcutrc" \ - weath="less -S $XDG_DATA_HOME/weatherreport" \ + ref="shortcuts >/dev/null; source ${XDG_CONFIG_HOME:$HOME/.config}/shortcutrc" \ + weath="less -S ${XDG_DATA_HOME:$HOME/.local/share}/weatherreport" \ diff --git a/.config/directories b/.config/directories index cd3aafb7..957590ee 100644 --- a/.config/directories +++ b/.config/directories @@ -5,6 +5,6 @@ D ~/Downloads m ~/Music pp ~/Pictures vv ~/Videos -cf $XDG_CONFIG_HOME +cf ${XDG_CONFIG_HOME:$HOME/.config} sc ~/.local/bin mn /mnt diff --git a/.config/files b/.config/files index 54c5999d..05da40c1 100644 --- a/.config/files +++ b/.config/files @@ -1,15 +1,15 @@ -bf $XDG_CONFIG_HOME/files -bd $XDG_CONFIG_HOME/directories -bw $XDG_CONFIG_HOME/bookmarks -cfa $XDG_CONFIG_HOME/aliasrc +bf ${XDG_CONFIG_HOME:$HOME/.config}/files +bd ${XDG_CONFIG_HOME:$HOME/.config}/directories +bw ${XDG_CONFIG_HOME:$HOME/.config}/bookmarks +cfa ${XDG_CONFIG_HOME:$HOME/.config}/aliasrc cfz $ZDOTDIR/.zshrc -cfv $XDG_CONFIG_HOME/nvim/init.vim -cfm $XDG_CONFIG_HOME/mutt/muttrc -cfx $XDG_CONFIG_HOME/Xresources -cfu $XDG_CONFIG_HOME/newsboat/urls -cfn $XDG_CONFIG_HOME/newsboat/config -cfmb $XDG_CONFIG_HOME/ncmpcpp/bindings -cfmc $XDG_CONFIG_HOME/ncmpcpp/config -cfk $XDG_CONFIG_HOME/sxhkd/sxhkdrc -cfi $XDG_CONFIG_HOME/i3/config -cfb $XDG_CONFIG_HOME/i3blocks/config +cfv ${XDG_CONFIG_HOME:$HOME/.config}/nvim/init.vim +cfm ${XDG_CONFIG_HOME:$HOME/.config}/mutt/muttrc +cfx ${XDG_CONFIG_HOME:$HOME/.config}/Xresources +cfu ${XDG_CONFIG_HOME:$HOME/.config}/newsboat/urls +cfn ${XDG_CONFIG_HOME:$HOME/.config}/newsboat/config +cfmb ${XDG_CONFIG_HOME:$HOME/.config}/ncmpcpp/bindings +cfmc ${XDG_CONFIG_HOME:$HOME/.config}/ncmpcpp/config +cfk ${XDG_CONFIG_HOME:$HOME/.config}/sxhkd/sxhkdrc +cfi ${XDG_CONFIG_HOME:$HOME/.config}/i3/config +cfb ${XDG_CONFIG_HOME:$HOME/.config}/i3blocks/config diff --git a/.config/i3/config b/.config/i3/config index e965b7cc..36c8aba1 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 $XDG_DATA_HOME/larbs/readme.mom -Tpdf | zathura - +bindsym $mod+F1 exec --no-startup-id groff -mom ${XDG_DATA_HOME:$HOME/.local/share}/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/lf/lfrc b/.config/lf/lfrc index 3b4cc14f..a201b68a 100644 --- a/.config/lf/lfrc +++ b/.config/lf/lfrc @@ -2,7 +2,7 @@ # Basic vars set shell sh -set previewer $XDG_CONFIG_HOME/lf/scope +set previewer ${XDG_CONFIG_HOME:$HOME/.config}/lf/scope set shellopts '-eu' set ifs "\n" set scrolloff 10 @@ -36,7 +36,7 @@ cmd delete ${{ cmd moveto ${{ set -f clear; echo "Move to where?" - dest="$(cut -d' ' -f2- $XDG_CONFIG_HOME/directories | fzf)" && + dest="$(cut -d' ' -f2- ${XDG_CONFIG_HOME:$HOME/.config}/directories | fzf)" && eval mv -iv $fx $dest && notify-send "🚚 File(s) moved." "File(s) moved to $dest." }} @@ -44,7 +44,7 @@ cmd moveto ${{ cmd copyto ${{ set -f clear; echo "Copy to where?" - dest="$(cut -d' ' -f2- $XDG_CONFIG_HOME/directories | fzf)" && + dest="$(cut -d' ' -f2- ${XDG_CONFIG_HOME:$HOME/.config}/directories | fzf)" && eval cp -ivr $fx $dest && notify-send "📋 File(s) copied." "File(s) copies to $dest." }} @@ -54,9 +54,9 @@ cmd bulkrename ${{ }} # Bindings -map c $lf -remote "send $id cd $(cut -d' ' -f2 $XDG_CONFIG_HOME/directories | fzf)" +map c $lf -remote "send $id cd $(cut -d' ' -f2 ${XDG_CONFIG_HOME:$HOME/.config}/directories | fzf)" map $lf -remote "send $id select '$(fzf)'" -map J $lf -remote "send $id cd $(cut -d' ' -f2 $XDG_CONFIG_HOME/directories | fzf)" +map J $lf -remote "send $id cd $(cut -d' ' -f2 ${XDG_CONFIG_HOME:$HOME/.config}/directories | fzf)" map gh map g top map D delete diff --git a/.config/mimeapps.list b/.config/mimeapps.list index 5c1c093e..30988ccf 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 $XDG_DATA_HOME/applications/ +# These .desktop entries can also be seen and changed in ~/.local/share/applications/ text/x-shellscript=text.desktop; x-scheme-handler/magnet=torrent.desktop; diff --git a/.config/mpd/mpd.conf b/.config/mpd/mpd.conf index 8a30ca5f..521b9a66 100644 --- a/.config/mpd/mpd.conf +++ b/.config/mpd/mpd.conf @@ -1,10 +1,10 @@ -db_file "$XDG_CONFIG_HOME/mpd/database" -log_file "$XDG_CONFIG_HOME/mpd/log" +db_file "${XDG_CONFIG_HOME:$HOME/.config}/mpd/database" +log_file "${XDG_CONFIG_HOME:$HOME/.config}/mpd/log" music_directory "~/Music" -playlist_directory "$XDG_CONFIG_HOME/mpd/playlists" -pid_file "$XDG_CONFIG_HOME/mpd/pid" -state_file "$XDG_CONFIG_HOME/mpd/state" -sticker_file "$XDG_CONFIG_HOME/mpd/sticker.sql" +playlist_directory "${XDG_CONFIG_HOME:$HOME/.config}/mpd/playlists" +pid_file "${XDG_CONFIG_HOME:$HOME/.config}/mpd/pid" +state_file "${XDG_CONFIG_HOME:$HOME/.config}/mpd/state" +sticker_file "${XDG_CONFIG_HOME:$HOME/.config}/mpd/sticker.sql" auto_update "yes" diff --git a/.config/ncmpcpp/config b/.config/ncmpcpp/config index d2e11326..c9bccedc 100644 --- a/.config/ncmpcpp/config +++ b/.config/ncmpcpp/config @@ -1,16 +1,11 @@ -############################################################################## -## This is the example configuration file. Copy it to $HOME/.ncmpcpp/config ## -## or $XDG_CONFIG_HOME/ncmpcpp/config and set up your preferences. ## -############################################################################## -# -ncmpcpp_directory = $XDG_CONFIG_HOME/ncmpcpp +ncmpcpp_directory = ${XDG_CONFIG_HOME:$HOME/.config}/ncmpcpp # ## ## Directory for storing downloaded lyrics. It defaults to ~/.lyrics since other ## MPD clients (eg. ncmpc) also use that location. ## # -lyrics_directory = $XDG_DATA_HOME/lyrics +lyrics_directory = ${XDG_DATA_HOME:$HOME/.local/share}/lyrics # ##### connection settings ##### # diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim index ae94ae1d..d0b2c97f 100644 --- a/.config/nvim/init.vim +++ b/.config/nvim/init.vim @@ -1,13 +1,13 @@ let mapleader ="," -if ! filereadable(expand('$XDG_CONFIG_HOME/nvim/autoload/plug.vim')) +if ! filereadable(expand('${XDG_CONFIG_HOME:$HOME/.config}/nvim/autoload/plug.vim')) echo "Downloading junegunn/vim-plug to manage plugins..." - silent !mkdir -p $XDG_CONFIG_HOME/nvim/autoload/ - silent !curl "https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim" > $XDG_CONFIG_HOME/nvim/autoload/plug.vim + silent !mkdir -p ${XDG_CONFIG_HOME:$HOME/.config}/nvim/autoload/ + silent !curl "https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim" > ${XDG_CONFIG_HOME:$HOME/.config}/nvim/autoload/plug.vim autocmd VimEnter * PlugInstall endif -call plug#begin('$XDG_CONFIG_HOME/nvim/plugged') +call plug#begin('${XDG_CONFIG_HOME:$HOME/.config}/nvim/plugged') Plug 'tpope/vim-surround' Plug 'scrooloose/nerdtree' Plug 'junegunn/goyo.vim' diff --git a/.config/ranger/commands.py b/.config/ranger/commands.py index 5b1acd2d..c1c74193 100755 --- a/.config/ranger/commands.py +++ b/.config/ranger/commands.py @@ -38,7 +38,7 @@ class my_edit(Command): # reference to the currently selected file. target_filename = self.fm.thisfile.path - # This is a generic function to print text in ranger. + # This is a generic function to print text in ranger. self.fm.notify("Let's edit the file " + target_filename + "!") # Using bad=True in fm.notify allows you to print error messages: @@ -60,7 +60,7 @@ class my_edit(Command): # https://github.com/ranger/ranger/wiki/Integrating-File-Search-with-fzf -# Now, simply bind this function to a key, by adding this to your $XDG_CONFIG_HOME/ranger/rc.conf: map fzf_select +# Now, simply bind this function to a key, by adding this to your ~/.config/ranger/rc.conf: map fzf_select class fzf_select(Command): """ :fzf_select diff --git a/.config/ranger/luke_ranger_readme.md b/.config/ranger/luke_ranger_readme.md index f6ee93fc..45111514 100644 --- a/.config/ranger/luke_ranger_readme.md +++ b/.config/ranger/luke_ranger_readme.md @@ -32,10 +32,10 @@ These "verbs" take "nouns" or "arguments," like these: + d -- "~/Documents" + D -- "~/Downloads" -+ cf -- "$XDG_CONFIG_HOME" ++ cf -- "~/.config" + And many others, including those you add to `~/.bmdirs`. -Press any "verb" followed by any "argument" to perform a folder operation. "gd" will cd to ~/Documents, for example. "mD" will move the selected file(s) to ~/Downloads. "tcf" will create a new tab in $XDG_CONFIG_HOME, etc. etc. +Press any "verb" followed by any "argument" to perform a folder operation. "gd" will cd to ~/Documents, for example. "mD" will move the selected file(s) to ~/Downloads. "tcf" will create a new tab in ~/.config, etc. etc. ## Many little additions! @@ -60,7 +60,7 @@ Press any "verb" followed by any "argument" to perform a folder operation. "gd" + Txs -- copy slideshow/beamer template to new file + Txh -- copy handout template to new file + Image commands: - + bg -- (for i3 users) makes an image your background (assuming i3 is looking at $XDG_CONFIG_HOME/wall.png for your background) + + bg -- makes an image your background (assuming i3 is looking at ~/.local/share/bg for your background) + bw -- runs Pywal on the selected image, making it your background and generating a color scheme based off of it. + C -- rotates an image (requires imagemagick) + F -- flips an image (requires imagemagick) diff --git a/.config/ranger/rc.conf b/.config/ranger/rc.conf index ff0d5069..c8b5c1ac 100644 --- a/.config/ranger/rc.conf +++ b/.config/ranger/rc.conf @@ -5,7 +5,7 @@ set column_ratios 1,3,4 set hidden_filter ^\.|\.(?:pyc|vrb|pyo|lof|bak|swp|aux|log|nav|out|snm|toc|bcf|run\.xml|synctex\.gz|blg|bbl)$|^lost\+found$|^__(py)?cache__$ set show_hidden false set confirm_on_delete multiple -set preview_script $XDG_CONFIG_HOME/ranger/scope.sh +set preview_script ${XDG_CONFIG_HOME:$HOME/.config}/ranger/scope.sh set use_preview_script true set automatically_count_files true set open_all_images true @@ -505,4 +505,4 @@ map Tn eval fm.open_console('shell eyeD3 -n "" ' + fm.thisfile.relative_path, po #Downloading map ytv console shell youtube-dl -ic%space map yta console shell youtube-dl -xic%space -source $XDG_CONFIG_HOME/ranger/shortcuts.conf +source ${XDG_CONFIG_HOME:$HOME/.config}/ranger/shortcuts.conf diff --git a/.config/sxhkd/sxhkdrc b/.config/sxhkd/sxhkdrc index c07d7809..a43e582b 100644 --- a/.config/sxhkd/sxhkdrc +++ b/.config/sxhkd/sxhkdrc @@ -137,10 +137,10 @@ XF86MyComputer # Function keys super + shift + F1 - grep LARBSWELCOME ~/.xprofile && ( sed -i "/LARBSWELCOME/d" ~/.xprofile && notify-send "LARBS welcome message" "Welcome message disabled. Press Super+Shift+F1 again to reverse." ) || ( echo "notify-send -i "$XDG_DATA_HOME/larbs/larbs.png" \"Welcome to LARBS\" \"Press super+F1 for the help menu.\" # LARBSWELCOME" >> ~/.xprofile && notify-send "LARBS welcome message" "Welcome message re-enabled." ) + grep LARBSWELCOME ~/.xprofile && ( sed -i "/LARBSWELCOME/d" ~/.xprofile && notify-send "LARBS welcome message" "Welcome message disabled. Press Super+Shift+F1 again to reverse." ) || ( echo "notify-send -i "${XDG_DATA_HOME:$HOME/.local/share}/larbs/larbs.png" \"Welcome to LARBS\" \"Press super+F1 for the help menu.\" # LARBSWELCOME" >> ~/.xprofile && notify-send "LARBS welcome message" "Welcome message re-enabled." ) # Show readme super + F1 - groff -mom $XDG_DATA_HOME/larbs/readme.mom -Tpdf | zathura - + groff -mom ${XDG_DATA_HOME:$HOME/.local/share}/larbs/readme.mom -Tpdf | zathura - # F2 restarts either dwm or i3 and is bound in each. # Change display super + F3 diff --git a/.config/sxiv/exec/key-handler b/.config/sxiv/exec/key-handler index 279f9f6e..796b0912 100755 --- a/.config/sxiv/exec/key-handler +++ b/.config/sxiv/exec/key-handler @@ -4,13 +4,13 @@ do case "$1" in "w") setbg "$file" & ;; "c") - [ -z "$destdir" ] && destdir="$(sed "s/\s.*#.*$//;/^\s*$/d" $XDG_CONFIG_HOME/directories | awk '{print $2}' | dmenu -l 20 -i -p "Copy file(s) to where?" | sed "s|~|$HOME|g")" + [ -z "$destdir" ] && destdir="$(sed "s/\s.*#.*$//;/^\s*$/d" ${XDG_CONFIG_HOME:$HOME/.config}/directories | awk '{print $2}' | dmenu -l 20 -i -p "Copy file(s) to where?" | sed "s|~|$HOME|g")" [ -z "$destdir" ] && exit [ ! -d "$destdir" ] && notify-send "$destdir is not a directory, cancelled." && exit cp "$file" "$destdir" && notify-send -i "$(readlink -f "$file")" "$file copied to $destdir." & ;; "m") - [ -z "$destdir" ] && destdir="$(sed "s/\s.*#.*$//;/^\s*$/d" $XDG_CONFIG_HOME/directories | awk '{print $2}' | dmenu -l 20 -i -p "Move file(s) to where?" | sed "s|~|$HOME|g")" + [ -z "$destdir" ] && destdir="$(sed "s/\s.*#.*$//;/^\s*$/d" ${XDG_CONFIG_HOME:$HOME/.config}/directories | awk '{print $2}' | dmenu -l 20 -i -p "Move file(s) to where?" | sed "s|~|$HOME|g")" [ -z "$destdir" ] && exit [ ! -d "$destdir" ] && notify-send "$destdir is not a directory, cancelled." && exit mv "$file" "$destdir" && notify-send -i "$(readlink -f "$file")" "$file moved to $destdir." & diff --git a/.config/vifm/vifmrc b/.config/vifm/vifmrc index ed77ea83..cba88df2 100644 --- a/.config/vifm/vifmrc +++ b/.config/vifm/vifmrc @@ -1,5 +1,5 @@ " vim: filetype=vifm -source $XDG_CONFIG_HOME/vifm/vifmshortcuts +source ${XDG_CONFIG_HOME:$HOME/.config}/vifm/vifmshortcuts set vicmd=$EDITOR set syscalls diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc index 679dc932..18f18822 100644 --- a/.config/zsh/.zshrc +++ b/.config/zsh/.zshrc @@ -12,8 +12,8 @@ SAVEHIST=10000 HISTFILE=~/.cache/zsh/history # Load aliases and shortcuts if existent. -[ -f "$XDG_CONFIG_HOME/shortcutrc" ] && source "$XDG_CONFIG_HOME/shortcutrc" -[ -f "$XDG_CONFIG_HOME/aliasrc" ] && source "$XDG_CONFIG_HOME/aliasrc" +[ -f "${XDG_CONFIG_HOME:$HOME/.config}/shortcutrc" ] && source "${XDG_CONFIG_HOME:$HOME/.config}/shortcutrc" +[ -f "${XDG_CONFIG_HOME:$HOME/.config}/aliasrc" ] && source "${XDG_CONFIG_HOME:$HOME/.config}/aliasrc" # Basic auto/tab complete: autoload -U compinit diff --git a/.local/bin/cron/crontog b/.local/bin/cron/crontog index 9889d769..565c5e25 100755 --- a/.local/bin/cron/crontog +++ b/.local/bin/cron/crontog @@ -3,4 +3,4 @@ # Toggles all cronjobs off/on. # Stores disabled crontabs in ~/.consaved until restored. -([ -f $XDG_CONFIG_HOME/cronsaved ] && crontab - < $XDG_CONFIG_HOME/cronsaved && rm $XDG_CONFIG_HOME/cronsaved && notify-send "🕓 Cronjobs re-enabled.") || ( crontab -l > $XDG_CONFIG_HOME/cronsaved && crontab -r && notify-send "🕓 Cronjobs saved and disabled.") +([ -f ${XDG_CONFIG_HOME:$HOME/.config}/cronsaved ] && crontab - < ${XDG_CONFIG_HOME:$HOME/.config}/cronsaved && rm ${XDG_CONFIG_HOME:$HOME/.config}/cronsaved && notify-send "🕓 Cronjobs re-enabled.") || ( crontab -l > ${XDG_CONFIG_HOME:$HOME/.config}/cronsaved && crontab -r && notify-send "🕓 Cronjobs saved and disabled.") diff --git a/.local/bin/dmenuunicode b/.local/bin/dmenuunicode index df8c7a03..6740be4f 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 $XDG_DATA_HOME/larbs/emoji | dmenu -i -l 20 | sed "s/ .*//") +chosen=$(cut -d ';' -f1 ${XDG_DATA_HOME:$HOME/.local/share}/larbs/emoji | dmenu -i -l 20 | sed "s/ .*//") [ "$chosen" != "" ] || exit diff --git a/.local/bin/getkeys b/.local/bin/getkeys index 0a12d22d..a1113f10 100755 --- a/.local/bin/getkeys +++ b/.local/bin/getkeys @@ -1,5 +1,5 @@ #!/bin/sh -cat $XDG_DATA_HOME/larbs/getkeys/"$1" 2>/dev/null && exit +cat ${XDG_DATA_HOME:$HOME/.local/share}/larbs/getkeys/"$1" 2>/dev/null && exit echo "Run command with one of the following arguments for info about that program:" -ls $XDG_DATA_HOME/larbs/getkeys +ls ${XDG_DATA_HOME:$HOME/.local/share}/larbs/getkeys diff --git a/.local/bin/i3cmds/toggle-welcome b/.local/bin/i3cmds/toggle-welcome index d8cc0eff..1f08eb10 100755 --- a/.local/bin/i3cmds/toggle-welcome +++ b/.local/bin/i3cmds/toggle-welcome @@ -2,7 +2,7 @@ # Toggles the LARBS welcome message. -PIC="$XDG_DATA_HOME/larbs/larbs.png" +PIC="${XDG_DATA_HOME:$HOME/.local/share}/larbs/larbs.png" grep LARBSWELCOME "$HOME/.xprofile" && ( sed -i "/LARBSWELCOME/d" ~/.xprofile && notify-send -i "$PIC" "LARBS welcome message" "Welcome message disabled. Press Super+Shift+F1 again to reverse." ) || diff --git a/.local/bin/podentr b/.local/bin/podentr index 5bdc0ca3..e2fec469 100755 --- a/.local/bin/podentr +++ b/.local/bin/podentr @@ -4,4 +4,4 @@ [ "$(pgrep -x $(basename $0) | wc -l)" -gt 2 ] && exit -echo $XDG_DATA_HOME/newsboat/queue | entr -p queueandnotify 2>/dev/null +echo ${XDG_DATA_HOME:$HOME/.local/share}/newsboat/queue | entr -p queueandnotify 2>/dev/null diff --git a/.local/bin/queueandnotify b/.local/bin/queueandnotify index 24746c8b..002c2a34 100755 --- a/.local/bin/queueandnotify +++ b/.local/bin/queueandnotify @@ -3,7 +3,7 @@ # Podboat sucks. This script replaces it. # It reads the newsboat queue, queuing downloads with taskspooler. # It also removes the junk from extentions. -queuefile="$XDG_DATA_HOME/newsboat/queue" +queuefile="${XDG_DATA_HOME:$HOME/.local/share}/newsboat/queue" while read -r line; do [ -z "$line" ] && continue diff --git a/.local/bin/rssadd b/.local/bin/rssadd index 9dcdd7b3..924ee525 100755 --- a/.local/bin/rssadd +++ b/.local/bin/rssadd @@ -2,7 +2,7 @@ ! echo "$1" | grep "https*://\S\+\.[A-Za-z]\+\S*" >/dev/null && notify-send "That doesn't look like a full URL." && exit -RSSFILE="$XDG_CONFIG_HOME/newsboat/urls" +RSSFILE="${XDG_CONFIG_HOME:$HOME/.config}/newsboat/urls" if awk '{print $1}' "$RSSFILE" | grep "^$1$" >/dev/null; then notify-send "You already have this RSS feed." else diff --git a/.local/bin/shortcuts b/.local/bin/shortcuts index 112d1405..6ef9ce4d 100755 --- a/.local/bin/shortcuts +++ b/.local/bin/shortcuts @@ -1,11 +1,11 @@ #!/usr/bin/env bash # Output locations. Unactivated progs should go to /dev/null. -shell_shortcuts="$XDG_CONFIG_HOME/shortcutrc" -ranger_shortcuts="$XDG_CONFIG_HOME/ranger/shortcuts.conf" +shell_shortcuts="${XDG_CONFIG_HOME:$HOME/.config}/shortcutrc" +ranger_shortcuts="${XDG_CONFIG_HOME:$HOME/.config}/ranger/shortcuts.conf" qute_shortcuts="/dev/null" fish_shortcuts="/dev/null" -vifm_shortcuts="$XDG_CONFIG_HOME/vifm/vifmshortcuts" +vifm_shortcuts="${XDG_CONFIG_HOME:$HOME/.config}/vifm/vifmshortcuts" # Remove, prepare files rm -f "$ranger_shortcuts" "$qute_shortcuts" 2>/dev/null @@ -14,14 +14,14 @@ printf "# vim: filetype=sh\\nalias " > "$shell_shortcuts" printf "\" vim: filetype=vim\\n" > "$vifm_shortcuts" # Format the `directories` file in the correct syntax and sent it to all three configs. -sed "s/\s*#.*$//;/^\s*$/d" "$XDG_CONFIG_HOME/directories" | tee >(awk '{print $1"=\"cd "$2" && ls -a\" \\"}' >> "$shell_shortcuts") \ +sed "s/\s*#.*$//;/^\s*$/d" "${XDG_CONFIG_HOME:$HOME/.config}/directories" | tee >(awk '{print $1"=\"cd "$2" && ls -a\" \\"}' >> "$shell_shortcuts") \ >(awk '{print "abbr", $1, "\"cd " $2 "; and ls -a\""}' >> "$fish_shortcuts") \ >(awk '{print "map g" $1, ":cd", $2 "\nmap t" $1, ":cd", $2 "\nmap M" $1, ":cd", $2 ":mo\nmap Y" $1, ":cd", $2 ":co" }' >> "$vifm_shortcuts") \ >(awk '{print "config.bind(\";"$1"\", \"set downloads.location.directory "$2" ;; hint links download\")"}' >> "$qute_shortcuts") \ | awk '{print "map g"$1" cd "$2"\nmap t"$1" tab_new "$2"\nmap m"$1" shell mv -v %s "$2"\nmap Y"$1" shell cp -rv %s "$2}' >> "$ranger_shortcuts" # Format the `files` file in the correct syntax and sent it to both configs. -sed "s/\s*#.*$//;/^\s*$/d" "$XDG_CONFIG_HOME/files" | tee >(awk '{print $1"=\"$EDITOR "$2"\" \\"}' >> "$shell_shortcuts") \ +sed "s/\s*#.*$//;/^\s*$/d" "${XDG_CONFIG_HOME:$HOME/.config}/files" | tee >(awk '{print $1"=\"$EDITOR "$2"\" \\"}' >> "$shell_shortcuts") \ >(awk '{print "abbr", $1, "\"$EDITOR "$2"\""}' >> "$fish_shortcuts") \ >(awk '{print "map", $1, ":e", $2 "" }' >> "$vifm_shortcuts") \ | awk '{print "map "$1" shell $EDITOR "$2}' >> "$ranger_shortcuts" diff --git a/.local/bin/statusbar/clock b/.local/bin/statusbar/clock index f412bcb9..e33cfee7 100755 --- a/.local/bin/statusbar/clock +++ b/.local/bin/statusbar/clock @@ -4,7 +4,7 @@ date '+%Y %b %d (%a) %I:%M%p' case $BLOCK_BUTTON in 1) pgrep -x dunst >/dev/null && notify-send "This Month" "$(cal --color=always | sed "s/..7m//;s/..27m/<\/span><\/b>/")" && notify-send "Appointments" "$(calcurse -d3)" ;; - 2) $TERMINAL -e calcurse -D $XDG_CONFIG_HOME/calcurse ;; + 2) $TERMINAL -e calcurse -D ${XDG_CONFIG_HOME:$HOME/.config}/calcurse ;; 3) pgrep -x dunst >/dev/null && notify-send "📅 Time/date module" "\- Left click to show upcoming appointments for the next three days via \`calcurse -d3\` and show the month via \`cal\` - Middle click opens calcurse if installed" ;; esac diff --git a/.local/bin/statusbar/help b/.local/bin/statusbar/help index d58f5cca..d05a90c8 100755 --- a/.local/bin/statusbar/help +++ b/.local/bin/statusbar/help @@ -1,7 +1,7 @@ #!/bin/sh case $BLOCK_BUTTON in - 1) groff -mom $XDG_DATA_HOME/larbs/readme.mom -Tpdf | zathura - ;; + 1) groff -mom ${XDG_DATA_HOME:$HOME/.local/share}/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/iplocate b/.local/bin/statusbar/iplocate index 6d1038cb..2f1b08b6 100755 --- a/.local/bin/statusbar/iplocate +++ b/.local/bin/statusbar/iplocate @@ -6,4 +6,4 @@ # https://www.maketecheasier.com/ip-address-geolocation-lookups-linux/ ifinstalled "geoiplookup" || exit addr="$(curl ifconfig.me 2>/dev/null)" || exit -grep "flag: " $XDG_CONFIG_HOME/emoji | grep "$(geoiplookup $addr | sed 's/.*, //')" | sed "s/flag: //;s/;.*//" +grep "flag: " ${XDG_CONFIG_HOME:$HOME/.config}/emoji | grep "$(geoiplookup $addr | sed 's/.*, //')" | sed "s/flag: //;s/;.*//" diff --git a/.local/bin/statusbar/mailbox b/.local/bin/statusbar/mailbox index 72d45111..28deb45b 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 $XDG_DATA_HOME/mail/*/INBOX/new/* -type f | wc -l 2>/dev/null)" +unread="$(find ${XDG_DATA_HOME:$HOME/.local/share}/mail/*/INBOX/new/* -type f | wc -l 2>/dev/null)" icon="$(cat "/tmp/imapsyncicon_$USER")" diff --git a/.local/bin/statusbar/news b/.local/bin/statusbar/news index e72ef570..85fed45d 100755 --- a/.local/bin/statusbar/news +++ b/.local/bin/statusbar/news @@ -14,4 +14,4 @@ case $BLOCK_BUTTON in Note: Only one instance of newsboat (including updates) may be running at a time." ;; esac - cat /tmp/newsupdate 2>/dev/null || echo "$(newsboat -x print-unread | awk '{ print "📰 " $1}' | sed s/^0$//g)$(cat $XDG_CONFIG_HOME/newsboat/.update 2>/dev/null)" + cat /tmp/newsupdate 2>/dev/null || echo "$(newsboat -x print-unread | awk '{ print "📰 " $1}' | sed s/^0$//g)$(cat ${XDG_CONFIG_HOME:$HOME/.config}/newsboat/.update 2>/dev/null)" diff --git a/.local/bin/statusbar/weather b/.local/bin/statusbar/weather index 63415b4d..8c85857a 100755 --- a/.local/bin/statusbar/weather +++ b/.local/bin/statusbar/weather @@ -7,18 +7,18 @@ # You could set up a shell alias to view the full file in a pager in the # terminal if desired. This function will only be run once a day when needed. getforecast() { ping -q -c 1 1.1.1.1 >/dev/null && -curl -sf "wttr.in/$LOCATION" > "$XDG_DATA_HOME/weatherreport" || exit 1 ;} +curl -sf "wttr.in/$LOCATION" > "${XDG_DATA_HOME:$HOME/.local/share}/weatherreport" || exit 1 ;} # Some very particular and terse stream manipulation. We get the maximum # precipication chance and the daily high and low from the downloaded file and # display them with coresponding emojis. -showweather() { printf "%s" "$(sed '16q;d' "$XDG_DATA_HOME/weatherreport" | +showweather() { printf "%s" "$(sed '16q;d' "${XDG_DATA_HOME:$HOME/.local/share}/weatherreport" | grep -wo "[0-9]*%" | sort -rn | sed "s/^/☔ /g;1q" | tr -d '\n')" -sed '13q;d' "$XDG_DATA_HOME/weatherreport" | grep -o "m\\([-+]\\)*[0-9]\\+" | sort -n -t 'm' -k 2n | sed -e 1b -e '$!d' | tr '\n|m' ' ' | awk '{print " ❄️",$1 "°","🌞",$2 "°"}' ;} +sed '13q;d' "${XDG_DATA_HOME:$HOME/.local/share}/weatherreport" | grep -o "m\\([-+]\\)*[0-9]\\+" | sort -n -t 'm' -k 2n | sed -e 1b -e '$!d' | tr '\n|m' ' ' | awk '{print " ❄️",$1 "°","🌞",$2 "°"}' ;} # The BLOCK_BUTTON bloat for clicking in i3. case $BLOCK_BUTTON in - 1) $TERMINAL -e less -Srf "$XDG_DATA_HOME/weatherreport" ;; + 1) $TERMINAL -e less -Srf "${XDG_DATA_HOME:$HOME/.local/share}/weatherreport" ;; 2) getforecast && showweather ;; 3) pgrep -x dunst >/dev/null && notify-send "🌈 Weather module" "\- Left click for full forecast. - Middle click to update forecast. @@ -29,7 +29,7 @@ esac # The test if our forcecast is updated to the day. If it isn't download a new # weather report from wttr.in with the above function. -[ "$(stat -c %y "$XDG_DATA_HOME/weatherreport" 2>/dev/null | cut -d' ' -f1)" = "$(date '+%Y-%m-%d')" ] || +[ "$(stat -c %y "${XDG_DATA_HOME:$HOME/.local/share}/weatherreport" 2>/dev/null | cut -d' ' -f1)" = "$(date '+%Y-%m-%d')" ] || getforecast showweather diff --git a/.profile b/.profile index fdc94ec0..d067c73c 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 $XDG_DATA_HOME/larbs/wm -export LARBSWM="$(cat $XDG_DATA_HOME/larbs/wm 2>/dev/null)" && +# Get default LARBS WM from ${XDG_DATA_HOME:$HOME/.local/share}/larbs/wm +export LARBSWM="$(cat ${XDG_DATA_HOME:$HOME/.local/share}/larbs/wm 2>/dev/null)" && [ "$LARBSWM" = "dwm" ] || export LARBSWM="i3" # Default programs: @@ -19,16 +19,16 @@ eval "$(sed 's/^[^#].*/export &/g;t;d' ~/.config/user-dirs.dirs)" # ~/ Clean-up: #export XAUTHORITY="$XDG_RUNTIME_DIR/Xauthority" # This line will break some DMs. -export NOTMUCH_CONFIG="$XDG_CONFIG_HOME/notmuch-config" -export GTK2_RC_FILES="$XDG_CONFIG_HOME/gtk-2.0/gtkrc-2.0" +export NOTMUCH_CONFIG="${XDG_CONFIG_HOME:$HOME/.config}/notmuch-config" +export GTK2_RC_FILES="${XDG_CONFIG_HOME:$HOME/.config}/gtk-2.0/gtkrc-2.0" export LESSHISTFILE="-" -export WGETRC="$XDG_CONFIG_HOME/wget/wgetrc" -export INPUTRC="$XDG_CONFIG_HOME/inputrc" -export ZDOTDIR="$XDG_CONFIG_HOME/zsh" -export PASSWORD_STORE_DIR="$XDG_DATA_HOME/password-store" +export WGETRC="${XDG_CONFIG_HOME:$HOME/.config}/wget/wgetrc" +export INPUTRC="${XDG_CONFIG_HOME:$HOME/.config}/inputrc" +export ZDOTDIR="${XDG_CONFIG_HOME:$HOME/.config}/zsh" +export PASSWORD_STORE_DIR="${XDG_DATA_HOME:$HOME/.local/share}/password-store" export TMUX_TMPDIR="$XDG_RUNTIME_DIR" -export ANDROID_SDK_HOME="$XDG_CONFIG_HOME/android" -export CARGO_HOME="$XDG_DATA_HOME/cargo" +export ANDROID_SDK_HOME="${XDG_CONFIG_HOME:$HOME/.config}/android" +export CARGO_HOME="${XDG_DATA_HOME:$HOME/.local/share}/cargo" # Other program settings: export DICS="/usr/share/stardict/dic/" @@ -43,10 +43,10 @@ export LESS_TERMCAP_se="$(printf '%b' '')" export LESS_TERMCAP_us="$(printf '%b' '')" export LESS_TERMCAP_ue="$(printf '%b' '')" -[ ! -f $XDG_CONFIG_HOME/shortcutrc ] && shortcuts >/dev/null 2>&1 +[ ! -f ${XDG_CONFIG_HOME:$HOME/.config}/shortcutrc ] && shortcuts >/dev/null 2>&1 # Start graphical server on tty1 if not already running. [ "$(tty)" = "/dev/tty1" ] && ! pgrep -x Xorg >/dev/null && exec startx # Switch escape and caps if tty and no passwd required: -sudo -n loadkeys $XDG_DATA_HOME/larbs/ttymaps.kmap 2>/dev/null +sudo -n loadkeys ${XDG_DATA_HOME:$HOME/.local/share}/larbs/ttymaps.kmap 2>/dev/null diff --git a/.xprofile b/.xprofile index 853aa584..2f812e58 100644 --- a/.xprofile +++ b/.xprofile @@ -10,7 +10,7 @@ dbus-update-activation-environment --systemd DBUS_SESSION_BUS_ADDRESS DISPLAY XA mpd & # music player daemon-you might prefer it as a service though remaps & # run the remaps script, switching caps/esc and more; check it for more info setbg & # set the background with the `setbg` script -#xrdb $XDG_CONFIG_HOME/Xresources & # Uncomment to use Xresources colors/settings on startup +#xrdb ${XDG_CONFIG_HOME:$HOME/.config}/Xresources & # Uncomment to use Xresources colors/settings on startup xcompmgr & # xcompmgr for transparency $STATUSBAR & # start the statusbar dunst & # dunst for notifications