From 6d54344e74d961369b15acb46cc95ae8da282c79 Mon Sep 17 00:00:00 2001 From: sev Date: Tue, 15 Mar 2022 05:47:15 -0500 Subject: [PATCH] tweaks to zsh/env (xdg, dbus, gpg, tmp), sway, ... .gitignore: fix paths and add sway config.d install.sh: handle gui stuff better, fix icons, fix linking gui: - mostly fix cursor and size, still doesn't work sometimes - add Qt4 and GTK4 config sway: - remove export section, turns out it never worked - float wayland pinentry-qt - start pipewire on launch bin: fix pinentry early exit, reorganize choices gpg: point to system pinentry zsh: - rewrite gpg-agent.conf to update pinentry-program - better logout/cleanup - allow overwriting CHARSET, LANG, LC_CTYPE - rewrite tmp setup and usage - rewrite xdg cache and runtime setup and usage - add dbus launch - split gpg home setup into own block - split gpg and ssh agent setup - move cleanup of gpg forwarding and tmp into function - run gpg/tmp cleanup on logout - update gpg/ssh agent setup to be more intelligent - fix using wrong pinentry with better gui detection - debounce perl local::lib setup --- .gitignore | 5 +- base/.gtkrc-2.0 | 1 + base/.zlogout | 39 ++-- base/.zprofile | 374 ++++++++++++++++++++++----------------- base/.zshenv | 38 ++-- bin/pinentry | 8 +- etc/Trolltech.conf | 2 + etc/gtk-3.0/settings.ini | 2 +- etc/gtk-4.0/settings.ini | 14 ++ etc/sway/config | 17 +- gnupg/gpg-agent.conf | 4 +- install.sh | 50 +++--- 12 files changed, 311 insertions(+), 243 deletions(-) create mode 100644 etc/Trolltech.conf create mode 100644 etc/gtk-4.0/settings.ini diff --git a/.gitignore b/.gitignore index deae638..24e6eac 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,8 @@ # tint2 config -xdg/tint2/tint2rc.backup.* +etc/tint2/tint2rc.backup.* + +# sway site-local configs +etc/sway/config.d # vim base/.vim/.netrwhist diff --git a/base/.gtkrc-2.0 b/base/.gtkrc-2.0 index 6612551..0cbe8e5 100644 --- a/base/.gtkrc-2.0 +++ b/base/.gtkrc-2.0 @@ -2,3 +2,4 @@ gtk-font-name="monospace-10" gtk-theme-name="Blackbird" gtk-icon-theme-name="Paper-Mono-Dark" gtk-cursor-theme-name="Paper" +gtk-cursor-theme-size="24" diff --git a/base/.zlogout b/base/.zlogout index 6e7b474..64591b6 100644 --- a/base/.zlogout +++ b/base/.zlogout @@ -1,32 +1,13 @@ -# NOTE: for the cleanups below, even if our shell is not the one that spawned -# the directory, SHLVL == 1 means that it should be safe to clean it up. -# since .zlogout isn't guaranteed to have been run in the same shell as -# our .zprofile was (since we source it in .zshenv) it has to be done -# like this. - -### gpg forward cleanup -if [[ $SHLVL == 1 && $GNUPGHOME =~ '/.ssh_forward/\d+/*$' ]] { - x=$GNUPGHOME - # reset GNUPGHOME - [[ -o GLOB_ASSIGN ]]; y=$? - setopt GLOB_ASSIGN - GNUPGHOME=$GNUPGHOME/../..(:a) - [[ $y != 0 ]] && unsetopt GLOB_ASSIGN - # clean dir if it exists - if [[ -d $x ]] { - find $x -mindepth 1 -maxdepth 1 | while read -r y; do - unlink $y - done - rmdir -p $x 2>/dev/null - } - # clean up any remaining sockets from gpg forwarding - rm -f $_GNUPG_SOCK_DEST_BASE*(N=) -} - -### remove tmp runtime if our shell spawned it -if [[ $SHLVL == 1 && $TMPDIR =~ '/.session.\d+/*$' ]] { - rm -rf $TMPDIR 2>/dev/null -} +### cleanup +# XXX: since .zlogout isn't guaranteed to have been run in the same shell as +# our .zprofile was (since we source it in .zshenv for SHLVL=1 among other +# situations) we are not guaranteed to clean up our current session's tmp, +# but it should be cleared out on next session launch +_sev_zcleanup +## unset vars that use our tmp since above will remove them +unset XDG_CACHE_HOME XDG_RUNTIME_DIR +## clean up any remaining sockets from gpg forwarding +[[ -v _GNUPG_SOCK_DEST_BASE ]] && rm -f $_GNUPG_SOCK_DEST_BASE*(N=) if [[ -o interactive ]] { echo logout diff --git a/base/.zprofile b/base/.zprofile index 1abd5b5..73de480 100644 --- a/base/.zprofile +++ b/base/.zprofile @@ -18,10 +18,65 @@ # are legitimate reasons to want to do this, and in any case the shell # should not choke or cause unexpected problems should it happen anyway. +### cleanup +# XXX: only call after relevant vars have been set up, defined early so that +# below code can utilize it after they do so +function _sev_zcleanup { + ## gpg forwarding + if [[ -d $_sev_gpg_forward_dir && ( -z $1 || $1 == 'gpg-forward' ) ]] { + # clean up forward dirs if its session is dead or we ask for it + find $_sev_gpg_forward_dir -type d -mindepth 1 -maxdepth 1 | + while {read -r x} { + # NOTE: the only way we can get here is if we have not been + # forwarded before, if the user asks for it, or during + # logout. if our own pid already has a dir, it is most likely + # stale, the user wants it removed, or something is very + # broken—in all 3 of these cases the best choice is remove it. + p=$(basename $x) + if {[[ -v _sev_gpg_forward_clean || $$ == $p ]] || + ! kill -0 $p 2>/dev/null} { + find $x -mindepth 1 -maxdepth 1 | while {read -r y} { + # XXX: real dirs will stop unlink, consider it a feature + unlink $y + } + # don't force in case something important is still there + rmdir $x + } + } + # reset GNUPGHOME if we removed our own dir + if [[ $GNUPGHOME =~ '/.ssh_forward/\d+/*$' && ! -e $GNUPGHOME ]] { + x=$GNUPGHOME + [[ -o GLOB_ASSIGN ]]; y=$? + setopt GLOB_ASSIGN + GNUPGHOME=$GNUPGHOME/../..(:a) + (( y != 0 )) && unsetopt GLOB_ASSIGN + } + } + + ## tmp + # NOTE: _sev_tmp is not unset so session dirs will not be recreated + # NOTE: XDG dirs that use our tmp are not unset here, they are in zlogout + if [[ -d $_sev_tmp && ( -z $1 || $1 == 'tmp' ) ]] { + # clean up tmp dirs if its session is dead or we ask for it + find $_sev_tmp -name '.session.*' -type d -mindepth 1 -maxdepth 1 | + while {read -r x} { + # NOTE: same rationale as above + p=${$(basename $x)#.session.} + if {[[ -v _sev_tmp_clean || $$ == $p ]] || + ! kill -0 $p 2>/dev/null} { + rm -rf $x + } + } + } + + unset x p y +} + ### lang -export CHARSET=UTF-8 -export LANG=en_US.UTF-8 -export LC_CTYPE=$LANG +export CHARSET=${CHARSET:-UTF-8} +export LANG=${LANG:-en_US.UTF-8} +export LC_CTYPE=${LC_TYPE:-$LANG} + ### path # NOTE: we utilize the fact that unique arrays keep the first occurrence and # remove any further occurences to capture elements from the old PATH @@ -57,39 +112,35 @@ if [[ ! -v _sev_setup_path || -o login ]] { export _sev_setup_path= } -### temp -# NOTE: it's intentional to separate POSIX tmp for each session (spec says -# programs should not expect data there to be long-lived) and to keep the -# same runtime dir and not create a new one if a new login shell is -# spawned, since the XDG spec calls for the same dir to be utilized for -# each "session". -if [[ ! -v _sev_setup_tmp ]] { +### tmp +# NOTE: specs say that POSIX tmp and XDG runtime directories should exist +# until the last session is logged out (POSIX can exist for longer). +# since we can't reliably keep track of sessions in a cross-platform +# manner, the current implementation should use a separate directory per +# toplevel session (i.e. SHLVL=1). this should placate most applications, +# though it is not expressly spec compliant. +if [[ ! -v _sev_tmp ]] { + _sev_tmp=~/tmp + # create personal tmp dir t=${TMPDIR:-${TEMP:-${TMP:-/tmp}}}/.home-$LOGNAME - h=~/tmp - [[ ! -e $t ]] && mkdir -pm700 $t 2>/dev/null + [[ ! -e $t ]] && mkdir -m700 $t 2>/dev/null if [[ ! -d $t ]] { [[ -o interactive ]] && - print -P "%F{red}!!! Can't create temp dir $t%f" + print -P "%F{red}!!! Can't create tmpdir $t%f" # fallback bare directories - [[ -h $h ]] && unlink $h 2>/dev/null - [[ ! -e $h ]] && mkdir -m700 $h 2>/dev/null + [[ -h $_sev_tmp ]] && unlink $_sev_tmp 2>/dev/null + [[ ! -e $_sev_tmp ]] && mkdir -m700 $_sev_tmp 2>/dev/null } - # [re-]create link to our tmp - [[ -h $h || ! -e $h ]] && ln -sfn $t $h 2>/dev/null + # link home tmp for convenience if there isn't anything meaningful there + [[ -h $_sev_tmp || ! -e $_sev_tmp ]] && ln -sfn $t $_sev_tmp 2>/dev/null + export _sev_tmp=$(realpath $_sev_tmp) + # ensure dir is clean + _sev_zcleanup tmp # finally create our subdir for this session - export _sev_tmp=$h/.session.$$ - # ensure dir doesn't exist. if there is already something there it is - # likely a stale directory or something is very broken—assume the former. - # the user could also want dirs recreated by unsetting the var. - if [[ -h $_sev_tmp ]] { - unlink $_sev_tmp 2>/dev/null - } elif [[ -e $_sev_tmp ]] { - rm -rf $_sev_tmp 2>/dev/null - } - mkdir -m700 $_sev_tmp 2>/dev/null - export TMPDIR=$_sev_tmp TEMP=$_sev_tmp TMP=$_sev_tmp + h=$_sev_tmp/.session.$$ + mkdir -m700 $h 2>/dev/null + export TMPDIR=$h TEMP=$h TMP=$h unset t h - export _sev_setup_tmp= } ### xdg @@ -99,7 +150,7 @@ if [[ ! -v _sev_setup_xdg ]] { # are not present in the array if it was added before we got to it typeset -UT XDG_CONFIG_DIRS xdg_config_dirs export XDG_CONFIG_HOME=~/etc - mkdir -p $XDG_CONFIG_HOME + mkdir $XDG_CONFIG_HOME 2>/dev/null xdg_config_dirs=($XDG_CONFIG_HOME ~/.config {/opt,/usr/local,/usr/pkg,}/etc/xdg "${XDG_CONFIG_DIRS:+${xdg_config_dirs[@]}}") @@ -107,29 +158,29 @@ if [[ ! -v _sev_setup_xdg ]] { typeset -UT XDG_DATA_DIRS xdg_data_dirs export XDG_DATA_HOME=~/share - mkdir -p $XDG_DATA_HOME + mkdir $XDG_DATA_HOME 2>/dev/null xdg_data_dirs=($XDG_DATA_HOME ~/.local/share /{opt,usr/local,usr/pkg,usr}/share "${XDG_DATA_DIRS:+${xdg_data_dirs[@]}}") export XDG_DATA_DIRS=${XDG_DATA_DIRS#$XDG_DATA_HOME} + mkdir ~/var 2>/dev/null export XDG_STATE_HOME=~/var/lib - mkdir -p $XDG_STATE_HOME + mkdir $XDG_STATE_HOME 2>/dev/null + + if [[ -v _sev_tmp ]] { + export XDG_CACHE_HOME=$_sev_tmp/.xdg.cache + mkdir $XDG_CACHE_HOME 2>/dev/null - # use our custom tmp for cache and runtime - export XDG_CACHE_HOME=$_sev_tmp/.xdg.cache - export XDG_RUNTIME_DIR=$_sev_tmp/.xdg.runtime - # create xdg tmp dirs - for x in $XDG_CACHE_HOME $XDG_RUNTIME_DIR; do - # same as in temp creation, ensure it doesn't exist - if [[ -h $x ]]; then - unlink $x 2>/dev/null - elif [[ -e $x ]]; then - rm -rf $x 2>/dev/null + export XDG_RUNTIME_DIR=$TMPDIR/.xdg.runtime + # same as in tmpdir creation, ensure it doesn't exist + if [[ -h $XDG_RUNTIME_DIR ]]; then + unlink $XDG_RUNTIME_DIR 2>/dev/null + elif [[ -e $XDG_RUNTIME_DIR ]]; then + rm -rf $XDG_RUNTIME_DIR 2>/dev/null fi - # XXX: cache does not have to be 700 according to spec - mkdir -m700 $x 2>/dev/null - done + mkdir -m700 $XDG_RUNTIME_DIR 2>/dev/null + } # source user dirs after other vars [[ -e $XDG_CONFIG_HOME/user-dirs.dirs ]] && @@ -137,7 +188,21 @@ if [[ ! -v _sev_setup_xdg ]] { export _sev_setup_xdg= } -### gpg + ssh + forwarding +### dbus +if [[ ! -v DBUS_SESSION_BUS_ADDRESS && -v commands[dbus-launch] ]] { + eval $(dbus-launch) + export DBUS_SESSION_BUS_ADDRESS DBUS_SESSION_BUS_PID +} + +### gpg home +if [[ ! -v GNUPGHOME ]] { + export GNUPGHOME=~/etc/gnupg + if [[ -d ~/.gnupg ]] { + mv ~/.gnupg ~/etc/gnupg + } +} + +### gpg agent + forwarding # NOTE: while ssh manages its auth sock in its protocol when ForwardSsh is # enabled, GPG must be forwarded manually over Unix socket. to support # this, we forward the restricted gpg-agent extra socket to the remote @@ -164,148 +229,142 @@ if [[ ! -v _sev_setup_xdg ]] { # the host if the path the client wants to use is writable. however, this # would open up too many edge cases where it wouldn't work or be clunky # (e.g. asking for password twice) to make it worth it. -if [[ ! -v _sev_setup_agents ]] { - export GNUPGHOME=~/etc/gnupg - - function _socketpath { - # dirs are percent-encoded: https://stackoverflow.com/a/64312099 - echo ${1//(#b)%([[:xdigit:]](#c2))/${(#):-0x$match[1]}} - } +function _gpg_socketpath { + # dirs are percent-encoded: https://stackoverflow.com/a/64312099 + echo ${1//(#b)%([[:xdigit:]](#c2))/${(#):-0x$match[1]}} +} +if [[ ! -v _sev_setup_gpg_forward && -v commands[gpg] ]] { + export _GNUPG_SOCK_DEST_BASE=/tmp/.gpg-agent-forward + export _GNUPG_SOCK_DEST_EXT=$(date +%s).$RANDOM + export _GNUPG_SOCK_DEST=$_GNUPG_SOCK_DEST_BASE.$_GNUPG_SOCK_DEST_EXT + export _sev_gpg_forward_dir=${GNUPGHOME:-~/.gnupg}/.ssh_forward + _sev_zcleanup gpg-forward - ## gpg forwarding - if [[ ! -v _sev_gpg_forwarded && -v commands[gpg] ]] { - export _GNUPG_SOCK_DEST_BASE=/tmp/.gpg-agent-forward - export _GNUPG_SOCK_DEST_EXT=$(date +%s).$RANDOM - export _GNUPG_SOCK_DEST=$_GNUPG_SOCK_DEST_BASE.$_GNUPG_SOCK_DEST_EXT - export _sev_gpg_forward_dir=${GNUPGHOME:-~/.gnupg}/.ssh_forward - # clean up forward dirs if its session is dead or we ask for it - if [[ -d $_sev_gpg_forward_dir ]] { - find $_sev_gpg_forward_dir -type d -mindepth 1 -maxdepth 1 | - while read -r x; do - # NOTE: the only way we can get here is if we have not been - # forwarded before or if the user asks for it. if our own - # pid already has a dir, it is most likely stale, or - # something is very broken—assume the former. - p=$(basename $x) - if [[ -v _sev_gpg_forward_clean || $$ == $p ]] || - ! kill -0 $p 2>/dev/null; then - find $x -mindepth 1 -maxdepth 1 | while read -r y; do - unlink $y - done - rmdir $x - fi - done - unset x p y + # find our forwarded socket + s=($_GNUPG_SOCK_DEST_BASE*(N=oc[1])) + if [[ -n $s && -v SSH_CLIENT ]] { + # create new forward dir + export _sev_setup_gpg_forward= + h=$_sev_gpg_forward_dir/$$ + mkdir -pm700 $h + # XXX: is it safe to link scdaemon socket? can its name be changed? + for x (S.scdaemon gpg.conf gpg-agent.conf sshcontrol + pubring.kbx trustdb.gpg private-keys-v1.d crls.d) { + ln -s ${GNUPGHOME:-~/.gnupg}/$x $h } + export GNUPGHOME=$h + unset h + for x in $(gpgconf --list-dirs | grep 'agent-.*-\?socket:'); do + x=$(_gpg_socketpath ${x/#agent-*socket:}) + if [[ ! -v orig ]] { + # move forwarded socket to first valid agent socket path + # XXX: if tmp is on different filesystem this may not work + mv $s $x + orig=$x + } else { + # make links to forwarded socket for any others + ln -s $orig $x + } + done + unset x orig + } + unset s - # find our forwarded socket - s=($_GNUPG_SOCK_DEST_BASE*(N=oc[1])) - if [[ -n $s && -v SSH_CLIENT ]] { - # create new forward dir - export _sev_gpg_forwarded= - mkdir -pm700 $_sev_gpg_forward_dir - h=$_sev_gpg_forward_dir/$$ - mkdir -pm700 $h - # XXX: is it safe to link scdaemon socket? can its name be changed? - for x in S.scdaemon gpg.conf gpg-agent.conf sshcontrol \ - pubring.kbx trustdb.gpg private-keys-v1.d crls.d; do - ln -s ${GNUPGHOME:-~/.gnupg}/$x $h - done - export GNUPGHOME=$h - unset h - for x in $(gpgconf --list-dirs | grep 'agent-.*-\?socket:'); do - x=$(_socketpath ${x/#agent-*socket:}) - if [[ ! -v orig ]] { - # move forwarded socket to first valid agent socket path - # XXX: if tmp is on different filesystem this may not work - mv $s $x - orig=$x - } else { - # make links to forwarded socket for any others - ln -s $orig $x - } - done - unset x orig - } - unset s + # what we will forward if we start a new ssh connection + # NOTE: do this after setting up GNUPGHOME to pick up new socket path; + # if already connected over SSH, extra should be the remote one + export _GNUPG_SOCK_SRC=$(_gpg_socketpath \ + $(gpgconf --list-dirs agent-extra-socket)) +} elif [[ ! -v _sev_setup_gpg_forward ]] { + # required for RemoteForward to not error out if the vars are unset + [[ ! -v _GNUPG_SOCK_SRC ]] && export _GNUPG_SOCK_SRC=/nonexistent + [[ ! -v _GNUPG_SOCK_DEST ]] && export _GNUPG_SOCK_DEST=/nonexistent +} - # what we will forward if we start a new ssh connection - # NOTE: do this after setting up GNUPGHOME to pick up new socket path; - # if already connected over SSH, extra should be the remote one - export _GNUPG_SOCK_SRC=$(_socketpath \ - $(gpgconf --list-dirs agent-extra-socket)) - } else { - # required for RemoteForward to not error out if the vars are unset - [[ ! -v _GNUPG_SOCK_SRC ]] && export _GNUPG_SOCK_SRC=/nonexistent - [[ ! -v _GNUPG_SOCK_DEST ]] && export _GNUPG_SOCK_DEST=/nonexistent +### gpg agent +if [[ -v commands[gpg-connect-agent] && ( ! -v _sev_setup_gpgagent || + ( -v _sev_first_display && -z $_sev_first_display ) ) ]] { + # avoid printing if we have already set up tty before + [[ ! -v _sev_setup_gpgagent && -o interactive ]] && p=true || p=false + if {$p} { + print -nP '%F{blue}>>>%f GPG: ' + if [[ -v _sev_setup_gpg_forward ]] { + a=agent + print -nP '%F{yellow}Forwarded%f ' + } else { a=Agent } + print -nP '%F{green}' } - - ## gpg agent - if [[ -v commands[gpg-connect-agent] ]] { - [[ -o interactive ]] && print -nP '%F{blue}>>>%f GPG agent: %F{green}' - gpg-connect-agent /bye >/dev/null 2>&1 - if [[ $? -ne 0 ]] { - [[ -o interactive ]] && - print -P '%F{red}Error communicating with GPG agent%f' - } elif [[ ! -v _sev_gpg_forward && ! -v GPG_TTY && - ( -o interactive || -v DISPLAY ) ]] { - # if we aren't forwarded, set up tty if it isn't and we're - # in an interactive session + gpg-connect-agent /bye >/dev/null 2>&1 + if [[ $? -ne 0 ]] { + $p && print -P '%F{red}$a communication error' + } else { + if [[ ${+GPG_TTY} -eq 0 && -o interactive ]] export GPG_TTY=$(tty) - export PINENTRY_USER_DATA=USE_TTY=$((!${+DISPLAY})) - gpg-connect-agent UPDATESTARTUPTTY /bye >/dev/null 2>&1 - [[ -o interactive ]] && - print -P "Updated TTY%f" - } else { - [[ -o interactive ]] && - print -P 'Ready%f' - } + if [[ ( -v DISPLAY || -v WAYLAND_DISPLAY ) && + ${PINENTRY_USER_DATA/USE_TTY=0} == $PINENTRY_USER_DATA ]] + export PINENTRY_USER_DATA=USE_TTY=$(( + ${+DISPLAY} + ${+WAYLAND_DISPLAY} == 0)) + # XXX: don't know if gpg-agent supports comments after directives + # XXX: path could have # + sed -Ei 's#^([[:space:]]*pinentry-program[[:space:]]).*$#\1'${commands[pinentry]:-/dev/null}'#' \ + ${GNUPGHOME:-~/.gnupg}/gpg-agent.conf + # XXX: could probably check for changes before doing this to save perf + gpg-connect-agent RELOADAGENT UPDATESTARTUPTTY /bye >/dev/null 2>&1 + $p && gpg-connect-agent /subst /serverpid \ + "/echo $a pid \${get serverpid} on $GPG_TTY" /bye + export _sev_setup_gpgagent= } + $p && print -nP '%f' + unset p a +} - ## ssh agent +### ssh agent +if [[ ! -v _sev_setup_ssh ]] { # NOTE: preferred order of agents to check: okcagent, gnupg, openssh # first block takes care of okcagent and openssh, second gnupg + # XXX: doesn't actually check if ssh is enabled in gpg [[ -o interactive ]] && print -nP '%F{blue}>>>%f SSH: %F{green}' if [[ ! -v SSH_AUTH_SOCK && ( -v commands[okc-ssh-agent] || ( -v commands[ssh-agent] && ! -v commands[gpg] ) ) ]] { okc=${commands[okc-ssh-agent]:+okc-} - agentfile=~/tmp/${okc}ssh-agent-exports + t=${_sev_tmp:-${TMPDIR:-${TEMP:-${TMP:-/tmp}}}} + e=$t/${okc}ssh-agent-exports typeset sock= typeset -i pid= - if [[ -f $agentfile ]] { - IFS=$'\0' read -r sock pid <$agentfile + if [[ -f $e ]] { + IFS=$'\0' read -r sock pid <$e } if [[ -S $sock && $pid > 0 ]] && kill -0 $pid; then [[ -o interactive ]] && print -P "Reusing agent PID $pid%f" export SSH_AUTH_SOCK=$sock export SSH_AGENT_PID=$pid else - e=${okc}ssh-agent + e='TMPDIR=$t ${okc}ssh-agent' # TODO: ensure ssh-agent path looks legit to avoid unsafe eval? # XXX: doesn't appear to be any other way to handle redirection. # because eval needs to write to current scope environment # subshells can't be used to capture output and print. if [[ -o interactive ]] { - eval `$e` + eval $(eval $=e) print -nP '%f' } else { - eval `$e` >/dev/null 2>&1 + eval $(eval $=e) >/dev/null 2>&1 } - echo -n $SSH_AUTH_SOCK$'\0'$SSH_AGENT_PID >!$agentfile + echo -n $SSH_AUTH_SOCK$'\0'$SSH_AGENT_PID >!$e fi - unset okc agentfile sock pid + unset okc t e sock pid } elif [[ ! -v SSH_AUTH_SOCK && -v commands[gpg] ]] { - # since gpg agent was started above, we just have to export and notify + # since gpg should have been started above, just export and notify if [[ -o interactive ]] { - if [[ -v _sev_gpg_forwarded ]] { - echo 'Remote GPG agent' + if [[ -v _sev_setup_gpg_forward ]] { + echo 'Forwarded GPG agent' } else { gpg-connect-agent /subst /serverpid \ - '/echo GPG agent PID ${get serverpid}' /bye + '/echo GPG agent pid ${get serverpid}' /bye } print -nP '%f' } - export SSH_AUTH_SOCK=$(_socketpath \ + export SSH_AUTH_SOCK=$(_gpg_socketpath \ $(gpgconf --list-dirs agent-ssh-socket)) } elif [[ -v SSH_AUTH_SOCK ]] { [[ -o interactive ]] && print -P 'Preconfigured agent%f' @@ -313,18 +372,17 @@ if [[ ! -v _sev_setup_agents ]] { [[ -o interactive ]] && print -P '%F{red}No agent available%f' } - ## cleanup - unfunction _socketpath - - export _sev_setup_agents= + export _sev_setup_ssh= } +unfunction _gpg_socketpath -## perl local lib -# TODO: debounce this -[[ -v commands[perl] && -d $XDG_DATA_HOME/perl5/lib/perl5 ]] && - eval $(perl -I$XDG_DATA_HOME/perl5/lib/perl5 +### perl local lib +[[ -v commands[perl] && -d $XDG_DATA_HOME/perl5/lib/perl5 && + ! -v PERL_LOCAL_LIB_ROOT ]] && + eval $(perl -I$XDG_DATA_HOME/perl5/lib/perl5 \ -Mlocal::lib=$XDG_DATA_HOME/perl5 2>/dev/null) + ### load site-specific if [[ -f ~/.zprofile.local ]] { source ~/.zprofile.local } diff --git a/base/.zshenv b/base/.zshenv index a709ce6..7e8dee7 100644 --- a/base/.zshenv +++ b/base/.zshenv @@ -2,28 +2,32 @@ [[ -f ~/.zshenv.local ]] && source ~/.zshenv.local ### fix broken term -if (( $#terminfo == 0 )) { - [[ -o interactive ]] && - print -P "%F{red}!!! Can't find terminfo for $TERM, using xterm%f" - TERM=xterm +if [[ -o interactive && $#terminfo -eq 0 ]] { + _oldterm=$TERM + TERM=xterm-256color >/dev/null 2>&1 + print -P "%F{red}!!! Can't find terminfo for $_oldterm, using $term%f" + unset _oldterm } -### early zprofile sourcing -# NOTE: see comments in .zprofile for additional rationale for this -if [[ ! -o login ]] { - if [[ -v _sev_olduser && $_sev_olduser != $USERNAME ]] { - # set up some user-dependent stuff since we switched users - # XXX: _sev_switched_users is no longer implemented - _sev_switched_users= source ${ZDOTDIR:-~}/.zprofile +if [[ -o login ]] { + ### cd on login shell for convenience + cd ~ +} else { + if [[ ! -v _sev_first_display && ( -v DISPLAY || -v WAYLAND_DISPLAY ) ]] { + # this is to allow gpg and pinentry env to be updated + # XXX: will be sourced by every new child shell if zsh is not used to + # start the graphical session, but since .zprofile is light that + # shouldn't cause a noticeable performance impact + # NOTE: above happens with sway without a display manager or launcher + export _sev_first_display= + source ${ZDOTDIR:-~}/.zprofile + export _sev_first_display=0 } elif [[ $SHLVL == 1 ]] { - # ensure profile is loaded for toplevel shells; should hopefully be 1 - # under Xorg or cron, which is where this would be most useful + ### early zprofile sourcing for first shell + # NOTE: ensure profile is loaded for toplevel shells; should hopefully be 1 + # under some Xorg or cron implementations, which is where this would be most useful source ${ZDOTDIR:-~}/.zprofile } -} else { - # for convenience - cd ~ } -export _sev_olduser=$USERNAME # vim: et sts=4 sw=4 ts=8 tw=79 diff --git a/bin/pinentry b/bin/pinentry index 0bd1062..16c2144 100755 --- a/bin/pinentry +++ b/bin/pinentry @@ -1,9 +1,9 @@ #!/bin/sh # https://kevinlocke.name/bits/2019/07/31/prefer-terminal-for-gpg-pinentry -set -Ce -gfx="gnome gtk-2 gtk qt x11" -tty="curses tty" +set -C +gfx="gnome qt gtk-4 gtk-3 gtk-2 gtk bemenu dmenu x11" +tty="curses-ss curses tty" case "${PINENTRY_USER_DATA-}" in # prefer tty unless USE_TTY is 0 *USE_TTY=0*) list="$gfx $tty";; @@ -11,7 +11,7 @@ case "${PINENTRY_USER_DATA-}" in esac for x in $list; do - p=$(command -v "pinentry-$x") 2>/dev/null + p=$(which "pinentry-$x") if [ $? = 0 ]; then exec "$p" "$@" fi diff --git a/etc/Trolltech.conf b/etc/Trolltech.conf new file mode 100644 index 0000000..e148896 --- /dev/null +++ b/etc/Trolltech.conf @@ -0,0 +1,2 @@ +[Qt] +style=GTK+ diff --git a/etc/gtk-3.0/settings.ini b/etc/gtk-3.0/settings.ini index 6882323..93c54c7 100644 --- a/etc/gtk-3.0/settings.ini +++ b/etc/gtk-3.0/settings.ini @@ -4,7 +4,7 @@ gtk-theme-name=Blackbird gtk-icon-theme-name=Paper-Mono-Dark gtk-application-prefer-dark-theme=true gtk-cursor-theme-name=Paper -gtk-cursor-theme-size=0 +gtk-cursor-theme-size=24 gtk-toolbar-style=GTK_TOOLBAR_BOTH_HORIZ gtk-toolbar-icon-size=GTK_ICON_SIZE_SMALL_TOOLBAR gtk-button-images=1 diff --git a/etc/gtk-4.0/settings.ini b/etc/gtk-4.0/settings.ini new file mode 100644 index 0000000..c164bcc --- /dev/null +++ b/etc/gtk-4.0/settings.ini @@ -0,0 +1,14 @@ +[Settings] +gtk-font-name=monospace 10 +# TODO: Blackbird doesn't support gtk4 +#gtk-theme-name=Blackbird +gtk-icon-theme-name=Paper-Mono-Dark +gtk-application-prefer-dark-theme=true +gtk-cursor-theme-name=Paper +gtk-cursor-theme-size=24 +gtk-enable-event-sounds=1 +gtk-enable-input-feedback-sounds=1 +gtk-xft-antialias=1 +gtk-xft-hinting=1 +gtk-xft-hintstyle=hintslight +gtk-xft-rgba=none diff --git a/etc/sway/config b/etc/sway/config index ce0f7fd..626e9cd 100644 --- a/etc/sway/config +++ b/etc/sway/config @@ -1,19 +1,11 @@ ### load system include /etc/sway/config.d/* -### exports -# XXX: this works but I feel like it shouldn't -exec '\ - export XDG_SESSION_TYPE=${XDG_SESSION_TYPE:-wayland}; \ - export QT_QPA_PLATFORM=${QT_QPA_PLATFORM:-wayland-egl}; \ - export QT_WAYLAND_DISABLE_WINDOWDECORATION=${QT_WAYLAND_DISABLE_WINDOWDECORATION:--1}; \ - export SDL_VIDEODRIVER=${SDL_VIDEODRIVER:-wayland}; \ - export TERMINAL=${TERMINAL:-footclient}' - ### daemons +exec pipewire exec dunst -exec foot --server #exec mpc-notify -d +exec foot --server exec swayidle timeout 600 'swaymsg "output * dpms off"' resume 'swaymsg "output * dpms on"' # x220t # TODO: check hostname to load auxillary things @@ -22,7 +14,6 @@ exec swayidle timeout 600 'swaymsg "output * dpms off"' resume 'swaymsg "output ### Xorg config xwayland force -# XXX: this works but I feel like it shouldn't exec xrdb -merge ~/.Xresources exec '\ find -L "$${XDG_DATA_HOME:-~/share}/fonts" -mindepth 1 -maxdepth 2 -type d | while read -r x; do \ @@ -234,6 +225,7 @@ client.placeholder $b_bdr $b_bg $b_fg $b_ind $b_chb client.background #221100 force_display_urgency_hint 2000 ms +## bars bar { position top tray_output primary @@ -254,5 +246,8 @@ bar { } } +## criteria +for_window [app_id="pinentry-qt"] floating enable + ### load site-local include config.d/* diff --git a/gnupg/gpg-agent.conf b/gnupg/gpg-agent.conf index 52034d5..1429d36 100644 --- a/gnupg/gpg-agent.conf +++ b/gnupg/gpg-agent.conf @@ -1,2 +1,4 @@ enable-ssh-support -enable-putty-support \ No newline at end of file +enable-putty-support + +pinentry-program /sbin/pinentry diff --git a/install.sh b/install.sh index 32e5b61..5623d62 100755 --- a/install.sh +++ b/install.sh @@ -42,7 +42,8 @@ esac l() { # TODO: use install? - [ -L "$1" -o \! -e "$1" ] && ln $lnargs "$SRC/${2:-$x}" "$DEST/${1:-$x}" || + d="$DEST/${1:-$x}" + [ -L "$d" -o \! -e "$d" ] && ln $lnargs "$SRC/${2:-$x}" "$d" || echo "!!! File exists and is not a link: $1" } @@ -51,26 +52,33 @@ find base -mindepth 1 -maxdepth 1 | while read -r x; do l "${x#base/}"; done find bin etc share -mindepth 1 -maxdepth 1 | while read -r x; do l; done # xorg/wayland resources -find gui -mindepth 1 -maxdepth 1 | while read -r x; do - if [ "$x" = gui/fonts ]; then - find $x -mindepth 1 -maxdepth 2 -type d | while read -r x; do - which mkfontscale >$devnull 2>&1 && mkfontscale "$x" - which mkfontdir >$devnull 2>&1 && mkfontdir "$x" - [ "$(head -1 "$x/fonts.scale" >$devnull 2>&1)" = 0 ] && - rm "$x/fonts.scale" - [ "$(head -1 "$x/fonts.dir" >$devnull 2>&1)" = 0 ] && - rm "$x/fonts.dir" - done - elif [ "$x" = gui/icons ]; then - find $x -mindepth 1 -maxdepth 2 -type d | while read -r x; do - [ ! -e "$x/index.theme" ] && continue - which gtk-update-icon-cache >$devnull 2>&1 && - gtk-update-icon-cache "$x" - done - fi - find "$x" -mindepth 1 -maxdepth 1 | while read -r x; do - l "share${x#gui}" - done +find gui -mindepth 1 -maxdepth 1 | while read -r y; do + case "${y#gui/}" in + icons|themes) + find "$y" -mindepth 1 -maxdepth 2 -type d | while read -r x; do + [ ! -e "$x/index.theme" ] && continue + which gtk-update-icon-cache >$devnull 2>&1 && + gtk-update-icon-cache -f "$x" + l "share${y#gui}/$(basename "$x")" + done + ;; + fonts) + find "$y" -mindepth 1 -maxdepth 2 -type d | while read -r x; do + which mkfontscale >$devnull 2>&1 && mkfontscale "$x" + which mkfontdir >$devnull 2>&1 && mkfontdir "$x" + [ "$(head -1 "$x/fonts.scale" >$devnull 2>&1)" = 0 ] && + rm "$x/fonts.scale" + [ "$(head -1 "$x/fonts.dir" >$devnull 2>&1)" = 0 ] && + rm "$x/fonts.dir" + l "share${y#gui}/$(basename "$x")" + done + ;; + *) + find "$y" -mindepth 1 -maxdepth 1 | while read -r x; do + l "share${x#gui}" + done + ;; + esac done # gpg -- 2.47.0