diff --git a/.envrc b/.envrc index 88371f7..0142354 100644 --- a/.envrc +++ b/.envrc @@ -1,9 +1,3 @@ -_gpgconv="gpg2 -d --quiet --yes --compress-algo=none --no-encrypt-to" -if [ "$(git config diff.gpg.textconv)" != "$_gpgconv" ]; then - git config diff.gpg.binary true - git config diff.gpg.textconv "$_gpgconv" -fi - export PASSWORD_STORE_DIR=$PWD if ! has nix_direnv_version || ! nix_direnv_version 2.2.1; then diff --git a/configuration.nix b/configuration.nix index ca5019f..4129dd9 100644 --- a/configuration.nix +++ b/configuration.nix @@ -506,7 +506,12 @@ in { postfix = { enable = true; enableSmtp = true; - networks = ["127.0.0.1/8" "[::ffff:127.0.0.0]/104" "[::1]/128" tailscale_subnet.cidr]; + networks = [ + "127.0.0.1/8" + "[::ffff:127.0.0.0]/104" + "[::1]/128" + tailscale_subnet.cidr + ]; hostname = "${config.networking.hostName}.${config.networking.domain}"; relayHost = "smtp.sendgrid.net"; relayPort = 587;