diff --git a/assets/screens/chscheme.png b/assets/screens/chscheme.png new file mode 100644 index 0000000..8976e64 Binary files /dev/null and b/assets/screens/chscheme.png differ diff --git a/assets/screens/keyring.gif b/assets/screens/keyring.gif deleted file mode 100644 index 76dabab..0000000 Binary files a/assets/screens/keyring.gif and /dev/null differ diff --git a/assets/screens/keyring.png b/assets/screens/keyring.png new file mode 100644 index 0000000..bd3a327 Binary files /dev/null and b/assets/screens/keyring.png differ diff --git a/modules/home/environment/hyprland/config.nix b/modules/home/environment/hyprland/config.nix index 6befe84..ad87282 100644 --- a/modules/home/environment/hyprland/config.nix +++ b/modules/home/environment/hyprland/config.nix @@ -157,7 +157,7 @@ "super, c, killactive," "super, e, exec, [float;size 45% 70%;move 10 50] kitty btop" "super, n, exec, [float;size 50% 35%;move 10 50] pavucontrol" - "super, p, exec, [float;size 25% 30%;move onscreen cursor 20 20] [ ! -f /tmp/passhelperfile ] && kitty passhelper" + "super, p, exec, [float;size 25% 30%;move onscreen cursor 20 20] [ ! -f /tmp/keyringfile ] && kitty keyring" "super, 0, exec, aplay ~/assets/sound/soundtest.wav" "super shift, q, exit," "super, m, exec, fuzzel" diff --git a/modules/home/scripts/default.nix b/modules/home/scripts/default.nix index 57eb091..a4f5635 100644 --- a/modules/home/scripts/default.nix +++ b/modules/home/scripts/default.nix @@ -8,7 +8,7 @@ self = self; pkgs = pkgs; }; - passhelper = import ./wm-controls/passhelper.nix { + keyring = import ./wm-controls/keyring.nix { self = self; pkgs = pkgs; }; @@ -93,7 +93,7 @@ in { home.packages = [ compress chscheme - passhelper + keyring crs extract garbage-collect diff --git a/modules/home/scripts/wm-controls/passhelper.nix b/modules/home/scripts/wm-controls/passhelper.nix index f61ba5b..caac6d3 100644 --- a/modules/home/scripts/wm-controls/passhelper.nix +++ b/modules/home/scripts/wm-controls/passhelper.nix @@ -3,21 +3,21 @@ pkgs, ... }: -pkgs.writeShellScriptBin "passhelper" '' +pkgs.writeShellScriptBin "keyring" '' #!/run/current-system/sw/bin/bash # prevent multiple instances, conditional check happens in the hyprland bind - touch /tmp/passhelperfile - trap "[ -f /tmp/passhelperfile ] && /run/current-system/sw/bin/rm /tmp/passhelperfile" EXIT SIGHUP SIGINT + touch /tmp/keyringfile + trap "[ -f /tmp/keyringfile ] && /run/current-system/sw/bin/rm /tmp/keyringfile" EXIT SIGHUP SIGINT # get passwords from password store, remove .password store/ prefix and .gpg suffix, exlude .gpg-id file, open results in fzf pass_string=$(find $HOME/.password-store -type f | sed 's|.*/.password-store/||; s|\.gpg$||' | sed 's|^\([^/]*\)|\x1b[32m\1\x1b[0m|' | rg -v "\.git|.gpg-id" | sort -r | fzf --border --border-label="$(whoami)'s keyring" --ansi --layout=reverse) - [ $? = 0 ] || { [ -f /tmp/passhelperfile ] && /run/current-system/sw/bin/rm /tmp/passhelperfile; exit 1; } + [ $? = 0 ] || { [ -f /tmp/keyringfile ] && /run/current-system/sw/bin/rm /tmp/keyringfile; exit 1; } # pass it through fmt for soft word wrapping pass -c "$pass_string" | fmt -w 45 - /run/current-system/sw/bin/rm /tmp/passhelperfile + /run/current-system/sw/bin/rm /tmp/keyringfile sleep 0.5 exit 0 ''