feat(client): add default curses-based ssh-askpass
This commit is contained in:
parent
60642a9ba7
commit
00c926e45b
3 changed files with 23 additions and 4 deletions
|
@ -1,4 +1,4 @@
|
||||||
{ pkgs, config, ... }:
|
{ lib, pkgs, ... }:
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
./common.nix
|
./common.nix
|
||||||
|
@ -15,8 +15,7 @@
|
||||||
nixd
|
nixd
|
||||||
];
|
];
|
||||||
|
|
||||||
# fix for wsl, `prefer` does not work if your SSH_ASKPASS is empty/unset
|
variables.SSH_ASKPASS_REQUIRE = "prefer";
|
||||||
variables.SSH_ASKPASS_REQUIRE = if config.programs.ssh.enableAskPassword then "prefer" else "never";
|
|
||||||
};
|
};
|
||||||
|
|
||||||
networking = {
|
networking = {
|
||||||
|
@ -30,7 +29,11 @@
|
||||||
|
|
||||||
programs = {
|
programs = {
|
||||||
nix-ld.enable = true;
|
nix-ld.enable = true;
|
||||||
ssh.startAgent = true;
|
ssh = {
|
||||||
|
startAgent = true;
|
||||||
|
enableAskPassword = true;
|
||||||
|
askPassword = lib.mkDefault "${pkgs.curses-ssh-askpass}"; # see exprs/curses-ssh-askpass.nix
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
virtualisation.docker.enable = true;
|
virtualisation.docker.enable = true;
|
||||||
|
|
15
exprs/curses-ssh-askpass.nix
Normal file
15
exprs/curses-ssh-askpass.nix
Normal file
|
@ -0,0 +1,15 @@
|
||||||
|
{
|
||||||
|
lib,
|
||||||
|
pinentry-curses,
|
||||||
|
writeShellScript,
|
||||||
|
}:
|
||||||
|
writeShellScript "curses-ssh-askpass" ''
|
||||||
|
if [ -z ''${1+x} ]; then
|
||||||
|
prompt="GETPIN"
|
||||||
|
else
|
||||||
|
prompt="SETDESC $1\nGETPIN"
|
||||||
|
fi
|
||||||
|
|
||||||
|
pin=$(echo -e "$prompt" | ${lib.getExe pinentry-curses} -T /dev/pts/0 | grep D | tr -d '\n')
|
||||||
|
echo "''${pin:2}"
|
||||||
|
''
|
|
@ -1,5 +1,6 @@
|
||||||
inputs: final: prev: {
|
inputs: final: prev: {
|
||||||
idea-ultimate-fixed = prev.callPackage ./idea-fixed.nix { };
|
idea-ultimate-fixed = prev.callPackage ./idea-fixed.nix { };
|
||||||
|
curses-ssh-askpass = prev.callPackage ./curses-ssh-askpass.nix { };
|
||||||
|
|
||||||
vencord = prev.vencord.overrideAttrs (old: rec {
|
vencord = prev.vencord.overrideAttrs (old: rec {
|
||||||
version = "${old.version}+git.${inputs.vencord.shortRev}";
|
version = "${old.version}+git.${inputs.vencord.shortRev}";
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue