Compare commits

...

3 Commits

Author SHA1 Message Date
Vegard Bieker Matthey
3bcc37073c avoid using lupine-4 for gitea actions 2026-03-23 02:59:35 +01:00
h7x4
6ef02bd485 kommode/gitea: allow me to go fork myself 2026-03-10 14:50:56 +09:00
Vegard Bieker Matthey
6b1fb4c065 only cross-compile when necessary
This fixes issues with rebuilding georg and brzeczyszczykiewicz.

Reviewed-on: https://git.pvv.ntnu.no/Drift/pvv-nixos-config/pulls/128
Reviewed-by: Oystein Kristoffer Tveit <oysteikt@pvv.ntnu.no>
Co-authored-by: Vegard Bieker Matthey <VegardMatthey@protonmail.com>
Co-committed-by: Vegard Bieker Matthey <VegardMatthey@protonmail.com>
2026-02-21 21:14:04 +01:00
3 changed files with 9 additions and 7 deletions

View File

@@ -94,7 +94,6 @@
}: }:
let let
commonPkgsConfig = { commonPkgsConfig = {
inherit localSystem crossSystem;
config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg)
[ [
"nvidia-x11" "nvidia-x11"
@@ -104,8 +103,11 @@
# Global overlays go here # Global overlays go here
inputs.roowho2.overlays.default inputs.roowho2.overlays.default
]) ++ overlays; ]) ++ overlays;
}; } // (if localSystem != crossSystem then {
inherit localSystem crossSystem;
} else {
system = crossSystem;
});
pkgs = import nixpkgs commonPkgsConfig; pkgs = import nixpkgs commonPkgsConfig;
unstablePkgs = import nixpkgs-unstable commonPkgsConfig; unstablePkgs = import nixpkgs-unstable commonPkgsConfig;
in in

View File

@@ -131,6 +131,7 @@ in {
"repo.pulls" "repo.pulls"
"repo.releases" "repo.releases"
]; ];
ALLOW_FORK_INTO_SAME_OWNER = true;
}; };
picture = { picture = {
DISABLE_GRAVATAR = true; DISABLE_GRAVATAR = true;

View File

@@ -1,12 +1,11 @@
{ fp, values, lupineName, ... }: { fp, values, lib, lupineName, ... }:
{ {
imports = [ imports = [
./hardware-configuration/${lupineName}.nix ./hardware-configuration/${lupineName}.nix
(fp /base) (fp /base)
# lupine-4 does not have enough ram for running nix flake check
./services/gitea-runner.nix ] ++ lib.optionals (lupineName != "lupine-4") [ ./services/gitea-runner.nix ];
];
sops.defaultSopsFile = fp /secrets/lupine/lupine.yaml; sops.defaultSopsFile = fp /secrets/lupine/lupine.yaml;