Index: create_symlinks.sh ================================================================== --- create_symlinks.sh +++ create_symlinks.sh @@ -12,12 +12,12 @@ } mkdir -p $HOME/.config which git >/dev/null 2>&1 && link_file git .config/git ../ if which gpg >/dev/null 2>&1 || which gpg2 >/dev/null 2>&1; then - mkdir -p $HOME/.gnupg - link_file gpg.conf .gnupg/gpg.conf ../ + mkdir -p $HOME/.local/share/gnupg + link_file gpg.conf .local/share/gnupg/gpg.conf ../../../ fi which tmux >/dev/null 2>&1 && link_file tmux.conf .tmux.conf which vim >/dev/null 2>&1 && link_file vim .config/vim ../ which fish >/dev/null 2>&1 && link_file fish .config/fish ../ which youtube-dl >/dev/null 2>&1 && link_file youtube-dl .config/youtube-dl ../ Index: fish/config.fish ================================================================== --- fish/config.fish +++ fish/config.fish @@ -32,5 +32,6 @@ or set -x XDG_DATA_HOME $HOME/.local/share set -x EDITOR vim set -x VIMINIT "source $XDG_CONFIG_HOME/vim/vimrc" set -x LS_COLORS 'di=34:ow=44;37:tw=44;37:st=44;37:ex=31:su=7;31:sg=7;31:ln=33:or=7;33:pi=32:do=32:bd=35:cd=35:so=32:*.bz2=36:*.dmg=36:*.gz=36:*.gpg=36:*.rar=36:*.tar=36:*.tbz2=36:*.tgz=36:*.xz=36:*.zip=36:*.orig=90:*~=90' +set -x GNUPGHOME $XDG_DATA_HOME/gnupg Index: fish/functions/gpg-sftp.fish ================================================================== --- fish/functions/gpg-sftp.fish +++ fish/functions/gpg-sftp.fish @@ -1,4 +1,4 @@ function gpg-sftp - set -lx SSH_AUTH_SOCK $HOME/.gnupg/S.gpg-agent.ssh + set -lx SSH_AUTH_SOCK $GNUPGHOME/S.gpg-agent.ssh sftp $argv end Index: fish/functions/gpg-ssh-add.fish ================================================================== --- fish/functions/gpg-ssh-add.fish +++ fish/functions/gpg-ssh-add.fish @@ -1,4 +1,4 @@ function gpg-ssh-add - set -lx SSH_AUTH_SOCK $HOME/.gnupg/S.gpg-agent.ssh + set -lx SSH_AUTH_SOCK $GNUPGHOME/S.gpg-agent.ssh ssh-add $argv end Index: fish/functions/gpg-ssh.fish ================================================================== --- fish/functions/gpg-ssh.fish +++ fish/functions/gpg-ssh.fish @@ -1,4 +1,4 @@ function gpg-ssh - set -lx SSH_AUTH_SOCK $HOME/.gnupg/S.gpg-agent.ssh + set -lx SSH_AUTH_SOCK $GNUPGHOME/S.gpg-agent.ssh ssh $argv end Index: zshrc ================================================================== --- zshrc +++ zshrc @@ -3,10 +3,11 @@ export XDG_DATA_HOME="$HOME/.local/share" export EDITOR="vim" export VIMINIT="source $XDG_CONFIG_HOME/vim/vimrc" export PAGER="less" export LS_COLORS='di=34:ow=44;37:tw=44;37:st=44;37:ex=31:su=7;31:sg=7;31:ln=33:or=7;33:pi=32:do=32:bd=35:cd=35:so=32:*.bz2=36:*.dmg=36:*.gz=36:*.gpg=36:*.rar=36:*.tar=36:*.tbz2=36:*.tgz=36:*.xz=36:*.zip=36:*.orig=90:*~=90' +export GNUPGHOME="$XDG_DATA_HOME/gnupg" LISTMAX=32768 WORDCHARS="*?[];!#~" local grep="" local grep_color="auto" local ls=""