assume default values if xdg dirs not set

This commit is contained in:
Luke Smith
2020-04-08 17:21:40 -04:00
parent 2c06dd36c6
commit 422d106fba
32 changed files with 86 additions and 91 deletions

View File

@@ -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" \

View File

@@ -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

View File

@@ -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

View File

@@ -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"

View File

@@ -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 <c-f> $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

View File

@@ -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;

View File

@@ -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"

View File

@@ -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 #####
#

View File

@@ -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'

View File

@@ -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 <C-f> fzf_select
# Now, simply bind this function to a key, by adding this to your ~/.config/ranger/rc.conf: map <C-f> fzf_select
class fzf_select(Command):
"""
:fzf_select

View File

@@ -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)

View File

@@ -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

View File

@@ -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

View File

@@ -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." &

View File

@@ -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

View File

@@ -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