From 0d987e28f129f36f4a5f0e806528db2441fb02e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nikodem=20Rabuli=C5=84ski?= Date: Sun, 23 Mar 2025 22:02:20 +0100 Subject: [PATCH] services: prepare for migration --- modules/flake/services.nix | 8 ++++---- services/attic.nix | 4 ++-- services/forgejo-runner.nix | 4 ++-- services/forgejo.nix | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/modules/flake/services.nix b/modules/flake/services.nix index f2f07d4..697b701 100644 --- a/modules/flake/services.nix +++ b/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.hostConfig.${host} or { }) + cfg.module + (cfg.hostModule.${host} or { }) ]; }); diff --git a/services/attic.nix b/services/attic.nix index 91d675f..f9d7501 100644 --- a/services/attic.nix +++ b/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 = { diff --git a/services/forgejo-runner.nix b/services/forgejo-runner.nix index 693d1d1..98574a1 100644 --- a/services/forgejo-runner.nix +++ b/services/forgejo-runner.nix @@ -1,10 +1,10 @@ { - services.forgejo-runner = { + config.services.forgejo-runner = { hosts = [ "ude" "youko" ]; - config = + module = { config, lib, diff --git a/services/forgejo.nix b/services/forgejo.nix index 4b9ea02..a382d50 100644 --- a/services/forgejo.nix +++ b/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 = {