Make GPG use XDG basedir - somewhat
This commit is contained in:
parent
df945fc92b
commit
3ce7aadf89
6 changed files with 7 additions and 5 deletions
|
@ -14,8 +14,8 @@ link_file() {
|
||||||
mkdir -p $HOME/.config
|
mkdir -p $HOME/.config
|
||||||
which git >/dev/null 2>&1 && link_file git .config/git ../
|
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
|
if which gpg >/dev/null 2>&1 || which gpg2 >/dev/null 2>&1; then
|
||||||
mkdir -p $HOME/.gnupg
|
mkdir -p $HOME/.local/share/gnupg
|
||||||
link_file gpg.conf .gnupg/gpg.conf ../
|
link_file gpg.conf .local/share/gnupg/gpg.conf ../../../
|
||||||
fi
|
fi
|
||||||
which tmux >/dev/null 2>&1 && link_file tmux.conf .tmux.conf
|
which tmux >/dev/null 2>&1 && link_file tmux.conf .tmux.conf
|
||||||
which vim >/dev/null 2>&1 && link_file vim .config/vim ../
|
which vim >/dev/null 2>&1 && link_file vim .config/vim ../
|
||||||
|
|
|
@ -34,3 +34,4 @@ or set -x XDG_DATA_HOME $HOME/.local/share
|
||||||
set -x EDITOR vim
|
set -x EDITOR vim
|
||||||
set -x VIMINIT "source $XDG_CONFIG_HOME/vim/vimrc"
|
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 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
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
function gpg-sftp
|
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
|
sftp $argv
|
||||||
end
|
end
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
function gpg-ssh-add
|
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
|
ssh-add $argv
|
||||||
end
|
end
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
function gpg-ssh
|
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
|
ssh $argv
|
||||||
end
|
end
|
||||||
|
|
1
zshrc
1
zshrc
|
@ -5,6 +5,7 @@ export EDITOR="vim"
|
||||||
export VIMINIT="source $XDG_CONFIG_HOME/vim/vimrc"
|
export VIMINIT="source $XDG_CONFIG_HOME/vim/vimrc"
|
||||||
export PAGER="less"
|
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 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
|
LISTMAX=32768
|
||||||
WORDCHARS="*?[];!#~"
|
WORDCHARS="*?[];!#~"
|
||||||
local grep=""
|
local grep=""
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue