From 8f96ccf1ff17c72693715fcbf0ed67b56dd0985d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Fri, 25 Oct 2024 00:12:15 +0200
Subject: [PATCH] nixos/dysnomia: move into services

---
 nixos/modules/services/misc/disnix.nix   |  4 ++--
 nixos/modules/services/misc/dysnomia.nix | 14 +++++++++-----
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/nixos/modules/services/misc/disnix.nix b/nixos/modules/services/misc/disnix.nix
index 619fbcf92308..1869822a07f3 100644
--- a/nixos/modules/services/misc/disnix.nix
+++ b/nixos/modules/services/misc/disnix.nix
@@ -40,7 +40,7 @@ in
   ###### implementation
 
   config = lib.mkIf cfg.enable {
-    dysnomia.enable = true;
+    services.dysnomia.enable = true;
 
     environment.systemPackages = [ pkgs.disnix ] ++ lib.optional cfg.useWebServiceInterface pkgs.DisnixWebService;
     environment.variables.PATH = lib.optionals cfg.enableProfilePath (map (profileName: "/nix/var/nix/profiles/disnix/${profileName}/bin" ) cfg.profiles);
@@ -74,7 +74,7 @@ in
 
         restartIfChanged = false;
 
-        path = [ config.nix.package cfg.package config.dysnomia.package "/run/current-system/sw" ];
+        path = [ config.nix.package cfg.package config.services.dysnomia.package "/run/current-system/sw" ];
 
         environment = {
           HOME = "/root";
diff --git a/nixos/modules/services/misc/dysnomia.nix b/nixos/modules/services/misc/dysnomia.nix
index 9f421d7ec375..36b6293843c4 100644
--- a/nixos/modules/services/misc/dysnomia.nix
+++ b/nixos/modules/services/misc/dysnomia.nix
@@ -1,6 +1,6 @@
 {pkgs, lib, config, ...}:
 let
-  cfg = config.dysnomia;
+  cfg = config.services.dysnomia;
 
   printProperties = properties:
     lib.concatMapStrings (propertyName:
@@ -79,7 +79,7 @@ let
 in
 {
   options = {
-    dysnomia = {
+    services.dysnomia = {
 
       enable = lib.mkOption {
         type = lib.types.bool;
@@ -142,6 +142,10 @@ in
     };
   };
 
+  imports = [
+    (lib.mkRenamedOptionModule ["dysnomia"] ["services" "dysnomia"])
+  ];
+
   config = lib.mkIf cfg.enable {
 
     environment.etc = {
@@ -164,7 +168,7 @@ in
 
     environment.systemPackages = [ cfg.package ];
 
-    dysnomia.package = pkgs.dysnomia.override (origArgs: dysnomiaFlags // lib.optionalAttrs (cfg.enableLegacyModules) {
+    services.dysnomia.package = pkgs.dysnomia.override (origArgs: dysnomiaFlags // lib.optionalAttrs (cfg.enableLegacyModules) {
       enableLegacy = builtins.trace ''
         WARNING: Dysnomia has been configured to use the legacy 'process' and 'wrapper'
         modules for compatibility reasons! If you rely on these modules, consider
@@ -181,7 +185,7 @@ in
       '' true;
     });
 
-    dysnomia.properties = {
+    services.dysnomia.properties = {
       hostname = config.networking.hostName;
       inherit (pkgs.stdenv.hostPlatform) system;
 
@@ -208,7 +212,7 @@ in
       ++ lib.optional (dysnomiaFlags.enableSubversionRepository) "subversion-repository";
     };
 
-    dysnomia.containers = lib.recursiveUpdate ({
+    services.dysnomia.containers = lib.recursiveUpdate ({
       process = {};
       wrapper = {};
     }