From 6a4a361b675f8dca25deb8b851614e13497ff7da Mon Sep 17 00:00:00 2001
From: MDLeom <2809763-curben@users.noreply.gitlab.com>
Date: Wed, 22 Apr 2020 03:02:19 +0100
Subject: [PATCH] post: update nixos config syntax to 20.03

- 'loaOf' type has been deprecated, in favour of 'attrsOf'
- https://nixos.org/nixos/manual/release-notes.html#sec-release-20.03
---
 source/_posts/caddy-nixos-part-1.md     |  1 +
 source/_posts/caddy-nixos-part-2.md     | 16 +++++-----------
 source/_posts/i2p-eepsite-nixos.md      |  6 +++---
 source/_posts/tor-hidden-onion-nixos.md |  6 +++---
 4 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/source/_posts/caddy-nixos-part-1.md b/source/_posts/caddy-nixos-part-1.md
index fe94899..4343861 100644
--- a/source/_posts/caddy-nixos-part-1.md
+++ b/source/_posts/caddy-nixos-part-1.md
@@ -2,6 +2,7 @@
 title: "Setup Caddy as a reverse proxy on NixOS (Part 1: Installation)"
 excerpt: "Part 1: Installing NixOS"
 date: 2020-02-23
+lastUpdated: 2020-04-22
 tags:
 - web
 - linux
diff --git a/source/_posts/caddy-nixos-part-2.md b/source/_posts/caddy-nixos-part-2.md
index f75a5c8..9761c98 100644
--- a/source/_posts/caddy-nixos-part-2.md
+++ b/source/_posts/caddy-nixos-part-2.md
@@ -2,7 +2,7 @@
 title: "Setup Caddy as a reverse proxy on NixOS (Part 2: Hardening)"
 excerpt: "Part 2: Securing NixOS"
 date: 2020-03-04
-lastUpdated: 2020-03-23
+lastUpdated: 2020-04-22
 tags:
 - web
 - linux
@@ -148,16 +148,10 @@ Once the secret is generated, TOTP can be enabled using the following config. I
 
 ``` js
   ## Requires OTP to login & sudo
-  security.pam.services = [
-    {
-      name = "login";
-      googleAuthenticator.enable = true;
-    }
-    {
-      name = "sudo";
-      googleAuthenticator.enable = true;
-    }
-  ];
+  security.pam = {
+    services.login.googleAuthenticator.enable = true;
+    services.sudo.googleAuthenticator.enable = true;
+  };
 ```
 
 ## DNS-over-TLS
diff --git a/source/_posts/i2p-eepsite-nixos.md b/source/_posts/i2p-eepsite-nixos.md
index 528c9d9..c30c101 100644
--- a/source/_posts/i2p-eepsite-nixos.md
+++ b/source/_posts/i2p-eepsite-nixos.md
@@ -2,6 +2,7 @@
 title: "How to make your website available over I2P Eepsite on NixOS"
 excerpt: "A guide on I2P Eepsite on NixOS"
 date: 2020-03-21
+lastUpdated: 2020-04-22
 tags:
 - web
 - linux
@@ -39,8 +40,7 @@ To join the I2P network, I'm using [i2pd](https://i2pd.website/), an (unofficial
     enable = true;
     ifname = "ens3";
     address = "xxxx";
-    inTunnels = [{
-      name = "myEep";
+    inTunnels.myEep = {
       enable = true;
       keys = "myEep-keys.dat";
       inPort = 80;
@@ -49,7 +49,7 @@ To join the I2P network, I'm using [i2pd](https://i2pd.website/), an (unofficial
       port = 8081;
       # inbound.length = 1;
       # outbound.length = 1;
-    }];
+    };
     enableIPv4 = false;
     enableIPv6 = true;
   };
diff --git a/source/_posts/tor-hidden-onion-nixos.md b/source/_posts/tor-hidden-onion-nixos.md
index 725d483..4feb2a2 100644
--- a/source/_posts/tor-hidden-onion-nixos.md
+++ b/source/_posts/tor-hidden-onion-nixos.md
@@ -2,6 +2,7 @@
 title: "How to make your website available over Tor hidden service on NixOS"
 excerpt: "A guide on Tor hidden service on NixOS"
 date: 2020-03-16
+lastUpdated: 2020-04-22
 tags:
 - web
 - linux
@@ -36,8 +37,7 @@ The first step is to bring up a Tor hidden service to get an onion address. Add
   services.tor = {
     enable = true;
     enableGeoIP = false;
-    hiddenServices = [{
-      name = "myOnion";
+    hiddenServices.myOnion = {
       version = 3;
       map = [
         {
@@ -46,7 +46,7 @@ The first step is to bring up a Tor hidden service to get an onion address. Add
           toPort = "8080";
         }
       ];
-    }];
+    };
     extraConfig = 
       ''
         ClientUseIPv4 0