From 8b7c03c95f4e7b1971ece1f9f1c64aa3beb96e73 Mon Sep 17 00:00:00 2001 From: Max Date: Sat, 15 Oct 2022 11:06:25 +0200 Subject: [PATCH] modules/ipfs-lain: services.ipfs -> services.kubo --- hosts/jericho/system.nix | 2 +- modules/brig/default.nix | 2 +- modules/hyprspace/default.nix | 4 ++-- modules/ipfs-lain/default.nix | 4 ++-- modules/persistence/default.nix | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/hosts/jericho/system.nix b/hosts/jericho/system.nix index f54c16c..2b930bb 100644 --- a/hosts/jericho/system.nix +++ b/hosts/jericho/system.nix @@ -42,6 +42,6 @@ services.fstrim.enable = true; - services.ipfs.dataDir = "/srv/data/ipfs"; + services.kubo.dataDir = "/srv/data/ipfs"; } diff --git a/modules/brig/default.nix b/modules/brig/default.nix index bfe17b9..bf4d855 100644 --- a/modules/brig/default.nix +++ b/modules/brig/default.nix @@ -8,7 +8,7 @@ in systemd.user.services.brig = { description = "Brig Daemon"; wantedBy = [ "gnome-session.target" ]; - path = [ "/run/wrappers" config.services.ipfs.package ]; + path = [ "/run/wrappers" config.services.kubo.package ]; serviceConfig = { ExecStart = "${brig}/bin/brig --repo %h/.brig daemon launch"; #ExecStartPost = "${brig}/bin/brig fstab apply"; diff --git a/modules/hyprspace/default.nix b/modules/hyprspace/default.nix index d27255c..1e1393e 100644 --- a/modules/hyprspace/default.nix +++ b/modules/hyprspace/default.nix @@ -51,8 +51,8 @@ in { ''; environment = { HYPRSPACE_SWARM_KEY = config.age.secrets.ipfs-swarm-key.path; - } // (lib.optionalAttrs config.services.ipfs.enable { - HYPRSPACE_IPFS_API = config.services.ipfs.apiAddress; + } // (lib.optionalAttrs config.services.kubo.enable { + HYPRSPACE_IPFS_API = config.services.kubo.apiAddress; }); serviceConfig = { Restart = "on-failure"; diff --git a/modules/ipfs-lain/default.nix b/modules/ipfs-lain/default.nix index a1fb7d5..3c796a6 100644 --- a/modules/ipfs-lain/default.nix +++ b/modules/ipfs-lain/default.nix @@ -1,9 +1,9 @@ { config, lib, pkgs, ... }: let - cfg = config.services.ipfs; + cfg = config.services.kubo; ipfsApi = pkgs.writeTextDir "api" "/ip4/127.0.0.1/tcp/5001"; in { - services.ipfs = { + services.kubo = { enable = true; swarmAddress = [ "/ip4/0.0.0.0/tcp/4001" diff --git a/modules/persistence/default.nix b/modules/persistence/default.nix index 098fbf9..f530993 100644 --- a/modules/persistence/default.nix +++ b/modules/persistence/default.nix @@ -13,7 +13,7 @@ } ]; - services.ipfs.dataDir = "/srv/data/ipfs"; + services.kubo.dataDir = "/srv/data/ipfs"; services.lidarr.dataDir = "/persist/db/lidarr"; services.jackett.dataDir = "/persist/db/jackett";