diff options
| -rwxr-xr-x | bin/prepinentry | 10 | ||||
| -rwxr-xr-x | gnupg/.gnupg/pinentry-dmenu | 3 | ||||
| -rwxr-xr-x | scripts/install-packages.sh | 2 | ||||
| -rw-r--r-- | sway/.config/sway/config | 1 |
4 files changed, 14 insertions, 2 deletions
diff --git a/bin/prepinentry b/bin/prepinentry new file mode 100755 index 0000000..bec7c46 --- /dev/null +++ b/bin/prepinentry @@ -0,0 +1,10 @@ +#!/bin/bash + +TARGET_PROGRAM="/home/chris/.gnupg/pinentry-dmenu" + +inotifywait -m -e access "$TARGET_PROGRAM" | while read; do + if [ -f "/home/chris/.gnupg/current_monitor" ]; then + rm /home/chris/.gnupg/current_monitor + fi + swaymsg -t get_outputs | jq -r '.[] | select(.focused==true).name' >> /home/chris/.gnupg/current_monitor +done diff --git a/gnupg/.gnupg/pinentry-dmenu b/gnupg/.gnupg/pinentry-dmenu index e66c127..8b5b2af 100755 --- a/gnupg/.gnupg/pinentry-dmenu +++ b/gnupg/.gnupg/pinentry-dmenu @@ -3,8 +3,9 @@ echo 'OK this mf ready' while read stdin; do + MONITOR=$(cat /home/chris/.gnupg/current_monitor) case $stdin in - *GETPIN*) echo "D `dmenu-wl -P -po "$KEYNAME ($KEYID)" -nb '#2b3339' -nf '#d3c6aa' -sb '#d3c6aa' -sf '#212736' -h 22 -fn 'DroidSansM Nerd Font'`"; echo "OK" ;; + *GETPIN*) echo "D `dmenu-wl -m $MONITOR -P -po "$KEYNAME ($KEYID)" -nb '#2b3339' -nf '#d3c6aa' -sb '#d3c6aa' -sf '#212736' -h 22 -fn 'DroidSansM Nerd Font'`"; echo "OK" ;; *SETDESC*) KEYNAME=${stdin#*:%0A%22}; KEYNAME=${KEYNAME%\%22\%0A*}; KEYID=${stdin#*ID }; KEYID=${KEYID%,*}; echo OK ;; *SETERROR*) notify-send "${stdin#SETERROR }"; echo "OK" ;; *BYE*) exit 0 ;; diff --git a/scripts/install-packages.sh b/scripts/install-packages.sh index 7f08268..e1ad294 100755 --- a/scripts/install-packages.sh +++ b/scripts/install-packages.sh @@ -1,7 +1,7 @@ #!/usr/bin/bash # install packages -sudo pacman -S bash-completion fzf grim pacman-contrib python-tldextract pass gnupg base-devel libnotify wl-clipboard qt6-wayland xorg-server-xwayland nerd-fonts zoxide waybar bison startup-notification flex wayland-protocols pkg-config cmake gcc alacritty dunst neovim qutebrowser starship xdg-user-dirs zathura zathura-pdf-mupdf meson ninja +sudo pacman -S bash-completion fzf grim pacman-contrib python-tldextract pass gnupg base-devel libnotify wl-clipboard qt6-wayland xorg-server-xwayland nerd-fonts zoxide waybar bison startup-notification flex wayland-protocols pkg-config cmake gcc alacritty dunst neovim qutebrowser starship xdg-user-dirs zathura zathura-pdf-mupdf meson ninja inotify-tools sudo pacman -S pipewire pipewire-audio pipewire-alsa pipewire-pulse pavucontrol diff --git a/sway/.config/sway/config b/sway/.config/sway/config index e77b64f..c898fe1 100644 --- a/sway/.config/sway/config +++ b/sway/.config/sway/config @@ -156,6 +156,7 @@ bindsym $mod+Shift+g exec steam-launcher exec --no-startup-id /usr/bin/dunst exec --no-startup-id /usr/bin/syncthing --no-browser exec_always --no-startup-id random-wallpaper +exec --no-startup-id prepinentry input * { xkb_layout "eu" |