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

Compare commits

base: CCCHH:e3c677ea9bcecf541e8e90b9bd27c27ef363c65d
Branches Tags
CCCHH:main
CCCHH:ci-check
CCCHH:ci-check-lix
CCCHH:yate
CCCHH:simple-clean-up
CCCHH:nixOptions
CCCHH:spaceapi
CCCHH:ptouch-print-server
CCCHH:Bendodroid-ldflagsSpaceapid
..
compare: CCCHH:53e33a6641791d61d58c9bd007d4ea05d96e82a6
Branches Tags
CCCHH:ci-check
CCCHH:ci-check-lix
CCCHH:main
CCCHH:yate
CCCHH:simple-clean-up
CCCHH:nixOptions
CCCHH:spaceapi
CCCHH:ptouch-print-server
CCCHH:Bendodroid-ldflagsSpaceapid

No commits in common. "e3c677ea9bcecf541e8e90b9bd27c27ef363c65d" and "53e33a6641791d61d58c9bd007d4ea05d96e82a6" have entirely different histories.
e3c677ea9b ... 53e33a6641

3 changed files with 26 additions and 46 deletions
Show stats Expand all files Collapse all files

7
config/common/users.nix
View file

@ -6,9 +6,14 @@
# - https://git.grzb.de/yuri/nix-infra/-/blob/342a2f732da042d04e579d98e9f834418b7ebf25/users/colmena-deploy/default.nix # - https://git.grzb.de/yuri/nix-infra/-/blob/342a2f732da042d04e579d98e9f834418b7ebf25/users/colmena-deploy/default.nix
# - https://nixos.org/manual/nix/stable/command-ref/conf-file.html?highlight=nix.conf#available-settings # - https://nixos.org/manual/nix/stable/command-ref/conf-file.html?highlight=nix.conf#available-settings
{ config, pkgs, lib, authorizedKeysRepo, ... }: { config, pkgs, lib, ... }:
let let
authorizedKeysRepo = builtins.fetchGit {
url = "forgejo@git.hamburg.ccc.de:CCCHH/infrastructure-authorized-keys.git";
ref = "trunk";
rev = "686a6af22f6696f0c0595c56f463c078550049fc";
};
authorizedKeys = builtins.filter (item: item != "") (lib.strings.splitString "\n" (builtins.readFile "${authorizedKeysRepo}/authorized_keys")); authorizedKeys = builtins.filter (item: item != "") (lib.strings.splitString "\n" (builtins.readFile "${authorizedKeysRepo}/authorized_keys"));
in in
{ {

15
flake.lock
View file

@ -1,19 +1,5 @@
{ {
"nodes": { "nodes": {
"authorizedKeysRepo": {
"flake": false,
"locked": {
"lastModified": 1731276342,
"narHash": "sha256-plTYjM6zPzoBE/dp6EUrk9mCqmab278p8FqBCTX8Grc=",
"rev": "686a6af22f6696f0c0595c56f463c078550049fc",
"type": "tarball",
"url": "https://git.hamburg.ccc.de/api/v1/repos/CCCHH/infrastructure-authorized-keys/archive/686a6af22f6696f0c0595c56f463c078550049fc.tar.gz?rev=686a6af22f6696f0c0595c56f463c078550049fc"
},
"original": {
"type": "tarball",
"url": "https://git.hamburg.ccc.de/CCCHH/infrastructure-authorized-keys/archive/686a6af22f6696f0c0595c56f463c078550049fc.tar.gz"
}
},
"nixlib": { "nixlib": {
"locked": { "locked": {
"lastModified": 1731200463, "lastModified": 1731200463,
@ -82,7 +68,6 @@
}, },
"root": { "root": {
"inputs": { "inputs": {
"authorizedKeysRepo": "authorizedKeysRepo",
"nixos-generators": "nixos-generators", "nixos-generators": "nixos-generators",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs_2",
"sops-nix": "sops-nix" "sops-nix": "sops-nix"

50
flake.nix
View file

@ -20,18 +20,10 @@
url = "github:Mic92/sops-nix"; url = "github:Mic92/sops-nix";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
authorizedKeysRepo = {
url = "https://git.hamburg.ccc.de/CCCHH/infrastructure-authorized-keys/archive/686a6af22f6696f0c0595c56f463c078550049fc.tar.gz";
flake = false;
};
}; };
outputs = { self, nixpkgs, nixos-generators, sops-nix, authorizedKeysRepo, ... }: outputs = { self, nixpkgs, nixos-generators, sops-nix, ... }:
let let
specialArgs = {
inherit authorizedKeysRepo;
};
system = "x86_64-linux"; system = "x86_64-linux";
in in
{ {
@ -51,7 +43,7 @@
}; };
nixosConfigurations = { nixosConfigurations = {
audio-hauptraum-kueche = nixpkgs.lib.nixosSystem { audio-hauptraum-kueche = nixpkgs.lib.nixosSystem {
inherit system specialArgs; inherit system;
modules = [ modules = [
self.nixosModules.common self.nixosModules.common
self.nixosModules.proxmox-vm self.nixosModules.proxmox-vm
@ -61,7 +53,7 @@
}; };
audio-hauptraum-tafel = nixpkgs.lib.nixosSystem { audio-hauptraum-tafel = nixpkgs.lib.nixosSystem {
inherit system specialArgs; inherit system;
modules = [ modules = [
self.nixosModules.common self.nixosModules.common
self.nixosModules.proxmox-vm self.nixosModules.proxmox-vm
@ -71,7 +63,7 @@
}; };
esphome = nixpkgs.lib.nixosSystem { esphome = nixpkgs.lib.nixosSystem {
inherit system specialArgs; inherit system;
modules = [ modules = [
self.nixosModules.common self.nixosModules.common
self.nixosModules.proxmox-vm self.nixosModules.proxmox-vm
@ -80,7 +72,7 @@
}; };
public-reverse-proxy = nixpkgs.lib.nixosSystem { public-reverse-proxy = nixpkgs.lib.nixosSystem {
inherit system specialArgs; inherit system;
modules = [ modules = [
self.nixosModules.common self.nixosModules.common
self.nixosModules.proxmox-vm self.nixosModules.proxmox-vm
@ -89,7 +81,7 @@
}; };
netbox = nixpkgs.lib.nixosSystem { netbox = nixpkgs.lib.nixosSystem {
inherit system specialArgs; inherit system;
modules = [ modules = [
self.nixosModules.common self.nixosModules.common
self.nixosModules.proxmox-vm self.nixosModules.proxmox-vm
@ -100,7 +92,7 @@
}; };
matrix = nixpkgs.lib.nixosSystem { matrix = nixpkgs.lib.nixosSystem {
inherit system specialArgs; inherit system;
modules = [ modules = [
self.nixosModules.common self.nixosModules.common
self.nixosModules.proxmox-vm self.nixosModules.proxmox-vm
@ -111,7 +103,7 @@
}; };
public-web-static = nixpkgs.lib.nixosSystem { public-web-static = nixpkgs.lib.nixosSystem {
inherit system specialArgs; inherit system;
modules = [ modules = [
self.nixosModules.common self.nixosModules.common
self.nixosModules.proxmox-vm self.nixosModules.proxmox-vm
@ -122,7 +114,7 @@
}; };
git = nixpkgs.lib.nixosSystem { git = nixpkgs.lib.nixosSystem {
inherit system specialArgs; inherit system;
modules = [ modules = [
self.nixosModules.common self.nixosModules.common
self.nixosModules.proxmox-vm self.nixosModules.proxmox-vm
@ -133,7 +125,7 @@
}; };
forgejo-actions-runner = nixpkgs.lib.nixosSystem { forgejo-actions-runner = nixpkgs.lib.nixosSystem {
inherit system specialArgs; inherit system;
modules = [ modules = [
self.nixosModules.common self.nixosModules.common
self.nixosModules.proxmox-vm self.nixosModules.proxmox-vm
@ -144,7 +136,7 @@
}; };
ptouch-print-server = nixpkgs.lib.nixosSystem { ptouch-print-server = nixpkgs.lib.nixosSystem {
inherit system specialArgs; inherit system;
modules = [ modules = [
self.nixosModules.common self.nixosModules.common
self.nixosModules.proxmox-vm self.nixosModules.proxmox-vm
@ -153,7 +145,7 @@
}; };
eh22-wiki = nixpkgs.lib.nixosSystem { eh22-wiki = nixpkgs.lib.nixosSystem {
inherit system specialArgs; inherit system;
modules = [ modules = [
self.nixosModules.common self.nixosModules.common
self.nixosModules.proxmox-vm self.nixosModules.proxmox-vm
@ -163,7 +155,7 @@
}; };
nix-box-june = nixpkgs.lib.nixosSystem { nix-box-june = nixpkgs.lib.nixosSystem {
inherit system specialArgs; inherit system;
modules = [ modules = [
self.nixosModules.common self.nixosModules.common
self.nixosModules.proxmox-vm self.nixosModules.proxmox-vm
@ -173,7 +165,7 @@
}; };
yate = nixpkgs.lib.nixosSystem { yate = nixpkgs.lib.nixosSystem {
inherit system specialArgs; inherit system;
modules = [ modules = [
self.nixosModules.common self.nixosModules.common
self.nixosModules.proxmox-vm self.nixosModules.proxmox-vm
@ -182,7 +174,7 @@
}; };
mqtt = nixpkgs.lib.nixosSystem { mqtt = nixpkgs.lib.nixosSystem {
inherit system specialArgs; inherit system;
modules = [ modules = [
self.nixosModules.common self.nixosModules.common
self.nixosModules.proxmox-vm self.nixosModules.proxmox-vm
@ -191,7 +183,7 @@
}; };
mjolnir = nixpkgs.lib.nixosSystem { mjolnir = nixpkgs.lib.nixosSystem {
inherit system specialArgs; inherit system;
modules = [ modules = [
self.nixosModules.common self.nixosModules.common
self.nixosModules.proxmox-vm self.nixosModules.proxmox-vm
@ -202,7 +194,7 @@
}; };
woodpecker = nixpkgs.lib.nixosSystem { woodpecker = nixpkgs.lib.nixosSystem {
inherit system specialArgs; inherit system;
modules = [ modules = [
self.nixosModules.common self.nixosModules.common
self.nixosModules.proxmox-vm self.nixosModules.proxmox-vm
@ -213,7 +205,7 @@
}; };
status = nixpkgs.lib.nixosSystem { status = nixpkgs.lib.nixosSystem {
inherit system specialArgs; inherit system;
modules = [ modules = [
self.nixosModules.common self.nixosModules.common
self.nixosModules.proxmox-vm self.nixosModules.proxmox-vm
@ -223,7 +215,7 @@
}; };
penpot = nixpkgs.lib.nixosSystem { penpot = nixpkgs.lib.nixosSystem {
inherit system specialArgs; inherit system;
modules = [ modules = [
self.nixosModules.common self.nixosModules.common
self.nixosModules.proxmox-vm self.nixosModules.proxmox-vm
@ -234,7 +226,7 @@
}; };
hydra = nixpkgs.lib.nixosSystem { hydra = nixpkgs.lib.nixosSystem {
inherit system specialArgs; inherit system;
modules = [ modules = [
self.nixosModules.common self.nixosModules.common
self.nixosModules.proxmox-vm self.nixosModules.proxmox-vm
@ -246,7 +238,6 @@
packages.x86_64-linux = { packages.x86_64-linux = {
proxmox-nixos-template = nixos-generators.nixosGenerate { proxmox-nixos-template = nixos-generators.nixosGenerate {
inherit specialArgs;
system = "x86_64-linux"; system = "x86_64-linux";
modules = [ modules = [
./config/nixos-generators/proxmox.nix ./config/nixos-generators/proxmox.nix
@ -257,7 +248,6 @@
}; };
proxmox-chaosknoten-nixos-template = nixos-generators.nixosGenerate { proxmox-chaosknoten-nixos-template = nixos-generators.nixosGenerate {
inherit specialArgs;
system = "x86_64-linux"; system = "x86_64-linux";
modules = [ modules = [
./config/nixos-generators/proxmox-chaosknoten.nix ./config/nixos-generators/proxmox-chaosknoten.nix