commit 9fe6802122f6e0392c7fe20eefd30437771d7f8e
parent 7f334ff4b902e7cfbc8cb824e59510b752e7a754
Author: Luke Smith <luke@lukesmith.xyz>
Date: Wed, 8 Apr 2020 19:10:00 -0400
oops for config
Diffstat:
19 files changed, 57 insertions(+), 57 deletions(-)
diff --git 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:$HOME/.config}/shortcutrc" \
+ 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
@@ -5,6 +5,6 @@ D ~/Downloads
m ~/Music
pp ~/Pictures
vv ~/Videos
-cf ${XDG_CONFIG_HOME:$HOME/.config}
+cf ${XDG_CONFIG_HOME:-$HOME/.config}
sc ~/.local/bin
mn /mnt
diff --git a/.config/files b/.config/files
@@ -1,15 +1,15 @@
-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
+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:$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
+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/lf/lfrc b/.config/lf/lfrc
@@ -2,7 +2,7 @@
# Basic vars
set shell sh
-set previewer ${XDG_CONFIG_HOME:$HOME/.config}/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:$HOME/.config}/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:$HOME/.config}/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:$HOME/.config}/directories | fzf)"
+map c $lf -remote "send $id cd $(cut -d' ' -f2 ${XDG_CONFIG_HOME:-$HOME/.config}/directories | fzf)"
map <c-f> $lf -remote "send $id select '$(fzf)'"
-map J $lf -remote "send $id cd $(cut -d' ' -f2 ${XDG_CONFIG_HOME:$HOME/.config}/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/mpd/mpd.conf b/.config/mpd/mpd.conf
@@ -1,10 +1,10 @@
-db_file "${XDG_CONFIG_HOME:$HOME/.config}/mpd/database"
-log_file "${XDG_CONFIG_HOME:$HOME/.config}/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:$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"
+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
@@ -1,4 +1,4 @@
-ncmpcpp_directory = ${XDG_CONFIG_HOME:$HOME/.config}/ncmpcpp
+ncmpcpp_directory = ${XDG_CONFIG_HOME:-$HOME/.config}/ncmpcpp
#
##
## Directory for storing downloaded lyrics. It defaults to ~/.lyrics since other
diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim
@@ -1,13 +1,13 @@
let mapleader =","
-if ! filereadable(expand('${XDG_CONFIG_HOME:$HOME/.config}/nvim/autoload/plug.vim'))
+if ! filereadable(expand('~/.config/nvim/autoload/plug.vim'))
echo "Downloading junegunn/vim-plug to manage plugins..."
- 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
+ silent !mkdir -p ~/.config/nvim/autoload/
+ silent !curl "https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim" > ~/.config/nvim/autoload/plug.vim
autocmd VimEnter * PlugInstall
endif
-call plug#begin('${XDG_CONFIG_HOME:$HOME/.config}/nvim/plugged')
+call plug#begin('~/.config/nvim/plugged')
Plug 'tpope/vim-surround'
Plug 'scrooloose/nerdtree'
Plug 'junegunn/goyo.vim'
diff --git 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:$HOME/.config}/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:$HOME/.config}/ranger/shortcuts.conf
+source ${XDG_CONFIG_HOME:-$HOME/.config}/ranger/shortcuts.conf
diff --git 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:$HOME/.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:-$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:$HOME/.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:-$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
@@ -1,5 +1,5 @@
" vim: filetype=vifm
-source ${XDG_CONFIG_HOME:$HOME/.config}/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
@@ -12,8 +12,8 @@ SAVEHIST=10000
HISTFILE=~/.cache/zsh/history
# Load aliases and shortcuts if existent.
-[ -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"
+[ -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
@@ -3,4 +3,4 @@
# Toggles all cronjobs off/on.
# Stores disabled crontabs in ~/.consaved until restored.
-([ -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.")
+([ -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/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:$HOME/.config}/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
@@ -1,11 +1,11 @@
#!/usr/bin/env bash
# Output locations. Unactivated progs should go to /dev/null.
-shell_shortcuts="${XDG_CONFIG_HOME:$HOME/.config}/shortcutrc"
-ranger_shortcuts="${XDG_CONFIG_HOME:$HOME/.config}/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:$HOME/.config}/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:$HOME/.config}/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 "<CR>\nmap t" $1, "<tab>:cd", $2 "<CR><tab>\nmap M" $1, "<tab>:cd", $2 "<CR><tab>:mo<CR>\nmap Y" $1, "<tab>:cd", $2 "<CR><tab>:co<CR>" }' >> "$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:$HOME/.config}/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 "<CR>" }' >> "$vifm_shortcuts") \
| awk '{print "map "$1" shell $EDITOR "$2}' >> "$ranger_shortcuts"
diff --git 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/<b><span color=\"red\">/;s/..27m/<\/span><\/b>/")" && notify-send "Appointments" "$(calcurse -d3)" ;;
- 2) $TERMINAL -e calcurse -D ${XDG_CONFIG_HOME:$HOME/.config}/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/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:$HOME/.config}/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/news b/.local/bin/statusbar/news
@@ -14,4 +14,4 @@ case $BLOCK_BUTTON in
<b>Note:</b> 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:$HOME/.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:-$HOME/.config}/newsboat/.update 2>/dev/null)"
diff --git a/.profile b/.profile
@@ -19,15 +19,15 @@ 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:$HOME/.config}/notmuch-config"
-export GTK2_RC_FILES="${XDG_CONFIG_HOME:$HOME/.config}/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:$HOME/.config}/wget/wgetrc"
-export INPUTRC="${XDG_CONFIG_HOME:$HOME/.config}/inputrc"
-export ZDOTDIR="${XDG_CONFIG_HOME:$HOME/.config}/zsh"
+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:$HOME/.config}/android"
+export ANDROID_SDK_HOME="${XDG_CONFIG_HOME:-$HOME/.config}/android"
export CARGO_HOME="${XDG_DATA_HOME:-$HOME/.local/share}/cargo"
# Other program settings:
@@ -43,7 +43,7 @@ export LESS_TERMCAP_se="$(printf '%b' '[0m')"
export LESS_TERMCAP_us="$(printf '%b' '[1;32m')"
export LESS_TERMCAP_ue="$(printf '%b' '[0m')"
-[ ! -f ${XDG_CONFIG_HOME:$HOME/.config}/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
diff --git 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:$HOME/.config}/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
