Compare commits
3
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d4c2b37d46
|
||
|
|
15d4a06719
|
||
|
|
6bbd22bce8
|
@@ -125,6 +125,7 @@
|
||||
##------------------------------
|
||||
programs = {
|
||||
zsh.enable = true;
|
||||
nix-ld.enable = true;
|
||||
};
|
||||
|
||||
# System Packages
|
||||
|
||||
@@ -1,6 +1,3 @@
|
||||
Warning: Identity file /home/jpporta/.ssh/id_rsa not accessible: No such file or directory.
|
||||
Warning: Identity file /home/jpporta/.ssh/id_rsa not accessible: No such file or directory.
|
||||
Warning: Identity file /home/jpporta/.ssh/id_rsa not accessible: No such file or directory.
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
@@ -36,6 +33,7 @@ Warning: Identity file /home/jpporta/.ssh/id_rsa not accessible: No such file or
|
||||
../../modules/home-manager/openspec
|
||||
../../modules/home-manager/power-profiles
|
||||
../../modules/home-manager/ntfy-notify
|
||||
../../modules/home-manager/pinentry
|
||||
|
||||
inputs.zen-browser.homeModules.beta
|
||||
];
|
||||
@@ -117,6 +115,7 @@ Warning: Identity file /home/jpporta/.ssh/id_rsa not accessible: No such file or
|
||||
];
|
||||
|
||||
programs = {
|
||||
nvm.enable = true;
|
||||
zen-browser.enable = true;
|
||||
git = {
|
||||
enable = true;
|
||||
@@ -150,13 +149,7 @@ Warning: Identity file /home/jpporta/.ssh/id_rsa not accessible: No such file or
|
||||
gpg.enable = true;
|
||||
};
|
||||
|
||||
services.gpg-agent = {
|
||||
enable = true;
|
||||
pinentry.package = pkgs.pinentry-rofi;
|
||||
enableSshSupport = true; # only if you use gpg keys as ssh keys
|
||||
defaultCacheTtl = 3600;
|
||||
maxCacheTtl = 86400;
|
||||
};
|
||||
custom.pinentry.enable = true;
|
||||
|
||||
services.swaync.enable = true;
|
||||
}
|
||||
|
||||
@@ -11,7 +11,6 @@
|
||||
worktrunk
|
||||
sesh
|
||||
sl
|
||||
ntfy-sh
|
||||
signal-cli
|
||||
];
|
||||
};
|
||||
|
||||
@@ -0,0 +1,32 @@
|
||||
{
|
||||
lib,
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
|
||||
let
|
||||
pinentry-wrapper = pkgs.writeShellScriptBin "pinentry-wrapper" ''
|
||||
if [ -n "''${SSH_CONNECTION:-}" ] || [ -n "''${SSH_TTY:-}" ]; then
|
||||
exec ${pkgs.pinentry-curses}/bin/pinentry-curses "$@"
|
||||
else
|
||||
exec ${pkgs.pinentry-rofi}/bin/pinentry-rofi "$@"
|
||||
fi
|
||||
'';
|
||||
in {
|
||||
options.custom.pinentry = {
|
||||
enable = lib.mkEnableOption "adaptive pinentry: rofi on TTY, curses on SSH";
|
||||
};
|
||||
|
||||
config = lib.mkIf config.custom.pinentry.enable {
|
||||
home.packages = [ pinentry-wrapper ];
|
||||
|
||||
services.gpg-agent = {
|
||||
enable = true;
|
||||
pinentry.package = pinentry-wrapper;
|
||||
enableSshSupport = true;
|
||||
defaultCacheTtl = 3600;
|
||||
maxCacheTtl = 86400;
|
||||
};
|
||||
};
|
||||
}
|
||||
Reference in New Issue
Block a user