mirror of
https://git.gay/xqtc/nixos-config
synced 2025-04-28 00:57:31 +02:00
nix container forgejo runner
This commit is contained in:
parent
f6f6d865a1
commit
e332629403
4 changed files with 24 additions and 36 deletions
|
@ -52,6 +52,9 @@
|
|||
dig
|
||||
bmon
|
||||
trippy
|
||||
|
||||
nixos-anywhere
|
||||
disko
|
||||
# inputs.compose2nix.packages.${pkgs.system}.default
|
||||
];
|
||||
|
||||
|
|
6
flake.lock
generated
6
flake.lock
generated
|
@ -929,11 +929,11 @@
|
|||
},
|
||||
"nixpkgs_8": {
|
||||
"locked": {
|
||||
"lastModified": 1742889210,
|
||||
"narHash": "sha256-hw63HnwnqU3ZQfsMclLhMvOezpM7RSB0dMAtD5/sOiw=",
|
||||
"lastModified": 1744232761,
|
||||
"narHash": "sha256-gbl9hE39nQRpZaLjhWKmEu5ejtQsgI5TWYrIVVJn30U=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "698214a32beb4f4c8e3942372c694f40848b360d",
|
||||
"rev": "f675531bc7e6657c10a18b565cfebd8aa9e24c14",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
28
flake.nix
28
flake.nix
|
@ -19,7 +19,8 @@
|
|||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
dwl-source = {
|
||||
url = "git+https://codeberg.org/dwl/dwl?rev=577d8da6d17dad5f847795582ebf813f3c5c04a7";
|
||||
url =
|
||||
"git+https://codeberg.org/dwl/dwl?rev=577d8da6d17dad5f847795582ebf813f3c5c04a7";
|
||||
flake = false;
|
||||
};
|
||||
sops-nix = {
|
||||
|
@ -29,7 +30,8 @@
|
|||
spicetify-nix.url = "github:K900/spicetify-nix";
|
||||
nh.url = "github:/viperML/nh";
|
||||
lix-module = {
|
||||
url = "https://git.lix.systems/lix-project/nixos-module/archive/2.90.0-rc1.tar.gz";
|
||||
url =
|
||||
"https://git.lix.systems/lix-project/nixos-module/archive/2.90.0-rc1.tar.gz";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
proxmox-nixos = {
|
||||
|
@ -40,9 +42,7 @@
|
|||
url = "github:Jas-SinghFSU/HyprPanel";
|
||||
# follows = "nixpkgs";
|
||||
};
|
||||
ghostty = {
|
||||
url = "github:ghostty-org/ghostty";
|
||||
};
|
||||
ghostty = { url = "github:ghostty-org/ghostty"; };
|
||||
firefox-addons.url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons";
|
||||
nixos-hardware.url = "github:NixOS/nixos-hardware/master";
|
||||
#nixpkgs-nixvim.url = "github:NixOS/nixpkgs/fbd188864020b9a1226d35b9df1fe465e1f378c1";
|
||||
|
@ -52,22 +52,16 @@
|
|||
};
|
||||
};
|
||||
|
||||
outputs = inputs @ {flake-parts, ...}:
|
||||
flake-parts.lib.mkFlake {inherit inputs;} {
|
||||
outputs = inputs@{ flake-parts, ... }:
|
||||
flake-parts.lib.mkFlake { inherit inputs; } {
|
||||
imports = [
|
||||
./flake-mods/hm.nix
|
||||
./flake-mods/nixosHosts.nix
|
||||
./flake-mods/allowUnfree.nix
|
||||
];
|
||||
systems = ["x86_64-linux" "aarch64-linux" "aarch64-darwin" "x86_64-darwin"];
|
||||
perSystem = {
|
||||
config,
|
||||
self,
|
||||
inputs,
|
||||
pkgs,
|
||||
system,
|
||||
...
|
||||
}: {};
|
||||
flake = {};
|
||||
systems =
|
||||
[ "x86_64-linux" "aarch64-linux" "aarch64-darwin" "x86_64-darwin" ];
|
||||
perSystem = { config, self, inputs, pkgs, system, ... }: { };
|
||||
flake = { };
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,13 +1,7 @@
|
|||
{
|
||||
lib,
|
||||
config,
|
||||
inputs,
|
||||
pkgs,
|
||||
...
|
||||
}: let
|
||||
gitea-actions-runner-custom = import ./services/gitea-runner.nix;
|
||||
{ lib, config, inputs, pkgs, ... }:
|
||||
let gitea-actions-runner-custom = import ./services/gitea-runner.nix;
|
||||
in {
|
||||
imports = [gitea-actions-runner-custom];
|
||||
imports = [ gitea-actions-runner-custom ];
|
||||
# config = { services.gitea-actions-runner = gitea-actions-runner-custom.config.services.gitea-actions-runner; };
|
||||
sops.secrets.forgejo_runner_token = {
|
||||
owner = "forgejo";
|
||||
|
@ -26,12 +20,8 @@ in {
|
|||
DISABLE_REGISTRATION = true;
|
||||
# REQUIRE_SIGNIN_VIEW = true;
|
||||
};
|
||||
DEFAULT = {
|
||||
APP_NAME = "Git so good it could be heroin";
|
||||
};
|
||||
metrics = {
|
||||
ENABLED = true;
|
||||
};
|
||||
DEFAULT = { APP_NAME = "Git so good it could be heroin"; };
|
||||
metrics = { ENABLED = true; };
|
||||
};
|
||||
};
|
||||
services.gitea-actions-runner-custom = {
|
||||
|
@ -46,6 +36,7 @@ in {
|
|||
"ubuntu-22.04:docker://node:16-bullseye"
|
||||
"ubuntu-20.04:docker://node:16-bullseye"
|
||||
"ubuntu-18.04:docker://node:16-buster"
|
||||
"codeberg.org/nix-actions/container:latest-aarch64"
|
||||
"native:host"
|
||||
];
|
||||
hostPackages = with pkgs; [
|
||||
|
@ -97,5 +88,5 @@ in {
|
|||
# serviceConfig.User = lib.mkForce "forgejo";
|
||||
# serviceConfig.Group = lib.mkForce "forgejo";
|
||||
# };
|
||||
environment.systemPackages = with pkgs; [forgejo-runner];
|
||||
environment.systemPackages = with pkgs; [ forgejo-runner ];
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue