services: prepare for migration

modules/flake/services.nix

@@ -21,11 +21,11 @@ let
           type = with lib.types; listOf str;
           default = [ config.host ];
         };
-        config = lib.mkOption {
+        module = lib.mkOption {
           type = lib.types.deferredModule;
           default = { };
         };
-        hostConfig = lib.mkOption {
+        hostModule = lib.mkOption {
           type = with lib.types; attrsOf deferredModule;
           default = { };
         };
@@ -36,8 +36,8 @@ let
     cfg:
     lib.genAttrs cfg.hosts (host: {
       imports = [
-        cfg.config
+        cfg.module
-        (cfg.hostConfig.${host} or { })
+        (cfg.hostModule.${host} or { })
       ];
     });
 

services/attic.nix

@@ -1,12 +1,12 @@
 {
-  services.attic =
+  config.services.attic =
     let
       atticPort = 9476;
     in
     {
       host = "kazuki";
       ports = [ atticPort ];
-      config =
+      module =
         { config, ... }:
         {
           age.secrets.attic-creds = {

services/forgejo-runner.nix

@@ -1,10 +1,10 @@
 {
-  services.forgejo-runner = {
+  config.services.forgejo-runner = {
     hosts = [
       "ude"
       "youko"
     ];
-    config =
+    module =
       {
         config,
         lib,

services/forgejo.nix

@@ -1,8 +1,8 @@
 {
-  services.forgejo = {
+  config.services.forgejo = {
     host = "kazuki";
     ports = [ 3000 ];
-    config =
+    module =
       { config, pkgs, ... }:
       {
         age.secrets.rab-lol-cf = {