jahanson/forgejo-ci-runners
1
0
Fork 0
Code Issues 1 Pull requests 1 Projects Releases Packages Wiki Activity Actions

merged cachix deploy in with nixos configurations for manual deploy

Browse source
This commit is contained in:
Joseph Hanson 2024-06-19 01:08:44 -05:00
parent 8afc9ec097
commit 0a3f516e36
Signed by: jahanson
SSH key fingerprint: SHA256:vy6dKBECV522aPAwklFM3ReKAVB086rT3oWwiuiFG7o
1 changed files with 57 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

66
flake.nix
View file

@ -32,15 +32,7 @@
}; };
cachix-deploy-lib = cachix-deploy-flake.lib pkgs; cachix-deploy-lib = cachix-deploy-flake.lib pkgs;
}; };
in aarch64-linux-modules = [
{
packages.aarch64-linux.default =
let
inherit (common "aarch64-linux") cachix-deploy-lib pkgs;
in
cachix-deploy-lib.nixos {
# system = "aarch64-linux";
imports = [
sops-nix.nixosModules.sops sops-nix.nixosModules.sops
srvos.nixosModules.hardware-hetzner-cloud srvos.nixosModules.hardware-hetzner-cloud
srvos.nixosModules.server srvos.nixosModules.server
@ -58,14 +50,9 @@
]; ];
services.openssh.enable = true; services.openssh.enable = true;
services.openssh.settings.PermitRootLogin = "without-password"; services.openssh.settings.PermitRootLogin = "without-password";
}]; }
}; ];
packages.x86_64-linux.default = x86_64-linux-modules = [
let
inherit (common "x86_64-linux") cachix-deploy-lib pkgs;
in
cachix-deploy-lib.nixos {
imports = [
sops-nix.nixosModules.sops sops-nix.nixosModules.sops
./hardware/shadowfax-kubevirt.nix ./hardware/shadowfax-kubevirt.nix
srvos.nixosModules.server srvos.nixosModules.server
@ -85,16 +72,47 @@
services.openssh.settings.PermitRootLogin = "without-password"; services.openssh.settings.PermitRootLogin = "without-password";
} }
]; ];
in
{
nixosConfigurations =
{
"fj-hetzner-aarch64-01" = lib.nixosSystem {
system = "aarch64-linux";
specialArgs = {inherit inputs; };
modules = [ aarch64-linux-modules ];
}; };
"fj-shadowfax-01" = lib.nixosSystem {
system = "x86_64-linux";
specialArgs = {inherit inputs; };
modules = [ x86_64-linux-modules ];
};
};
packages.aarch64-linux.default =
let
inherit (common "aarch64-linux") cachix-deploy-lib pkgs;
in
cachix-deploy-lib.nixos {
# system = "aarch64-linux";
imports = aarch64-linux-modules;
};
packages.x86_64-linux.default =
let
inherit (common "x86_64-linux") cachix-deploy-lib pkgs;
in
cachix-deploy-lib.nixos {
imports = x86_64-linux-modules;
}; };
# Convenience output that aggregates the outputs for home, nixos. # Convenience output that aggregates the outputs for home, nixos.
# Also used in ci to build targets generally. # Also used in ci to build targets generally.
# top = top =
# let let
# nixtop = nixpkgs.lib.genAttrs nixtop = nixpkgs.lib.genAttrs
# (builtins.attrNames inputs.self.nixosConfigurations) (builtins.attrNames inputs.self.nixosConfigurations)
# (attr: inputs.self.nixosConfigurations.${attr}.config.system.build.toplevel); (attr: inputs.self.nixosConfigurations.${attr}.config.system.build.toplevel);
# in in
# nixtop; nixtop;
};
} }