From 26d57a6eecf1e5d402cdd4cab2554b4c5c14878a Mon Sep 17 00:00:00 2001
From: James Walker <walkah@walkah.net>
Date: Sun, 30 Oct 2022 23:04:36 -0400
Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=9A=20kubo=20settings=20rename?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 flake.lock               | 30 +++++++++++++++---------------
 modules/ipfs/cluster.nix |  2 +-
 modules/ipfs/default.nix | 18 +++++++++---------
 modules/ipfs/gateway.nix |  2 +-
 4 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/flake.lock b/flake.lock
index 21c3d73..cb80f82 100644
--- a/flake.lock
+++ b/flake.lock
@@ -107,11 +107,11 @@
     },
     "flake-utils": {
       "locked": {
-        "lastModified": 1659877975,
-        "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
+        "lastModified": 1667077288,
+        "narHash": "sha256-bdC8sFNDpT0HK74u9fUkpbf1MEzVYJ+ka7NXCdgBoaA=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
+        "rev": "6ee9ebb6b1ee695d2cacc4faa053a7b9baa76817",
         "type": "github"
       },
       "original": {
@@ -141,11 +141,11 @@
         "utils": "utils_2"
       },
       "locked": {
-        "lastModified": 1666903647,
-        "narHash": "sha256-sFI1Gh9DTGzHnBINondupUGYbe+T0wZcpcZjkW0qffM=",
+        "lastModified": 1666990295,
+        "narHash": "sha256-JPMTX8W36IPV1jmKV1qEhNBI4MbIPYsnccWyTUlSiG0=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "213a06295dff96668a1d673b9fd1c03ce1de6745",
+        "rev": "423211401c245934db5052e3867cac704f658544",
         "type": "github"
       },
       "original": {
@@ -188,11 +188,11 @@
     },
     "nixpkgs-22_05": {
       "locked": {
-        "lastModified": 1666488099,
-        "narHash": "sha256-DANs2epN5QgvxWzH7xF3dzb4WE0lEuMLrMEu/vPmQxw=",
+        "lastModified": 1667091951,
+        "narHash": "sha256-62sz0fn06Nq8OaeBYrYSR3Y6hUcp8/PC4dJ7HeGaOhU=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "f9115594149ebcb409a42e303bec4956814a8419",
+        "rev": "6440d13df2327d2db13d3b17e419784020b71d22",
         "type": "github"
       },
       "original": {
@@ -220,11 +220,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1666837999,
-        "narHash": "sha256-hI7+s1UVDsJNqNn9UGV6xTBGqMC4dqOyVpeDf+su7JU=",
+        "lastModified": 1667055375,
+        "narHash": "sha256-xfSTHYxuKRiqF4dcuAFdti1OUvrC2lHpQqCHWUK5/JA=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "1c6eb4876f71e8903ae9f73e6adf45fdbebc0292",
+        "rev": "7f9be6a505a31f88499c5d20d11f98accf5ae6ba",
         "type": "github"
       },
       "original": {
@@ -256,11 +256,11 @@
         "nixpkgs-22_05": "nixpkgs-22_05"
       },
       "locked": {
-        "lastModified": 1666499473,
-        "narHash": "sha256-q1eFnBFL0kHgcnUPeKagw3BfbE/5sMJNGL2E2AR+a2M=",
+        "lastModified": 1667102919,
+        "narHash": "sha256-DP5j4TwXe96eZf0PLgYSj1Hdyt7SPUoQ003iNBQSKpQ=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "1b5f9512a265f0c9687dbff47893180f777f4809",
+        "rev": "448ec3e7eb7c7e4563cc2471db748a71baaf9698",
         "type": "github"
       },
       "original": {
diff --git a/modules/ipfs/cluster.nix b/modules/ipfs/cluster.nix
index 7f4c37e..5635649 100644
--- a/modules/ipfs/cluster.nix
+++ b/modules/ipfs/cluster.nix
@@ -9,7 +9,7 @@
   services = {
     kubo = {
       enable = true;
-      extraConfig = {
+      settings = {
         Swarm = {
           AddrFilters = null;
           ConnMgr = {
diff --git a/modules/ipfs/default.nix b/modules/ipfs/default.nix
index 20c48aa..e161d95 100644
--- a/modules/ipfs/default.nix
+++ b/modules/ipfs/default.nix
@@ -6,18 +6,18 @@
   services = {
     kubo = {
       enable = true;
-      apiAddress = "/ip4/0.0.0.0/tcp/5001";
-      gatewayAddress = "/ip4/0.0.0.0/tcp/8080";
-      swarmAddress = [
-        "/ip4/0.0.0.0/tcp/4001"
-        "/ip6/::/tcp/4001"
-        "/ip4/0.0.0.0/udp/4001/quic"
-        "/ip6/::/udp/4001/quic"
-      ];
-      extraConfig = {
+      settings = {
         Addresses = {
           Announce = [ ];
+          API = "/ip4/0.0.0.0/tcp/5001";
+          Gateway = "/ip4/0.0.0.0/tcp/8080";
           NoAnnounce = [ ];
+          Swarm = [
+            "/ip4/0.0.0.0/tcp/4001"
+            "/ip6/::/tcp/4001"
+            "/ip4/0.0.0.0/udp/4001/quic"
+            "/ip6/::/udp/4001/quic"
+          ];
         };
         API = { HTTPHeaders = { Access-Control-Allow-Origin = [ "*" ]; }; };
         Discovery = { MDNS = { Enabled = true; }; };
diff --git a/modules/ipfs/gateway.nix b/modules/ipfs/gateway.nix
index cb476ca..a6de97f 100644
--- a/modules/ipfs/gateway.nix
+++ b/modules/ipfs/gateway.nix
@@ -35,7 +35,7 @@ in
   services = {
     kubo = {
       enable = true;
-      extraConfig = {
+      settings = {
         Peering = { Peers = peers; };
         Swarm = { AddrFilters = null; };
       };