From 881d9ed9e627501af7ecdf05f4aeaf5e69020114 Mon Sep 17 00:00:00 2001 From: awy Date: Mon, 28 Oct 2024 00:13:29 +0300 Subject: fix --- .config/hypr/hyprland.conf | 3 ++- .config/hypr/start | 6 ------ .config/zsh/.zshrc | 6 +++++- 3 files changed, 7 insertions(+), 8 deletions(-) (limited to '.config') diff --git a/.config/hypr/hyprland.conf b/.config/hypr/hyprland.conf index aecf747..7767d41 100644 --- a/.config/hypr/hyprland.conf +++ b/.config/hypr/hyprland.conf @@ -9,8 +9,9 @@ exec-once=dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRE exec-once = pipewire & pipewire-pulse & wireplumber exec-once = start-portal exec-once = hyprpaper & dunst -exec-once = sleep 2.5 && waybar exec-once = lxqt-policykit-agent +exec-once = gpg-agent --daemon +exec-once = sleep 2.5 && waybar env = QT_SCREEN_SCALE_FACTORS,1;1 env = XCURSOR_SIZE,24 diff --git a/.config/hypr/start b/.config/hypr/start index 05c20f4..1a33484 100755 --- a/.config/hypr/start +++ b/.config/hypr/start @@ -4,10 +4,4 @@ export XDG_RUNTIME_DIR="/tmp/hyprland" mkdir -p $XDG_RUNTIME_DIR chmod 0700 $XDG_RUNTIME_DIR -gpg-connect-agent updatestartuptty /bye >/dev/null -unset SSH_AGENT_PID -if [ "${gnupg_SSH_AUTH_SOCK_by:-0}" -ne $$ ]; then - export SSH_AUTH_SOCK="$(gpgconf --list-dirs agent-ssh-socket)" -fi - exec dbus-launch --exit-with-session Hyprland diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc index d9a511d..a2c2dfe 100644 --- a/.config/zsh/.zshrc +++ b/.config/zsh/.zshrc @@ -39,7 +39,11 @@ lfcd () { } bindkey -s '^o' '^ulfcd\n' -export GPG_TTY=$(tty) +unset SSH_AGENT_PID +if [ "${gnupg_SSH_AUTH_SOCK_by:-0}" -ne $$ ]; then + export SSH_AUTH_SOCK="$(gpgconf --list-dirs agent-ssh-socket)" +fi + export PASSWORD_STORE_CLIP_TIME=5 # Load syntax highlighting; should be last. source /usr/share/zsh/plugins/fast-syntax-highlighting/fast-syntax-highlighting.plugin.zsh 2>/dev/null -- cgit v1.2.3