From c3862ff13a8f551f2ccbfe6cafb09251a6c8afa3 Mon Sep 17 00:00:00 2001 From: Jermeiah S Date: Thu, 19 Jun 2025 18:04:42 -0400 Subject: [PATCH 1/3] fix default mechanism for deployrs module --- modules/nixos/common/deployrs.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/nixos/common/deployrs.nix b/modules/nixos/common/deployrs.nix index b179f7e..61a6c68 100644 --- a/modules/nixos/common/deployrs.nix +++ b/modules/nixos/common/deployrs.nix @@ -1,7 +1,9 @@ { lib, config, ... }: { options.deploy = { - enable = (lib.mkEnableOption // { default = true; }) "enable deployrs module"; + enable = lib.mkEnableOption "enable deployrs module" // { + default = true; + }; address = lib.mkOption { type = lib.types.str; default = config.networking.hostName; From 3d79018cf6c3c7d64551defdd01cb52ef71a00e7 Mon Sep 17 00:00:00 2001 From: Jermeiah S Date: Thu, 19 Jun 2025 18:27:38 -0400 Subject: [PATCH 2/3] formatting --- configurations/nixos/base/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configurations/nixos/base/default.nix b/configurations/nixos/base/default.nix index 1ccb343..8483cc4 100644 --- a/configurations/nixos/base/default.nix +++ b/configurations/nixos/base/default.nix @@ -14,6 +14,7 @@ in self.nixosModules.default # "${modulesPath}/virtualisation/lxc-container.nix" ]; + services.yggdrasil.persistentKeys = false; deploy = { enable = false; }; @@ -21,7 +22,6 @@ in tty-ips.enable = true; }; networking = { - hostName = "base"; }; environment.systemPackages = [ From c1e6e330b19e9081407aee34e099f4c5df2f10f1 Mon Sep 17 00:00:00 2001 From: Jermeiah S Date: Thu, 19 Jun 2025 18:31:19 -0400 Subject: [PATCH 3/3] fix sops --- configurations/nixos/forgejo-runner/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/configurations/nixos/forgejo-runner/default.nix b/configurations/nixos/forgejo-runner/default.nix index 8403bce..9f56b1a 100644 --- a/configurations/nixos/forgejo-runner/default.nix +++ b/configurations/nixos/forgejo-runner/default.nix @@ -20,7 +20,10 @@ in allowed-users = [ "gitea-runner" ]; trusted-users = [ "gitea-runner" ]; }; - + sops.secrets.forgejo-runners-token = { + owner = "gitea-runner"; + user = "gitea-runner"; + }; services.gitea-actions-runner = { package = pkgs.forgejo-runner; instances = { @@ -28,7 +31,7 @@ in enable = true; url = "https://git.skdevstuios.com"; name = "nix"; - labels = [ "native:host" ]; + labels = [ "nix:host" ]; tokenFile = config.sops.secrets.forgejo-runners-token.path; hostPackages = with pkgs; [ nix