From 165e291371447f290f58b34d251cae756bfa72fa Mon Sep 17 00:00:00 2001 From: Infinidoge Date: Thu, 26 Oct 2023 00:03:54 -0400 Subject: [PATCH] functionality/soft-serve: rename to soft-serve-ng Nixpkgs now has a soft-serve module with a conflicting definition --- hosts/Infini-SERVER/default.nix | 2 +- modules/functionality/soft-serve.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hosts/Infini-SERVER/default.nix b/hosts/Infini-SERVER/default.nix index ad1b62c..05bc05e 100644 --- a/hosts/Infini-SERVER/default.nix +++ b/hosts/Infini-SERVER/default.nix @@ -29,7 +29,7 @@ services = { avahi.reflector = true; - soft-serve.enable = true; + soft-serve-ng.enable = true; }; environment.persistence."/persist" = { diff --git a/modules/functionality/soft-serve.nix b/modules/functionality/soft-serve.nix index 635b7cb..fa8c04b 100644 --- a/modules/functionality/soft-serve.nix +++ b/modules/functionality/soft-serve.nix @@ -2,11 +2,11 @@ with lib; with lib.our; let - cfg = config.services.soft-serve; + cfg = config.services.soft-serve-ng; mkIfNotNull = v: mkIf (v != null) v; in { - options.services.soft-serve = with types; { + options.services.soft-serve-ng = with types; { enable = mkBoolOpt false; host = mkOpt str "";