sdf
This commit is contained in:
@@ -75,11 +75,15 @@ in {
|
||||
fish.enable = lib.mkDefault true;
|
||||
gnupg.agent = {
|
||||
enable = lib.mkDefault true;
|
||||
<<<<<<< Updated upstream
|
||||
<<<<<<< HEAD
|
||||
pinentryPackage = lib.mkForce pkgs.pinentry-qt;
|
||||
=======
|
||||
# pinentryPackage = pkgs.pinentry-curses;
|
||||
>>>>>>> d18eaa1 (update default)
|
||||
=======
|
||||
# pinentryPackage = lib.mkForce pkgs.pinentry-qt;
|
||||
>>>>>>> Stashed changes
|
||||
enableSSHSupport = lib.mkDefault true;
|
||||
};
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user