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

Compare commits

base: CCCHH:24effd5be7d2049359acb0dc46cb8f7209c34128
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:971274b473e6384c88d2262e71d1dbf65dde67f7
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

2 commits
24effd5be7 ... 971274b473

Author SHA1 Message Date
ViMaSter
971274b473 feat: Adds a shortcode to the shop 2025-12-27 23:27:30 +01:00
June
b16f0190e0
 		disable nixos-generators input as its broken a. makes infra-rebuild fail 2025-12-27 23:21:35 +01:00
3 changed files with 41 additions and 88 deletions
Download patch file Download diff file Expand all files Collapse all files

4
config/hosts/public-web-static/virtualHosts/hacker.tours.nix
View file

@ -22,6 +22,10 @@ in
"${domain}" = { "${domain}" = {
forceSSL = true; forceSSL = true;
useACMEHost = "${domain}"; useACMEHost = "${domain}";
locations."/shop" = {
return = "302 https://tickets.hamburg.ccc.de";
};
listen = [ listen = [
{ {

65
flake.lock generated
View file

@ -17,52 +17,18 @@
"url": "https://git.hamburg.ccc.de/CCCHH/infrastructure-authorized-keys" "url": "https://git.hamburg.ccc.de/CCCHH/infrastructure-authorized-keys"
} }
}, },
"nixlib": {
"locked": {
"lastModified": 1736643958,
"narHash": "sha256-tmpqTSWVRJVhpvfSN9KXBvKEXplrwKnSZNAoNPf/S/s=",
"owner": "nix-community",
"repo": "nixpkgs.lib",
"rev": "1418bc28a52126761c02dd3d89b2d8ca0f521181",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "nixpkgs.lib",
"type": "github"
}
},
"nixos-generators": {
"inputs": {
"nixlib": "nixlib",
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1751903740,
"narHash": "sha256-PeSkNMvkpEvts+9DjFiop1iT2JuBpyknmBUs0Un0a4I=",
"owner": "nix-community",
"repo": "nixos-generators",
"rev": "032decf9db65efed428afd2fa39d80f7089085eb",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "nixos-generators",
"type": "github"
}
},
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1736657626, "lastModified": 1761173472,
"narHash": "sha256-FWlPMUzp0lkQBdhKlPqtQdqmp+/C+1MBiEytaYfrCTY=", "narHash": "sha256-m9W0dYXflzeGgKNravKJvTMR4Qqa2MVD11AwlGMufeE=",
"owner": "NixOS", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "2f9e2f85cb14a46410a1399aa9ea7ecf433e422e", "rev": "c8aa8cc00a5cb57fada0851a038d35c08a36a2bb",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "nixos",
"ref": "nixpkgs-unstable", "ref": "nixos-25.05",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@ -83,27 +49,10 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_2": {
"locked": {
"lastModified": 1761173472,
"narHash": "sha256-m9W0dYXflzeGgKNravKJvTMR4Qqa2MVD11AwlGMufeE=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "c8aa8cc00a5cb57fada0851a038d35c08a36a2bb",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-25.05",
"repo": "nixpkgs",
"type": "github"
}
},
"root": { "root": {
"inputs": { "inputs": {
"authorizedKeysRepo": "authorizedKeysRepo", "authorizedKeysRepo": "authorizedKeysRepo",
"nixos-generators": "nixos-generators", "nixpkgs": "nixpkgs",
"nixpkgs": "nixpkgs_2",
"nixpkgs-unstable": "nixpkgs-unstable", "nixpkgs-unstable": "nixpkgs-unstable",
"sops-nix": "sops-nix" "sops-nix": "sops-nix"
} }

60
flake.nix
View file

@ -8,12 +8,12 @@
nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05"; nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05";
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.
# See here: https://github.com/nix-community/nixos-generators#using-in-a-flake # # See here: https://github.com/nix-community/nixos-generators#using-in-a-flake
nixos-generators = { # nixos-generators = {
url = "github:nix-community/nixos-generators"; # url = "github:nix-community/nixos-generators";
#inputs.nixpkgs.follows = "nixpkgs"; # #inputs.nixpkgs.follows = "nixpkgs";
}; # };
# Add sops-nix as an input for secret management. # Add sops-nix as an input for secret management.
# See here: https://github.com/Mic92/sops-nix?tab=readme-ov-file#flakes-current-recommendation # See here: https://github.com/Mic92/sops-nix?tab=readme-ov-file#flakes-current-recommendation
@ -28,7 +28,7 @@
}; };
}; };
outputs = { self, nixpkgs, nixos-generators, nixpkgs-unstable, sops-nix, authorizedKeysRepo, ... }: outputs = { self, nixpkgs, nixpkgs-unstable, sops-nix, authorizedKeysRepo, ... }:
let let
specialArgs = { specialArgs = {
inherit authorizedKeysRepo; inherit authorizedKeysRepo;
@ -233,30 +233,30 @@
}; };
}; };
packages.x86_64-linux = { # packages.x86_64-linux = {
proxmox-nixos-template = nixos-generators.nixosGenerate { # proxmox-nixos-template = nixos-generators.nixosGenerate {
inherit specialArgs; # inherit specialArgs;
system = "x86_64-linux"; # system = "x86_64-linux";
modules = [ # modules = [
./config/nixos-generators/proxmox.nix # ./config/nixos-generators/proxmox.nix
self.nixosModules.common # self.nixosModules.common
self.nixosModules.proxmox-vm # self.nixosModules.proxmox-vm
]; # ];
format = "proxmox"; # format = "proxmox";
}; # };
proxmox-chaosknoten-nixos-template = nixos-generators.nixosGenerate { # proxmox-chaosknoten-nixos-template = nixos-generators.nixosGenerate {
inherit specialArgs; # inherit specialArgs;
system = "x86_64-linux"; # system = "x86_64-linux";
modules = [ # modules = [
./config/nixos-generators/proxmox-chaosknoten.nix # ./config/nixos-generators/proxmox-chaosknoten.nix
./config/proxmox-chaosknoten-additional-initial-config.nix # ./config/proxmox-chaosknoten-additional-initial-config.nix
self.nixosModules.common # self.nixosModules.common
self.nixosModules.proxmox-vm # self.nixosModules.proxmox-vm
]; # ];
format = "proxmox"; # format = "proxmox";
}; # };
}; # };
formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.nixpkgs-fmt; formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.nixpkgs-fmt;