pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #12590 from exi/askpass-in-env

nixos-ssh: set SSH_ASKPASS globally and not just on interactive shells

Franz Pletz ff510219 3622038d

options
unified split
Changed files
+1 -4
nixos
modules
programs
ssh.nix
+1 -4
nixos/modules/programs/ssh.nix 
···

       
221

       
221

       
 

       
        fi


     

       
222

       
222

       
 

       
      '';


     

       
223

       
223

       
 

       



     

       
224

       

       
-

       
    environment.interactiveShellInit = optionalString config.services.xserver.enable


     

       
225

       

       
-

       
      ''


     

       
226

       

       
-

       
        export SSH_ASKPASS=${askPassword}


     

       
227

       

       
-

       
      '';


     

       

       
224

       
+

       
    environment.variables.SSH_ASKPASS = optionalString config.services.xserver.enable askPassword;


     

       
228

       
225

       
 

       



     

       
229

       
226

       
 

       
    programs.ssh.askPassword = mkDefault "${pkgs.x11_ssh_askpass}/libexec/x11-ssh-askpass";


     

       
230

       
227