prefer xdg basedir specification directories

58 files changed, 69 insertions, 53 deletions

diff --git a/.gitignore b/.gitignore
index 42261fc..47de586 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,6 @@
 /config/alacritty/alacritty.yml
 /config/darksky/api
-/fortune/*.dat
+/local/share/fortune/*.dat
 /less
 /mpdscribble/mpdscribble.conf
 /vim/spell/*.spl
diff --git a/.gitmodules b/.gitmodules
index 8d0dbde..1b1a149 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -17,7 +17,7 @@
 	path = vim/pack/plugins/start/textobj
 	url = git://github.com/doy/vim-textobj
 [submodule "zsh/zsh-syntax-highlighting"]
-	path = zsh/zsh-syntax-highlighting
+	path = config/zsh/zsh-syntax-highlighting
 	url = git://github.com/zsh-users/zsh-syntax-highlighting
 [submodule "vim/bundle/tlib"]
 	path = vim/bundle/tlib
@@ -44,10 +44,10 @@
 	path = vim/bundle/julia
 	url = git://github.com/JuliaLang/julia-vim
 [submodule "zsh/zsh-autosuggestions"]
-	path = zsh/zsh-autosuggestions
+	path = config/zsh/zsh-autosuggestions
 	url = git://github.com/zsh-users/zsh-autosuggestions
 [submodule "zsh/zsh-completions"]
-	path = zsh/zsh-completions
+	path = config/zsh/zsh-completions
 	url = git://github.com/zsh-users/zsh-completions
 [submodule "vim/bundle/ledger"]
 	path = vim/pack/filetype/start/ledger
@@ -62,7 +62,7 @@
 	path = vim/pack/plugins/start/editorconfig
 	url = git://github.com/editorconfig/editorconfig-vim
 [submodule "zsh/fzf"]
-	path = sh/fzf
+	path = config/sh/fzf
 	url = git://github.com/junegunn/fzf
 [submodule "vim/pack/plugins/start/fzf.vim"]
 	path = vim/pack/plugins/start/fzf.vim
diff --git a/EXTERNAL b/EXTERNAL
index bb1bc17..5b7766d 100644
--- a/EXTERNAL
+++ b/EXTERNAL
@@ -8,7 +8,7 @@ bin/show_colors
 - http://www.linuxfocus.org/English/May2004/article335.shtml
 bin/vimmanpager
 - gentoo vim ebuild, somewhere in the middle
-fortune/*
+local/share/fortune/*
 - ideas, and yasd-fortune compiled by sartak
 - perl from the base fortune-mod distribution
 - calvin, kernelcookies, firefly, hitchhiker, and various dune quotes from the corresponding gentoo packages
@@ -17,11 +17,11 @@ nethackrc
 - based on https://github.com/TAEB/TAEB/blob/master/lib/TAEB/Config.pm#L192 by sartak
 procmail/mark_as_read
 - http://www.mhonarc.org/archive/html/procmail/2005-08/msg00176.html
-sh/cdhist.sh
+config/sh/cdhist.sh
 - git://github.com/kana/config.git
 ssh/cao_key
 - http://crawl.akrasiac.org/cao_key
-tex/jesse_resume.sty
+config/tex/jesse_resume.sty
 - based on http://www.courtesan.com/todd/resume.html
 vimrc
 - originally based on http://sartak.org/conf/vimrc
diff --git a/Makefile b/Makefile
index d0e9e6a..8a302c2 100644
--- a/Makefile
+++ b/Makefile
@@ -10,24 +10,41 @@ INSTALL := \
     .agignore \
     .bash_profile \
     .bashrc \
+    .config/git/config \
+    .config/git/ignore \
+    .config/mpd/mpd.conf \
+    .config/msmtp/config \
+    .config/ncmpcpp/bindings \
+    .config/sh/aliases \
+    .config/sh/cdhist.sh \
+    .config/sh/env \
+    .config/sh/functions \
+    .config/sh/fzf \
+    .config/tex/jesse_essay.sty \
+    .config/tex/jesse_letter.sty \
+    .config/tex/jesse_macros.sty \
+    .config/tex/jesse_resume.sty \
+    .config/tex/jesse.sty \
+    .config/tex/sarah_resume.sty \
+    .config/tig/config \
     .config/weechat/saved \
     .config/weechat/extra \
+    .config/zsh/local-completions \
+    .config/zsh/zsh-autosuggestions \
+    .config/zsh/zsh-completions \
+    .config/zsh/zsh-syntax-highlighting \
     .crawlrc \
     .gdbinit \
-    .gitconfig \
-    .gitignore \
     .gnupg/gpg.conf \
     .inputrc \
     .ledgerrc \
     .less \
-    .mailcap \
-    .mpdconf \
-    .msmtprc \
+    .local/share/fortune \
     .mutt/choose-muttrc-type \
     .mutt/imap \
+    .mutt/mailcap \
     .mutt/muttrc \
     .mutt/offlineimap \
-    .ncmpcpp/bindings \
     .nethackrc \
     .perlcriticrc \
     .profile \
@@ -35,7 +52,6 @@ INSTALL := \
     .replyrc \
     .screenrc \
     .ssh/cao_key \
-    .tigrc \
     .tmux.conf \
     .vimrc \
     .zshcomplete \
@@ -43,12 +59,8 @@ INSTALL := \
     .zshrc \
     .bin \
     .dzil \
-    .fortune \
-    .sh \
-    .tex \
     .vim \
     .weechat/perl \
-    .zsh
 
 EMPTYDIRS := \
     $(EMPTYDIRS) \
@@ -62,7 +74,7 @@ INSTALL_CUSTOM := \
 
 BUILD := \
     $(BUILD) \
-    $(addsuffix .dat,$(filter-out %.dat,$(wildcard fortune/*))) \
+    $(addsuffix .dat,$(filter-out %.dat,$(wildcard local/share/fortune/*))) \
     $(addsuffix tags,$(wildcard vim/pack/*/start/*/doc/)) \
     vim/spell/en.utf-8.add.spl \
     less
@@ -92,7 +104,7 @@ submodules :
 	@git submodule update --init --recursive
 
 install :: all $(INSTALLED)
-	@chmod 600 msmtprc
+	@chmod 600 config/msmtp/config
 	@chmod 700 gnupg
 	$(ECHO) Installed into $(INTO)
 
@@ -125,7 +137,7 @@ $(patsubst %,$(INTO)/%,$(INSTALL)) : $(INTO)/.% : %
 
 # build targets
 
-fortune/%.dat : fortune/%
+local/share/fortune/%.dat : local/share/fortune/%
 	$(ECHO) "Compiling $@"
 	@strfile -s $(basename $@)
 
diff --git a/Makefile.hush b/Makefile.hush
index 6c951a5..f09cfc0 100644
--- a/Makefile.hush
+++ b/Makefile.hush
@@ -2,18 +2,21 @@ INSTALL := \
     .config/alacritty/alacritty.yml \
     .config/darksky/api \
     .config/darksky/location \
+    .config/i3/browser-workspace.json \
+    .config/i3/config \
+    .config/i3/signal-workspace.json \
+    .config/i3/terminal-workspace.json \
+    .config/i3status/config \
+    .config/notmuch/config \
+    .config/offlineimap/config \
+    .config/offlineimap/pass.py \
     .config/perspektiv/config.toml \
     .config/touchegg/touchegg.conf \
-    .i3status.conf \
-    .notmuch-config \
-    .offlineimap/pass.py \
-    .offlineimaprc \
     .xbindkeysrc \
     .Xdefaults \
     .xinitrc \
     .xprofile \
     .Xmodmap \
-    .i3 \
     .mpdscribble \
     $(patsubst %,.%,$(wildcard services/available/*/run)) \
     $(patsubst %,.%,$(wildcard services/available/*/log/run))
diff --git a/bashrc b/bashrc
index a6fc121..52966e3 100644
--- a/bashrc
+++ b/bashrc
@@ -8,7 +8,7 @@ test -d $HOME/.cargo/bin && export PATH="$HOME/.cargo/bin:$PATH"
 [ -d /usr/share/git/diff-highlight ] && export PATH="/usr/share/git/diff-highlight:${PATH}"
 [ -d /usr/local/share/git-core/contrib/diff-highlight ] && export PATH="/usr/local/share/git-core/contrib/diff-highlight:${PATH}"
 export PATH="${HOME}/.bin/local:${HOME}/.bin/$(hostname):${HOME}/.bin:/usr/lib/ccache/bin:$PATH"
-[ -f "$HOME/.sh/env" ] && source $HOME/.sh/env
+[ -f "$HOME/.config/sh/env" ] && source $HOME/.config/sh/env
 # }}}
 # Test for an interactive shell. {{{
 # There is no need to set anything past this point for scp and rcp, and it's
@@ -25,8 +25,8 @@ case ${TERM} in
 		;;
 esac # }}}
 # aliases {{{
-[ -f "$HOME/.sh/aliases" ] && source $HOME/.sh/aliases
-[ -f "$HOME/.sh/functions" ] && source $HOME/.sh/functions
+[ -f "$HOME/.config/sh/aliases" ] && source $HOME/.config/sh/aliases
+[ -f "$HOME/.config/sh/functions" ] && source $HOME/.config/sh/functions
 # }}}
 # completion {{{
 [ -f /etc/bash_completion ] && source /etc/bash_completion
@@ -51,9 +51,9 @@ else
     export PROMPT_COMMAND="${PROMPT_COMMAND};history -a"
 fi
 # plugins {{{
-source ~/.sh/cdhist.sh
-source ~/.sh/fzf/shell/completion.bash
-source ~/.sh/fzf/shell/key-bindings.bash
+source ~/.config/sh/cdhist.sh
+source ~/.config/sh/fzf/shell/completion.bash
+source ~/.config/sh/fzf/shell/key-bindings.bash
 # }}}
 # prompt {{{
 if type fancy-prompt > /dev/null 2>&1; then
@@ -62,6 +62,6 @@ fi
 # }}}
 # }}}
 # fortune {{{
-fortune -n600 -s ~/.fortune | grep -v -E "^$"
+fortune -n600 -s ~/.local/share/fortune | grep -v -E "^$"
 # }}}
 # vim: fdm=marker
diff --git a/gitconfig b/config/git/config
index cadb7de..3a67355 100644
--- a/gitconfig
+++ b/config/git/config
@@ -39,7 +39,7 @@
 [color]
 	ui = auto
 [core]
-	excludesfile = ~/.gitignore
+	excludesfile = ~/.config/git/ignore
 [push]
 	default = current
 [branch]
@@ -68,6 +68,6 @@
 [fetch]
 	prune = true
 [include]
-	path = .gitconfig.private
+	path = config.private
 
 ; vim:ft=gitconfig:
diff --git a/gitignore b/config/git/ignore
index 4491917..4491917 100644
--- a/gitignore
+++ b/config/git/ignore
diff --git a/i3/browser-workspace.json b/config/i3/browser-workspace.json
index eea123a..eea123a 100644
--- a/i3/browser-workspace.json
+++ b/config/i3/browser-workspace.json
diff --git a/i3/config b/config/i3/config
index a6322d0..312df8e 100644
--- a/i3/config
+++ b/config/i3/config
@@ -72,6 +72,6 @@ bar {
     font xft:DejaVuSansMono 10
 }
 
-exec --no-startup-id "i3-msg 'workspace 6; append_layout .i3/browser-workspace.json; exec firefox'"
-exec --no-startup-id "i3-msg 'workspace 7; append_layout .i3/signal-workspace.json; exec signal-desktop'"
-exec --no-startup-id "i3-msg 'workspace 5; append_layout .i3/terminal-workspace.json; exec alacritty; exec alacritty; exec alacritty; exec alacritty; exec alacritty'"
+exec --no-startup-id "i3-msg 'workspace 6; append_layout .config/i3/browser-workspace.json; exec firefox'"
+exec --no-startup-id "i3-msg 'workspace 7; append_layout .config/i3/signal-workspace.json; exec signal-desktop'"
+exec --no-startup-id "i3-msg 'workspace 5; append_layout .config/i3/terminal-workspace.json; exec alacritty; exec alacritty; exec alacritty; exec alacritty; exec alacritty'"
diff --git a/i3/signal-workspace.json b/config/i3/signal-workspace.json
index acac998..acac998 100644
--- a/i3/signal-workspace.json
+++ b/config/i3/signal-workspace.json
diff --git a/i3/terminal-workspace.json b/config/i3/terminal-workspace.json
index 8275b18..8275b18 100644
--- a/i3/terminal-workspace.json
+++ b/config/i3/terminal-workspace.json
diff --git a/i3status.conf b/config/i3status/config
index 4c2bcdd..4c2bcdd 100644
--- a/i3status.conf
+++ b/config/i3status/config
diff --git a/mpdconf b/config/mpd/mpd.conf
index e30c2fc..e30c2fc 100644
--- a/mpdconf
+++ b/config/mpd/mpd.conf
diff --git a/msmtprc b/config/msmtp/config
index 541aa90..541aa90 100644
--- a/msmtprc
+++ b/config/msmtp/config
diff --git a/ncmpcpp/bindings b/config/ncmpcpp/bindings
index 20a0259..20a0259 100644
--- a/ncmpcpp/bindings
+++ b/config/ncmpcpp/bindings
diff --git a/notmuch-config b/config/notmuch/config
index c194010..c194010 100644
--- a/notmuch-config
+++ b/config/notmuch/config
diff --git a/offlineimaprc b/config/offlineimap/config
index 9876721..fc8e496 100644
--- a/offlineimaprc
+++ b/config/offlineimap/config
@@ -2,7 +2,7 @@
 accounts = main
 maxsyncaccounts = 3
 status_backend = sqlite
-pythonfile = ~/.offlineimap/pass.py
+pythonfile = ~/.config/offlineimap/pass.py
 ui = basic
 socktimeout = 120
 
diff --git a/offlineimap/pass.py b/config/offlineimap/pass.py
index 20ca510..20ca510 100644
--- a/offlineimap/pass.py
+++ b/config/offlineimap/pass.py
diff --git a/sh/aliases b/config/sh/aliases
index c764f38..c764f38 100644
--- a/sh/aliases
+++ b/config/sh/aliases
diff --git a/sh/cdhist.sh b/config/sh/cdhist.sh
index d67d2e9..d67d2e9 100644
--- a/sh/cdhist.sh
+++ b/config/sh/cdhist.sh
diff --git a/sh/env b/config/sh/env
index 558c8ed..218ddde 100644
--- a/sh/env
+++ b/config/sh/env
@@ -11,7 +11,7 @@ if type sudo-askpass > /dev/null 2>&1; then
     SUDO_ASKPASS=$(command -v sudo-askpass)
     export SUDO_ASKPASS
 fi
-export TEXINPUTS=".:$HOME/conf/tex:"
+export TEXINPUTS=".:$HOME/.config/tex:"
 export LESS='-QR'
 export PERL_CPANM_OPT="-q --mirror http://mirrors.kernel.org/cpan/ --mirror http://cpan.metacpan.org/ --prompt"
 export FZF_DEFAULT_OPTS="--reverse --inline-info --bind=tab:down,shift-tab:up,change:top"
@@ -20,5 +20,6 @@ export FANCY_PROMPT_COLORS="user_doy=bright_blue,host_st-doy1=bright_white,host_
 export PASSWORD_STORE_X_SELECTION=primary
 type brew > /dev/null 2>&1 && export PATH="/usr/local/opt/coreutils/libexec/gnubin:/usr/local/opt/findutils/libexec/gnubin:/usr/local/sbin:$PATH"
 type brew > /dev/null 2>&1 && export MANPATH="/usr/local/opt/coreutils/libexec/gnuman:/usr/local/opt/findutils/libexec/gnuman:$MANPATH"
+export NOTMUCH_CONFIG="${XDG_CONFIG_HOME:-${HOME}/.config}/notmuch/config"
 
 # vim:ft=sh:
diff --git a/sh/functions b/config/sh/functions
index d6068e0..d6068e0 100644
--- a/sh/functions
+++ b/config/sh/functions
diff --git a/sh/fzf b/config/sh/fzf
-Subproject d4ed955aee08a1c2ceb64e562ab4a88bdc9af8f
+Subproject d4ed955aee08a1c2ceb64e562ab4a88bdc9af8f
diff --git a/tex/jesse.sty b/config/tex/jesse.sty
index 189938e..189938e 100644
--- a/tex/jesse.sty
+++ b/config/tex/jesse.sty
diff --git a/tex/jesse_essay.sty b/config/tex/jesse_essay.sty
index 3fb34f2..3fb34f2 100644
--- a/tex/jesse_essay.sty
+++ b/config/tex/jesse_essay.sty
diff --git a/tex/jesse_letter.sty b/config/tex/jesse_letter.sty
index 734021f..734021f 100644
--- a/tex/jesse_letter.sty
+++ b/config/tex/jesse_letter.sty
diff --git a/tex/jesse_macros.sty b/config/tex/jesse_macros.sty
index e27fa25..e27fa25 100644
--- a/tex/jesse_macros.sty
+++ b/config/tex/jesse_macros.sty
diff --git a/tex/jesse_resume.sty b/config/tex/jesse_resume.sty
index 05580d9..05580d9 100644
--- a/tex/jesse_resume.sty
+++ b/config/tex/jesse_resume.sty
diff --git a/tex/sarah_resume.sty b/config/tex/sarah_resume.sty
index 8ed2a20..8ed2a20 100644
--- a/tex/sarah_resume.sty
+++ b/config/tex/sarah_resume.sty
diff --git a/tigrc b/config/tig/config
index 8eb4aa5..8eb4aa5 100644
--- a/tigrc
+++ b/config/tig/config
diff --git a/zsh/local-completions/hush/_sv b/config/zsh/local-completions/hush/_sv
index 8887bd6..8887bd6 100644
--- a/zsh/local-completions/hush/_sv
+++ b/config/zsh/local-completions/hush/_sv
diff --git a/zsh/zsh-autosuggestions b/config/zsh/zsh-autosuggestions
-Subproject affe7c687e329f881ae92e95670979b0f728e61
+Subproject affe7c687e329f881ae92e95670979b0f728e61
diff --git a/zsh/zsh-completions b/config/zsh/zsh-completions
-Subproject 5fdcec1bef68b8fb1ad528111f7892b6e7d5586
+Subproject 5fdcec1bef68b8fb1ad528111f7892b6e7d5586
diff --git a/zsh/zsh-syntax-highlighting b/config/zsh/zsh-syntax-highlighting
-Subproject e900ad8bad53501689afcb050456400d7a8466e
+Subproject e900ad8bad53501689afcb050456400d7a8466e
diff --git a/fortune/buffy b/local/share/fortune/buffy
index ff98c9b..ff98c9b 100644
--- a/fortune/buffy
+++ b/local/share/fortune/buffy
diff --git a/fortune/calvin b/local/share/fortune/calvin
index 914631e..914631e 100644
--- a/fortune/calvin
+++ b/local/share/fortune/calvin
diff --git a/fortune/chapterhouse-dune b/local/share/fortune/chapterhouse-dune
index b0d83e7..b0d83e7 100644
--- a/fortune/chapterhouse-dune
+++ b/local/share/fortune/chapterhouse-dune
diff --git a/fortune/children-of-dune b/local/share/fortune/children-of-dune
index a543071..a543071 100644
--- a/fortune/children-of-dune
+++ b/local/share/fortune/children-of-dune
diff --git a/fortune/dune b/local/share/fortune/dune
index d44028b..d44028b 100644
--- a/fortune/dune
+++ b/local/share/fortune/dune
diff --git a/fortune/dune-messiah b/local/share/fortune/dune-messiah
index ce51993..ce51993 100644
--- a/fortune/dune-messiah
+++ b/local/share/fortune/dune-messiah
diff --git a/fortune/firefly b/local/share/fortune/firefly
index 8c5906a..8c5906a 100644
--- a/fortune/firefly
+++ b/local/share/fortune/firefly
diff --git a/fortune/god-emperor b/local/share/fortune/god-emperor
index 6cc7a1e..6cc7a1e 100644
--- a/fortune/god-emperor
+++ b/local/share/fortune/god-emperor
diff --git a/fortune/heretics-of-dune b/local/share/fortune/heretics-of-dune
index f75bcff..f75bcff 100644
--- a/fortune/heretics-of-dune
+++ b/local/share/fortune/heretics-of-dune
diff --git a/fortune/hitchhiker b/local/share/fortune/hitchhiker
index 0ea3338..0ea3338 100644
--- a/fortune/hitchhiker
+++ b/local/share/fortune/hitchhiker
diff --git a/fortune/house-atreides b/local/share/fortune/house-atreides
index 3792818..3792818 100644
--- a/fortune/house-atreides
+++ b/local/share/fortune/house-atreides
diff --git a/fortune/house-harkonnen b/local/share/fortune/house-harkonnen
index 090df36..090df36 100644
--- a/fortune/house-harkonnen
+++ b/local/share/fortune/house-harkonnen
diff --git a/fortune/ideas b/local/share/fortune/ideas
index 4733e08..4733e08 100644
--- a/fortune/ideas
+++ b/local/share/fortune/ideas
diff --git a/fortune/kernelcookies b/local/share/fortune/kernelcookies
index 3dcb616..3dcb616 100644
--- a/fortune/kernelcookies
+++ b/local/share/fortune/kernelcookies
diff --git a/fortune/perl b/local/share/fortune/perl
index e283cb0..e283cb0 100644
--- a/fortune/perl
+++ b/local/share/fortune/perl
diff --git a/fortune/song-of-ice-and-fire b/local/share/fortune/song-of-ice-and-fire
index b892ff4..b892ff4 100644
--- a/fortune/song-of-ice-and-fire
+++ b/local/share/fortune/song-of-ice-and-fire
diff --git a/fortune/yasd-fortune b/local/share/fortune/yasd-fortune
index 7307b57..7307b57 100644
--- a/fortune/yasd-fortune
+++ b/local/share/fortune/yasd-fortune
diff --git a/mailcap b/mutt/mailcap
index ed8b963..ed8b963 100644
--- a/mailcap
+++ b/mutt/mailcap
diff --git a/mutt/muttrc b/mutt/muttrc
index a992dc4..5098785 100644
--- a/mutt/muttrc
+++ b/mutt/muttrc
@@ -3,7 +3,7 @@ set record="=Sent"
 set postponed="=Drafts"
 set header_cache="~/.cache/mutt/headers"
 set message_cachedir="~/.cache/mutt/bodies"
-set mailcap_path="~/.mailcap"
+set mailcap_path="~/.mutt/mailcap"
 # }}}
 # identity {{{
 # i am "Jesse Luehrs <doy@tozt.net>"
diff --git a/vimrc b/vimrc
index e0449e7..a40078f 100644
--- a/vimrc
+++ b/vimrc
@@ -172,7 +172,7 @@ let g:startify_custom_indices = [
     \'!', '@', '#', '$', '%', '^', '&', '*', '(', ')'
 \]
 let g:startify_custom_header = []
-let s:fortune = system('fortune -n200 -s ~/.fortune | grep -v -E "^$"')
+let s:fortune = system('fortune -n200 -s ~/.local/share/fortune | grep -v -E "^$"')
 let g:startify_custom_footer = [''] + map(split(s:fortune, '\n'), '"   ".v:val')
 " }}}
 " terraform {{{
diff --git a/zshcomplete b/zshcomplete
index ba22a9a..0198f58 100644
--- a/zshcomplete
+++ b/zshcomplete
@@ -18,4 +18,4 @@ autoload -Uz bashcompinit
 bashcompinit
 # End of lines added by compinstall
 
-source ~/.sh/fzf/shell/completion.zsh
+source ~/.config/sh/fzf/shell/completion.zsh
diff --git a/zshinput b/zshinput
index 94f5558..3ab9ac4 100644
--- a/zshinput
+++ b/zshinput
@@ -1,6 +1,6 @@
 bindkey -v
 
-source ~/.sh/fzf/shell/key-bindings.zsh
+source ~/.config/sh/fzf/shell/key-bindings.zsh
 
 autoload history-search-end
 zle -N history-beginning-search-backward-end history-search-end
diff --git a/zshrc b/zshrc
index 8e23aa0..26d8996 100644
--- a/zshrc
+++ b/zshrc
@@ -10,7 +10,7 @@ test -d $HOME/.cargo/bin && export PATH="$HOME/.cargo/bin:$PATH"
 [ -d /usr/share/git/diff-highlight ] && export PATH="/usr/share/git/diff-highlight:${PATH}"
 [ -d /usr/local/share/git-core/contrib/diff-highlight ] && export PATH="/usr/local/share/git-core/contrib/diff-highlight:${PATH}"
 export PATH="${HOME}/.bin/local:${HOME}/.bin/$(hostname):${HOME}/.bin:/usr/lib/ccache/bin:$PATH"
-[ -f "$HOME/.sh/env" ] && source $HOME/.sh/env
+[ -f "$HOME/.config/sh/env" ] && source $HOME/.config/sh/env
 # }}}
 # Change the window title of X terminals {{{
 function term_title_precmd () {
@@ -22,11 +22,11 @@ case ${TERM} in
         ;;
 esac # }}}
 # aliases {{{
-[ -f "$HOME/.sh/aliases" ] && source $HOME/.sh/aliases
-[ -f "$HOME/.sh/functions" ] && source $HOME/.sh/functions
+[ -f "$HOME/.config/sh/aliases" ] && source $HOME/.config/sh/aliases
+[ -f "$HOME/.config/sh/functions" ] && source $HOME/.config/sh/functions
 # }}}
 # completion {{{
-fpath=(~/.zsh/local-completions/$(hostname) ~/.zsh/local-completions ~/.zsh/zsh-completions/src $fpath)
+fpath=(~/.config/zsh/local-completions/$(hostname) ~/.config/zsh/local-completions ~/.config/zsh/zsh-completions/src $fpath)
 source ~/.zshcomplete
 # }}}
 # zsh configuration {{{
@@ -48,11 +48,11 @@ export SPROMPT="Correct $fg[red]%R$reset_color to $fg[green]%r$reset_color? [yna
 export KEYTIMEOUT=5
 # plugins {{{
 # cdhist {{{
-source ~/.sh/cdhist.sh
+source ~/.config/sh/cdhist.sh
 # }}}
 # zsh-syntax-highlighting {{{
 ZSH_HIGHLIGHT_HIGHLIGHTERS=(main brackets)
-source ~/.zsh/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
+source ~/.config/zsh/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
 ZSH_HIGHLIGHT_STYLES[reserved-word]='fg=green'
 ZSH_HIGHLIGHT_STYLES[alias]='fg=green'
 ZSH_HIGHLIGHT_STYLES[builtin]='fg=green'
@@ -69,7 +69,7 @@ ZSH_HIGHLIGHT_STYLES[back-quoted-argument]='fg=green'
 ZSH_HIGHLIGHT_STYLES[assign]='fg=cyan'
 # }}}
 # zsh-autosuggestions {{{
-source ~/.zsh/zsh-autosuggestions/zsh-autosuggestions.zsh
+source ~/.config/zsh/zsh-autosuggestions/zsh-autosuggestions.zsh
 ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE='fg=black,bold'
 # }}}
 # vim-history-sync {{{
@@ -98,6 +98,6 @@ zle -N zle-keymap-select
 # }}}
 # }}}
 # fortune {{{
-fortune -n600 -s ~/.fortune | grep -v -E "^$"
+fortune -n600 -s ~/.local/share/fortune | grep -v -E "^$"
 # }}}
 # vim: fdm=marker