From 1f466b63d337a10b9009ff3c93466c94fd083fea Mon Sep 17 00:00:00 2001 From: Qyriad Date: Tue, 10 Feb 2026 14:19:55 +0100 Subject: [PATCH] tests.basic -> tests.gotosocial --- modules/dynamicism/default.nix | 18 +++--------------- modules/dynamicism/gotosocial.nix | 19 +++++++++++++++++++ tests/default.nix | 2 +- .../configuration-package.nix | 0 tests/{basic => gotosocial}/configuration.nix | 0 tests/{basic => gotosocial}/default.nix | 0 .../hardware-configuration.nix | 0 tests/{basic => gotosocial}/test-script.py | 0 tests/{basic => gotosocial}/test.nix | 0 9 files changed, 23 insertions(+), 16 deletions(-) create mode 100644 modules/dynamicism/gotosocial.nix rename tests/{basic => gotosocial}/configuration-package.nix (100%) rename tests/{basic => gotosocial}/configuration.nix (100%) rename tests/{basic => gotosocial}/default.nix (100%) rename tests/{basic => gotosocial}/hardware-configuration.nix (100%) rename tests/{basic => gotosocial}/test-script.py (100%) rename tests/{basic => gotosocial}/test.nix (100%) diff --git a/modules/dynamicism/default.nix b/modules/dynamicism/default.nix index 8e4764c..dae5bd6 100644 --- a/modules/dynamicism/default.nix +++ b/modules/dynamicism/default.nix @@ -120,19 +120,7 @@ in ); # Implementations. - config.dynamicism.for.gotosocial = let - cfg = config.dynamicism.for.gotosocial; - in { - source-options = [ - "services.gotosocial.settings" - ]; - - configFile = settingsFormat.generate "gotosocial-override.yml" config.services.gotosocial.settings; - - unitDropins."gotosocial.service" = pkgs.writeText "gotosocial-override.conf" '' - [Service] - ExecStart= - ExecStart=${lib.getExe' pkgs.gotosocial "gotosocial"} --config-path ${cfg.configFile} start - ''; - }; + imports = [ + ./gotosocial.nix + ]; } diff --git a/modules/dynamicism/gotosocial.nix b/modules/dynamicism/gotosocial.nix new file mode 100644 index 0000000..d52e68c --- /dev/null +++ b/modules/dynamicism/gotosocial.nix @@ -0,0 +1,19 @@ +{ pkgs, lib, config, ... }: +let + cfg = config.dynamicism.for.gotosocial; + + settingsFormat = pkgs.formats.yaml { }; +in +{ + dynamicism.for.gotosocial = { + source-options = [ "services.gotosocial.settings" ]; + + configFile = settingsFormat.generate "gotosocial-overrde.yml" config.services.gotosocial.settings; + + unitDropins."gotosocial.service" = pkgs.writeText "gotosocial-override.conf" '' + [Service] + ExecStart= + ExecStart=${lib.getExe' pkgs.gotosocial "gotosocial"} --config-path ${cfg.configFile} start + ''; + }; +} diff --git a/tests/default.nix b/tests/default.nix index d17c3ac..a6aea2d 100644 --- a/tests/default.nix +++ b/tests/default.nix @@ -27,5 +27,5 @@ }; in lib.makeScope lib.callPackageWith (self: { - basic = runDynixTest ./basic/test.nix; + gotosocial = runDynixTest ./gotosocial/test.nix; }) diff --git a/tests/basic/configuration-package.nix b/tests/gotosocial/configuration-package.nix similarity index 100% rename from tests/basic/configuration-package.nix rename to tests/gotosocial/configuration-package.nix diff --git a/tests/basic/configuration.nix b/tests/gotosocial/configuration.nix similarity index 100% rename from tests/basic/configuration.nix rename to tests/gotosocial/configuration.nix diff --git a/tests/basic/default.nix b/tests/gotosocial/default.nix similarity index 100% rename from tests/basic/default.nix rename to tests/gotosocial/default.nix diff --git a/tests/basic/hardware-configuration.nix b/tests/gotosocial/hardware-configuration.nix similarity index 100% rename from tests/basic/hardware-configuration.nix rename to tests/gotosocial/hardware-configuration.nix diff --git a/tests/basic/test-script.py b/tests/gotosocial/test-script.py similarity index 100% rename from tests/basic/test-script.py rename to tests/gotosocial/test-script.py diff --git a/tests/basic/test.nix b/tests/gotosocial/test.nix similarity index 100% rename from tests/basic/test.nix rename to tests/gotosocial/test.nix