Merge staging-next into staging

2019-10-22 09:20:03 +02:00
parent 43bbecea5e d3baf946b7
commit a456fbfeed
181 changed files with 2659 additions and 1528 deletions
@@ -31,6 +31,8 @@ with lib;

  config = mkIf config.programs.seahorse.enable {

+    programs.ssh.askPassword = mkDefault "${pkgs.gnome3.seahorse}/libexec/seahorse/ssh-askpass";
+
    environment.systemPackages = [
      pkgs.gnome3.seahorse
    ];