diff --git a/configurations/nixos/forgejo-runner-tofu/default.nix b/configurations/nixos/forgejo-runner-tofu/default.nix index c61909a..886b1c4 100644 --- a/configurations/nixos/forgejo-runner-tofu/default.nix +++ b/configurations/nixos/forgejo-runner-tofu/default.nix @@ -30,8 +30,8 @@ in ]; }; sops.secrets.forgejo-runners-token = { - owner = "gitea-runner"; - group = "gitea-runner"; + # owner = "gitea-runner"; + # group = "gitea-runner"; mode = "0777"; }; services.gitea-actions-runner = { @@ -41,7 +41,10 @@ in enable = true; url = "https://git.skdevstudios.com"; name = "nix"; - labels = [ "native:host" ]; + labels = [ + "native:host" + "nix" + ]; tokenFile = config.sops.secrets.forgejo-runners-token.path; hostPackages = with pkgs; [ nix diff --git a/flake.lock b/flake.lock index f7d1885..5d35504 100644 --- a/flake.lock +++ b/flake.lock @@ -353,7 +353,8 @@ "nixos-generators": "nixos-generators", "nixos-unified": "nixos-unified", "nixpkgs": "nixpkgs_3", - "sops-nix": "sops-nix" + "sops-nix": "sops-nix", + "terranix": "terranix" } }, "sops-nix": { @@ -388,6 +389,45 @@ "type": "github" } }, + "systems_2": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "terranix": { + "inputs": { + "flake-parts": [ + "flake-parts" + ], + "nixpkgs": [ + "nixpkgs" + ], + "systems": "systems_2" + }, + "locked": { + "lastModified": 1747080393, + "owner": "typedrat", + "repo": "terranix", + "rev": "61c3bfe7b3884a84e9411046d53970d8f969a9b6", + "type": "github" + }, + "original": { + "owner": "typedrat", + "ref": "expose-config", + "repo": "terranix", + "type": "github" + } + }, "treefmt-nix": { "inputs": { "nixpkgs": [ diff --git a/flake.nix b/flake.nix index 9567577..31fb475 100644 --- a/flake.nix +++ b/flake.nix @@ -10,6 +10,13 @@ disko.url = "https://flakehub.com/f/nix-community/disko/1.12.0.tar.gz"; deploy-rs.url = "github:serokell/deploy-rs"; deploy-rs.inputs.nixpkgs.follows = "nixpkgs"; + terranix = { + url = "github:typedrat/terranix/expose-config"; + inputs = { + nixpkgs.follows = "nixpkgs"; + flake-parts.follows = "flake-parts"; + }; + }; nix-index-database.url = "github:nix-community/nix-index-database"; nix-index-database.inputs.nixpkgs.follows = "nixpkgs"; nixos-anywhere.url = "github:nix-community/nixos-anywhere/1.10.0";