config

commit 011068f5cc4d0d1bb2dc4687edcd627771eb298d (tree)
parent 867eb0ec77b38929bfd3cd38258b7fb69c04f494
Author: Motiejus Jakštys <motiejus@jakstys.lt>
Date:   Fri, 14 Apr 2023 22:54:02 +0300

formatting + remove obsolete gpgconv

Diffstat:
M
.envrc
 | 
6
------
M
configuration.nix
 | 
7
++++++-

2 files changed, 6 insertions(+), 7 deletions(-)
diff --git 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
@@ -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;