From a29eaec506a7ce9e42d64a3ec1d17690387def30 Mon Sep 17 00:00:00 2001 From: Dennis Lee Date: Sat, 4 Apr 2020 13:00:08 -0700 Subject: 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 +- 12 files changed, 40 insertions(+), 40 deletions(-) (limited to '.config') diff --git a/.config/aliasrc b/.config/aliasrc index 1806d50..34bf437 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 24bdd21..cd3aafb 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 b34f184..6aee460 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 27900a1..3b4cc14 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 a0548ec..8a30ca5 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 40fcbc6..d2e1132 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 d8b0ba2..ae94ae1 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 71fd2a2..5b1acd2 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 51c5dd1..f6ee93f 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 89b4b8c..ff0d506 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 d9f1825..e096f6e 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 b327786..ed77ea8 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 -- cgit v1.3.1