chvp/nixos-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Pass changes

Browse source
This commit is contained in:
Charlotte Van Petegem 2020-04-30 14:16:51 +02:00
parent 0c26b0e6fa
commit dfcd258971
6 changed files with 46 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
profiles/common/default.nix
View file

@ -59,7 +59,7 @@
]; ];
} }
) )
(pass.withExtensions (ext: [ ext.pass-otp ext.pass-genphrase ])) (import ../../programs/pass/default.nix { inherit pkgs; })
ripgrep ripgrep
unzip unzip
]; ];

8
profiles/graphical/default.nix
View file

@ -70,13 +70,7 @@
chromium chromium
citrix_workspace citrix_workspace
deluge deluge
( (import ../../programs/firefox/default.nix { inherit pkgs; })
firefox.override {
extraNativeMessagingHosts = [
(passff-host.override { pass = (pass.withExtensions (ext: [ ext.pass-otp ext.pass-genphrase ])); })
];
}
)
google-chrome google-chrome
(gnupg.override { guiSupport = true; }) (gnupg.override { guiSupport = true; })
hledger hledger

7
programs/firefox/default.nix Normal file
View file

@ -0,0 +1,7 @@
{ pkgs }:
(pkgs.firefox.override {
extraNativeMessagingHosts = [
(pkgs.passff-host.override { pass = (import ../pass/default.nix { inherit pkgs; }); })
];
})

3
programs/pass/default.nix Normal file
View file

@ -0,0 +1,3 @@
{ pkgs }:
(pkgs.pass-wayland.override { pass = pkgs.pass-wayland; }).withExtensions (ext: [ ext.pass-otp ext.pass-genphrase ])

3
programs/sway/default.nix
View file

@ -1,6 +1,7 @@
with import <nixpkgs> { }; with import <nixpkgs> { };
{ pkgs, ... }: { pkgs, ... }:
let let
firefox = import ../firefox/default.nix { inherit pkgs; };
launcher = import ./launcher.nix { inherit pkgs stdenv; }; launcher = import ./launcher.nix { inherit pkgs stdenv; };
color-picker = import ./color-picker.nix { inherit pkgs; }; color-picker = import ./color-picker.nix { inherit pkgs; };
screenshot = import ./screenshot.nix { inherit pkgs; }; screenshot = import ./screenshot.nix { inherit pkgs; };
@ -97,7 +98,7 @@ in
### Startup programs ### Startup programs
# #
exec ${pkgs.firefox}/bin/firefox exec ${firefox}/bin/firefox
exec ${pkgs.thunderbird}/bin/thunderbird exec ${pkgs.thunderbird}/bin/thunderbird
exec ${pkgs.joplin-desktop}/bin/joplin-desktop exec ${pkgs.joplin-desktop}/bin/joplin-desktop
exec ${pkgs.teams}/bin/teams exec ${pkgs.teams}/bin/teams

33
programs/sway/launcher.nix
View file

@ -1,5 +1,6 @@
{ pkgs, stdenv }: { pkgs, stdenv }:
let let
pass = import ../pass/default.nix { inherit pkgs; };
gemoji = pkgs.buildRubyGem { gemoji = pkgs.buildRubyGem {
pname = "gemoji"; pname = "gemoji";
gemName = "gemoji"; gemName = "gemoji";
@ -57,6 +58,36 @@ pkgs.writeScriptBin "launcher" ''
${pkgs.sway}/bin/swaymsg exec -- "echo -n $char | ${pkgs.wl-clipboard}/bin/wl-copy --foreground" ${pkgs.sway}/bin/swaymsg exec -- "echo -n $char | ${pkgs.wl-clipboard}/bin/wl-copy --foreground"
} }
pass_options(){
prefix=''${PASSWORD_STORE_DIR-~/.password-store}
password_files=( "$prefix"/**/*.gpg )
printf 'pass password %s\n' ''${''${password_files%.gpg}#$prefix/}
printf 'pass username %s\n' ''${''${password_files%.gpg}#$prefix/}
printf 'pass otp %s\n' ''${''${password_files%.gpg}#$prefix/}
printf 'pass edit %s\n' ''${''${password_files%.gpg}#$prefix/}
}
pass() {
option=$(echo $1 | sed "s/^\([^ ]*\) .*$/\1/")
passfile=$(echo $1 | sed "s/^[^ ]* \(.*$\)/\1/")
echo $option
echo $passfile
case $option in
username)
swaymsg exec -- "${pass}/bin/pass show '$passfile' | sed -n 's/^Username: *//p' | tr -d '\n' | ${pkgs.wl-clipboard}/bin/wl-copy --foreground"
;;
password)
swaymsg exec -- "${pass}/bin/pass show -c0 '$passfile'"
;;
otp)
swaymsg exec -- "${pass}/bin/pass otp -c '$passfile'"
;;
edit)
${pass}/bin/pass edit "$passfile"
;;
esac
}
record_options() { record_options() {
${pkgs.sway}/bin/swaymsg -t get_outputs | ${pkgs.jq}/bin/jq -r '.[]["name"]' | sed "s/^/record /" ${pkgs.sway}/bin/swaymsg -t get_outputs | ${pkgs.jq}/bin/jq -r '.[]["name"]' | sed "s/^/record /"
echo record select echo record select
@ -125,7 +156,7 @@ pkgs.writeScriptBin "launcher" ''
${pkgs.sway}/bin/swaymsg \[con_id="$window"\] focus ${pkgs.sway}/bin/swaymsg \[con_id="$window"\] focus
} }
CHOSEN=$(cat <(windows_options) <(tmuxinator_options) <(ssh_options) <(systemctl_options) <(run_options) <(record_options) <(calc_options) <(emoji_options) | ${pkgs.fzy}/bin/fzy --lines 36 | tail -n1) CHOSEN=$(cat <(windows_options) <(tmuxinator_options) <(ssh_options) <(systemctl_options) <(pass_options) <(run_options) <(record_options) <(calc_options) <(emoji_options) | ${pkgs.fzy}/bin/fzy --lines 36 | tail -n1)
if [ -n "$CHOSEN" ] if [ -n "$CHOSEN" ]
then then