mirror of
https://github.com/nix-community/home-manager
synced 2024-11-23 11:39:46 +01:00
gpg: remove obsolete default values in the settings
- charset option doesn't exist. The correct option name is display-charset. - fixed-list-mode option is always used and thus obsolete since GNUPG 2.0.10. - use-agent is a dummy option. gpg will always requires the agent.
This commit is contained in:
parent
81921a4950
commit
9ac79efebd
2 changed files with 2 additions and 6 deletions
|
@ -294,8 +294,7 @@ in {
|
||||||
cert-digest-algo = mkDefault "SHA512";
|
cert-digest-algo = mkDefault "SHA512";
|
||||||
s2k-digest-algo = mkDefault "SHA512";
|
s2k-digest-algo = mkDefault "SHA512";
|
||||||
s2k-cipher-algo = mkDefault "AES256";
|
s2k-cipher-algo = mkDefault "AES256";
|
||||||
charset = mkDefault "utf-8";
|
display-charset = mkDefault "utf-8";
|
||||||
fixed-list-mode = mkDefault true;
|
|
||||||
no-comments = mkDefault true;
|
no-comments = mkDefault true;
|
||||||
no-emit-version = mkDefault true;
|
no-emit-version = mkDefault true;
|
||||||
keyid-format = mkDefault "0xlong";
|
keyid-format = mkDefault "0xlong";
|
||||||
|
@ -304,7 +303,6 @@ in {
|
||||||
with-fingerprint = mkDefault true;
|
with-fingerprint = mkDefault true;
|
||||||
require-cross-certification = mkDefault true;
|
require-cross-certification = mkDefault true;
|
||||||
no-symkey-cache = mkDefault true;
|
no-symkey-cache = mkDefault true;
|
||||||
use-agent = mkDefault true;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
programs.gpg.scdaemonSettings = {
|
programs.gpg.scdaemonSettings = {
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
cert-digest-algo SHA512
|
cert-digest-algo SHA512
|
||||||
charset utf-8
|
|
||||||
default-preference-list SHA512 SHA384 SHA256 AES256 AES192 AES ZLIB BZIP2 ZIP Uncompressed
|
default-preference-list SHA512 SHA384 SHA256 AES256 AES192 AES ZLIB BZIP2 ZIP Uncompressed
|
||||||
fixed-list-mode
|
display-charset utf-8
|
||||||
keyid-format 0xlong
|
keyid-format 0xlong
|
||||||
list-options show-uid-validity
|
list-options show-uid-validity
|
||||||
|
|
||||||
|
@ -16,6 +15,5 @@ s2k-digest-algo SHA512
|
||||||
throw-keyids
|
throw-keyids
|
||||||
trusted-key 0xXXXXXXXXXXXXX
|
trusted-key 0xXXXXXXXXXXXXX
|
||||||
trusted-key 0xYYYYYYYYYYYYY
|
trusted-key 0xYYYYYYYYYYYYY
|
||||||
use-agent
|
|
||||||
verify-options show-uid-validity
|
verify-options show-uid-validity
|
||||||
with-fingerprint
|
with-fingerprint
|
||||||
|
|
Loading…
Reference in a new issue