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

cachix-deploy #46

Merged
jahanson merged 6 commits from cachix-deploy into main 2024-06-19 10:31:04 -05:00
Conversation 0 Commits 6 Files changed 2 +346 -94
2 changed files with 346 additions and 94 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit ed939607b2 - Show all commits

269
flake.lock
View file

@ -1,8 +1,72 @@
{ {
"nodes": { "nodes": {
"cachix-deploy-flake": {
"inputs": {
"darwin": "darwin",
"disko": "disko",
"home-manager": "home-manager",
"nixos-anywhere": "nixos-anywhere",
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1716236735,
"narHash": "sha256-/VTQfiobFPcEyBjWgvI1NBDBIoolPNhvRvbnTekLav8=",
"owner": "cachix",
"repo": "cachix-deploy-flake",
"rev": "63ad0e83b5873909902ea55a69663e8122bd3b56",
"type": "github"
},
"original": {
"owner": "cachix",
"repo": "cachix-deploy-flake",
"type": "github"
}
},
"darwin": {
"inputs": {
"nixpkgs": [
"cachix-deploy-flake",
"nixpkgs"
]
},
"locked": {
"lastModified": 1715871485,
"narHash": "sha256-ywapEXmBBI+DVRx/YYC6+6Lk+W8vhShz1uJNvqPKzng=",
"owner": "LnL7",
"repo": "nix-darwin",
"rev": "cb02884fa1ff5a619a44ab5f1bcc4dedd2d623c2",
"type": "github"
},
"original": {
"owner": "LnL7",
"repo": "nix-darwin",
"type": "github"
}
},
"disko": { "disko": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs" "nixpkgs": [
"cachix-deploy-flake",
"nixpkgs"
]
},
"locked": {
"lastModified": 1715822638,
"narHash": "sha256-Z4ZoyK8jYRmBZwMaEZLEmAilrfdpekwwwohliqC14/E=",
"owner": "nix-community",
"repo": "disko",
"rev": "476eef8d85aa09389ae7baf6e6b60357f6a01432",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "disko",
"type": "github"
}
},
"disko_2": {
"inputs": {
"nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1718588625, "lastModified": 1718588625,
@ -18,22 +82,152 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs": { "flake-parts": {
"inputs": {
"nixpkgs-lib": [
"cachix-deploy-flake",
"nixos-anywhere",
"nixpkgs"
]
},
"locked": { "locked": {
"lastModified": 1718276985, "lastModified": 1701473968,
"narHash": "sha256-u1fA0DYQYdeG+5kDm1bOoGcHtX0rtC7qs2YA2N1X++I=", "narHash": "sha256-YcVE5emp1qQ8ieHUnxt1wCZCC3ZfAS+SRRWZ2TMda7E=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "34fed993f1674c8d06d58b37ce1e0fe5eebcb9f5",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"flake-utils": {
"inputs": {
"systems": "systems"
},
"locked": {
"lastModified": 1710146030,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"home-manager": {
"inputs": {
"nixpkgs": [
"cachix-deploy-flake",
"nixpkgs"
]
},
"locked": {
"lastModified": 1715486357,
"narHash": "sha256-4pRuzsHZOW5W4CsXI9uhKtiJeQSUoe1d2M9mWU98HC4=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "44677a1c96810a8e8c4ffaeaad10c842402647c1",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "home-manager",
"type": "github"
}
},
"nixos-anywhere": {
"inputs": {
"disko": [
"cachix-deploy-flake",
"disko"
],
"flake-parts": "flake-parts",
"nixos-images": "nixos-images",
"nixos-stable": "nixos-stable",
"nixpkgs": [
"cachix-deploy-flake",
"nixpkgs"
],
"treefmt-nix": "treefmt-nix"
},
"locked": {
"lastModified": 1715150548,
"narHash": "sha256-pb2xIGuzzkPOjUlZnBahpfQWVvtCSOcW8vLL7rQUiEY=",
"owner": "numtide",
"repo": "nixos-anywhere",
"rev": "242444d228636b1f0e89d3681f04a75254c29f66",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "nixos-anywhere",
"type": "github"
}
},
"nixos-images": {
"inputs": {
"nixos-2311": [
"cachix-deploy-flake",
"nixos-anywhere",
"nixos-stable"
],
"nixos-unstable": [
"cachix-deploy-flake",
"nixos-anywhere",
"nixpkgs"
]
},
"locked": {
"lastModified": 1702375325,
"narHash": "sha256-kEdrh6IB7xh7YDwZ0ZVCngCs+uoS9gx4ydEoJRnM1Is=",
"owner": "nix-community",
"repo": "nixos-images",
"rev": "d655cc02fcb9ecdcca4f3fb307e291a4b5be1339",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "nixos-images",
"type": "github"
}
},
"nixos-stable": {
"locked": {
"lastModified": 1702233072,
"narHash": "sha256-H5G2wgbim2Ku6G6w+NSaQaauv6B6DlPhY9fMvArKqRo=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "3f84a279f1a6290ce154c5531378acc827836fbb", "rev": "781e2a9797ecf0f146e81425c822dca69fe4a348",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixpkgs-unstable", "ref": "nixos-23.11",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
}, },
"nixpkgs": {
"locked": {
"lastModified": 1713995372,
"narHash": "sha256-fFE3M0vCoiSwCX02z8VF58jXFRj9enYUSTqjyHAjrds=",
"path": "/nix/store/22chir190mpfvp59lgh39q7fp7w77br9-source",
"rev": "dd37924974b9202f8226ed5d74a252a9785aedf8",
"type": "path"
},
"original": {
"id": "nixpkgs",
"type": "indirect"
}
},
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1718478900, "lastModified": 1718478900,
@ -51,6 +245,22 @@
} }
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": {
"lastModified": 1718276985,
"narHash": "sha256-u1fA0DYQYdeG+5kDm1bOoGcHtX0rtC7qs2YA2N1X++I=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "3f84a279f1a6290ce154c5531378acc827836fbb",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1718437845, "lastModified": 1718437845,
"narHash": "sha256-ZT7Oc1g4I4pHVGGjQFnewFVDRLH5cIZhEzODLz9YXeY=", "narHash": "sha256-ZT7Oc1g4I4pHVGGjQFnewFVDRLH5cIZhEzODLz9YXeY=",
@ -66,7 +276,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_3": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1718541509, "lastModified": 1718541509,
"narHash": "sha256-TmC5TxW5WPAfmovDzi1hLe1i4qqND79s9SH9UOKcSvo=", "narHash": "sha256-TmC5TxW5WPAfmovDzi1hLe1i4qqND79s9SH9UOKcSvo=",
@ -84,8 +294,10 @@
}, },
"root": { "root": {
"inputs": { "inputs": {
"disko": "disko", "cachix-deploy-flake": "cachix-deploy-flake",
"nixpkgs": "nixpkgs_2", "disko": "disko_2",
"flake-utils": "flake-utils",
"nixpkgs": "nixpkgs_3",
"sops-nix": "sops-nix", "sops-nix": "sops-nix",
"srvos": "srvos" "srvos": "srvos"
} }
@ -113,7 +325,7 @@
}, },
"srvos": { "srvos": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_4"
}, },
"locked": { "locked": {
"lastModified": 1718585173, "lastModified": 1718585173,
@ -128,6 +340,43 @@
"repo": "srvos", "repo": "srvos",
"type": "github" "type": "github"
} }
},
"systems": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"treefmt-nix": {
"inputs": {
"nixpkgs": [
"cachix-deploy-flake",
"nixos-anywhere",
"nixpkgs"
]
},
"locked": {
"lastModified": 1702376629,
"narHash": "sha256-9uAY8a7JN4DvLe/g4OoldqPbcNZ09YOVXID+CkIqL70=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "390018a9398f9763bfc05ffe6443ce0622cb9ba6",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "treefmt-nix",
"type": "github"
}
} }
}, },
"root": "root", "root": "root",

