CCCHH/nix-infra
CCCHH/nix-infra
2
3
Fork 3
Code Issues Pull requests 2 Wiki Activity

Compare commits

base: CCCHH:28d82f149d296155dfaf04c9aab8ecd2ab89a871
Branches Tags
CCCHH:main
CCCHH:shairport-sync-cleanup
CCCHH:ci-check
CCCHH:ci-check-lix
CCCHH:nixOptions
CCCHH:spaceapi
CCCHH:ptouch-print-server
CCCHH:Bendodroid-ldflagsSpaceapid
...
compare: CCCHH:827c46941515c3e3a83400bbe68f412d6ed39662
Branches Tags
CCCHH:main
CCCHH:shairport-sync-cleanup
CCCHH:ci-check
CCCHH:ci-check-lix
CCCHH:nixOptions
CCCHH:spaceapi
CCCHH:ptouch-print-server
CCCHH:Bendodroid-ldflagsSpaceapid

4 commits
28d82f149d ... 827c469415

Author SHA1 Message Date
June
827c469415
 		forgejo-actions-runner: forgejo-actions-runner is forgejo-runner now 
Also use package from stable instead of unstable.
 2026-01-18 22:49:43 +01:00
June
30b6d54f95
 		Upgrade to NixOS 25.11 
mjolnir seems to be broken.
 2026-01-18 22:48:13 +01:00
June
0ea41b3141
 		remove more hydra-related config 2026-01-18 21:58:56 +01:00
June
e51e631918
 		flake.lock: Update 
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/c8aa8cc00a5cb57fada0851a038d35c08a36a2bb' (2025-10-22)
  → 'github:nixos/nixpkgs/ac62194c3917d5f474c1a844b6fd6da2db95077d' (2026-01-02)
• Updated input 'nixpkgs-unstable':
    'github:nixos/nixpkgs/02f2cb8e0feb4596d20cc52fda73ccee960e3538' (2025-10-24)
  → 'github:nixos/nixpkgs/3327b113f2ef698d380df83fbccefad7e83d7769' (2026-01-17)
• Updated input 'sops-nix':
    'github:Mic92/sops-nix/5a7d18b5c55642df5c432aadb757140edfeb70b3' (2025-10-20)
  → 'github:Mic92/sops-nix/5e8fae80726b66e9fec023d21cd3b3e638597aa9' (2026-01-18)
 2026-01-18 21:45:50 +01:00
4 changed files with 13 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

4
config/hosts/forgejo-actions-runner/forgejo-actions-runner.nix
View file

@ -3,11 +3,11 @@
# - https://forgejo.org/docs/latest/user/actions/ # - https://forgejo.org/docs/latest/user/actions/
# - https://docs.gitea.com/next/usage/actions/act-runner # - https://docs.gitea.com/next/usage/actions/act-runner
{ config, pkgs-unstable, ... }: { config, pkgs, ... }:
{ {
services.gitea-actions-runner = { services.gitea-actions-runner = {
package = pkgs-unstable.forgejo-actions-runner; package = pkgs.forgejo-runner;
instances.ccchh-forgejo-global-docker = { instances.ccchh-forgejo-global-docker = {
enable = true; enable = true;
name = "Global Docker Forgejo Actions Runner"; name = "Global Docker Forgejo Actions Runner";

3
deployment_configuration.json
View file

@ -23,9 +23,6 @@
}, },
"penpot": { "penpot": {
"targetHostname": "penpot-intern.hamburg.ccc.de" "targetHostname": "penpot-intern.hamburg.ccc.de"
},
"hydra": {
"targetHostname": "hydra-intern.hamburg.ccc.de"
} }
} }
} }

20
flake.lock generated
View file

@ -19,27 +19,27 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1761173472, "lastModified": 1768621446,
"narHash": "sha256-m9W0dYXflzeGgKNravKJvTMR4Qqa2MVD11AwlGMufeE=", "narHash": "sha256-6YwHV1cjv6arXdF/PQc365h1j+Qje3Pydk501Rm4Q+4=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c8aa8cc00a5cb57fada0851a038d35c08a36a2bb", "rev": "72ac591e737060deab2b86d6952babd1f896d7c5",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "nixos-25.05", "ref": "nixos-25.11",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1761349956, "lastModified": 1768661221,
"narHash": "sha256-tH3wHnOJms+U4k/rK2Nn1RfBrhffX92jLP/2VndSn0w=", "narHash": "sha256-MJwOjrIISfOpdI9x4C+5WFQXvHtOuj5mqLZ4TMEtk1M=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "02f2cb8e0feb4596d20cc52fda73ccee960e3538", "rev": "3327b113f2ef698d380df83fbccefad7e83d7769",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -64,11 +64,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1760998189, "lastModified": 1768709255,
"narHash": "sha256-ee2e1/AeGL5X8oy/HXsZQvZnae6XfEVdstGopKucYLY=", "narHash": "sha256-aigyBfxI20FRtqajVMYXHtj5gHXENY2gLAXEhfJ8/WM=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "5a7d18b5c55642df5c432aadb757140edfeb70b3", "rev": "5e8fae80726b66e9fec023d21cd3b3e638597aa9",
"type": "github" "type": "github"
}, },
"original": { "original": {

18
flake.nix
View file

@ -5,7 +5,7 @@
# Use the NixOS small channels for nixpkgs. # Use the NixOS small channels for nixpkgs.
# https://nixos.org/manual/nixos/stable/#sec-upgrading # https://nixos.org/manual/nixos/stable/#sec-upgrading
# https://github.com/NixOS/nixpkgs # https://github.com/NixOS/nixpkgs
nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05"; nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11";
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable";
# # Add nixos-generators as an input. # # Add nixos-generators as an input.
@ -147,7 +147,6 @@
]; ];
specialArgs = { specialArgs = {
inherit authorizedKeysRepo; inherit authorizedKeysRepo;
inherit pkgs-unstable;
}; };
}; };
@ -211,16 +210,6 @@
./config/hosts/penpot ./config/hosts/penpot
]; ];
}; };
hydra = nixpkgs.lib.nixosSystem {
inherit system specialArgs;
modules = [
self.nixosModules.common
self.nixosModules.proxmox-vm
self.nixosModules.prometheus-exporter
./config/hosts/hydra
];
};
}; };
# packages.x86_64-linux = { # packages.x86_64-linux = {
@ -249,10 +238,5 @@
# }; # };
formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.nixpkgs-fmt; formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.nixpkgs-fmt;
hydraJobs = {
inherit (self) packages;
nixosConfigurations = builtins.mapAttrs (name: value: value.config.system.build.toplevel) self.nixosConfigurations;
};
}; };
} }