clean up flake config

Author: fubhy

flake.nix

@@ -34,7 +34,6 @@
         in {
           devShells.default = pkgsWithOverlays.mkShell {
             packages = (with pkgsWithOverlays; [
-              # Includes cargo, clippy, cargo-fmt, rustdoc, rustfmt, and other tools.
               rust-toolchain
               foundry-bin
               solc
@@ -91,6 +90,13 @@
                 anvil
               ];
 
+              cli = {
+                # environment.PC_DISABLE_TUI = true;
+                options = {
+                  port = 8881;
+                };
+              };
+
               services.postgres."postgres-unit" = mkPostgresConfig {
                 name = "graph-test";
                 port = 5432;
@@ -103,9 +109,8 @@
               services.ipfs."ipfs-unit" = {
                 enable = true;
                 dataDir = "./.data/unit/ipfs";
-                apiPort = 5001;
+                port = 5001;
                 gatewayPort = 8080;
-                swarmPort = 4001;
               };
             };
 
@@ -117,6 +122,13 @@
                 anvil
               ];
 
+              cli = {
+                # environment.PC_DISABLE_TUI = true;
+                options = {
+                  port = 8882;
+                };
+              };
+
               services.postgres."postgres-integration" = mkPostgresConfig {
                 name = "graph-node";
                 port = 3011;
@@ -129,9 +141,8 @@
               services.ipfs."ipfs-integration" = {
                 enable = true;
                 dataDir = "./.data/integration/ipfs";
-                apiPort = 3001;
+                port = 3001;
                 gatewayPort = 3002;
-                swarmPort = 4001;
               };
 
               services.anvil."anvil-integration" = {

nix/ipfs.nix

@@ -3,7 +3,7 @@
   options = {
     package = lib.mkPackageOption pkgs "kubo" { };
 
-    apiPort = lib.mkOption {
+    port = lib.mkOption {
       type = lib.types.port;
       default = 5001;
       description = "Port for IPFS API";
@@ -14,12 +14,6 @@
       default = 8080;
       description = "Port for IPFS gateway";
     };
-
-    swarmPort = lib.mkOption {
-      type = lib.types.port;
-      default = 4001;
-      description = "Port for IPFS swarm";
-    };
   };
 
   config = {
@@ -29,11 +23,10 @@
         if [ ! -f "${config.dataDir}/config" ]; then
           mkdir -p "${config.dataDir}"
           ${lib.getExe config.package} init
-          ${lib.getExe config.package} config Addresses.API /ip4/127.0.0.1/tcp/${toString config.apiPort}
+          ${lib.getExe config.package} config Addresses.API /ip4/127.0.0.1/tcp/${toString config.port}
           ${lib.getExe config.package} config Addresses.Gateway /ip4/127.0.0.1/tcp/${toString config.gatewayPort}
-          ${lib.getExe config.package} config Addresses.Swarm '["/ip4/0.0.0.0/tcp/${toString config.swarmPort}", "/ip6/::/tcp/${toString config.swarmPort}"]' --json
         fi
-        ${lib.getExe config.package} daemon
+        ${lib.getExe config.package} daemon --offline
       '';
 
       environment = {
@@ -47,8 +40,8 @@
       readiness_probe = {
         http_get = {
           host = "localhost";
-          port = config.apiPort;
-          path = "/ipfs/bafybeibfd5kbebqqruouji6ct5qku3tay273g7mt24mmrfzrsfeewaal5y";
+          port = config.port;
+          path = "/version";
         };
         initial_delay_seconds = 5;
         period_seconds = 3;