55
flake.nix
View file

@ -5,6 +5,8 @@
nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05"; nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05";
srvos.url = "github:numtide/srvos"; srvos.url = "github:numtide/srvos";
disko.url = "github:nix-community/disko"; disko.url = "github:nix-community/disko";
cachix-deploy-flake.url = "github:cachix/cachix-deploy-flake";
flake-utils.url = "github:numtide/flake-utils";
# sops-nix - secrets with mozilla sops # sops-nix - secrets with mozilla sops
# https://github.com/Mic92/sops-nix # https://github.com/Mic92/sops-nix
sops-nix = { sops-nix = {
@ -13,17 +15,19 @@
}; };
}; };
outputs = { self, sops-nix, nixpkgs, srvos, disko, ... }@inputs: outputs = { self, sops-nix, nixpkgs, srvos, disko, cachix-deploy-flake, flake-utils, ... }@inputs:
let flake-utils.lib.eachDefaultSystem (
lib = nixpkgs.lib; system: {
inherit (self) outputs; defaultPackage = let
in { pkgs = import nixpkgs { inherit system; };
nixosConfigurations = cachix-deploy-lib = cachix-deploy-flake.lib pkgs;
in
cachix-deploy-lib.spec
{ {
"fj-hetzner-aarch64-01" = lib.nixosSystem { agents = {
system = "aarch64-linux"; "fj-hetzner-aarch64-01" = cachix-deploy-lib.nixos {
specialArgs = {inherit inputs outputs;}; # system = "aarch64-linux";
modules = [ 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
@ -43,10 +47,9 @@
services.openssh.settings.PermitRootLogin = "without-password"; services.openssh.settings.PermitRootLogin = "without-password";
}]; }];
}; };
"fj-shadowfax-01" = lib.nixosSystem { "fj-shadowfax-01" = cachix-deploy-lib.nixos {
system = "x86_64-linux"; # system = "x86_64-linux";
specialArgs = {inherit inputs outputs;}; imports = [
modules = [
sops-nix.nixosModules.sops sops-nix.nixosModules.sops
./hardware/shadowfax-kubevirt.nix ./hardware/shadowfax-kubevirt.nix
srvos.nixosModules.server srvos.nixosModules.server
@ -66,10 +69,9 @@
services.openssh.settings.PermitRootLogin = "without-password"; services.openssh.settings.PermitRootLogin = "without-password";
}]; }];
}; };
"fj-shadowfax-02" = lib.nixosSystem { "fj-shadowfax-02" = cachix-deploy-lib.nixos {
system = "x86_64-linux"; # system = "x86_64-linux";
specialArgs = {inherit inputs outputs;}; imports = [
modules = [
sops-nix.nixosModules.sops sops-nix.nixosModules.sops
./hardware/shadowfax-kubevirt.nix ./hardware/shadowfax-kubevirt.nix
srvos.nixosModules.server srvos.nixosModules.server
@ -90,14 +92,15 @@
}]; }];
}; };
}; };
};
});
# 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;
};
} }