wurzel/fruitbasket
10
1
Fork 1
Code Issues 5 Pull requests Projects Releases Packages Wiki Activity

Merge branch 'main' into vaultwarden

Browse source
This commit is contained in:
Rouven Seifert 2023-07-12 15:51:25 +02:00
commit c0266785cd
Signed by: rouven.seifert
GPG key ID: B95E8FE6B11C4D09
17 changed files with 177 additions and 1598 deletions
Download patch file Download diff file Expand all files Collapse all files

32
flake.nix
View file

@ -3,48 +3,33 @@
nixpkgs.url = github:nixos/nixpkgs/nixos-23.05;
sops-nix.url = github:Mic92/sops-nix;
sops-nix.inputs.nixpkgs.follows = "nixpkgs";
kpp.url = "github:fsr/kpp";
kpp.inputs.nixpkgs.follows = "nixpkgs";
# fsr-infoscreen.url = github:fsr/infoscreen; # some anonymous strukturer accidentally removed the flake.nix
};
outputs = { self, nixpkgs, sops-nix, ... }@inputs:
outputs = { self, nixpkgs, sops-nix, kpp, ... }@inputs:
{
#packages."aarch64-linux".sanddorn = self.nixosConfigurations.sanddorn.config.system.build.sdImage;
packages."x86_64-linux".quitte = self.nixosConfigurations.quitte-vm.config.system.build.vm;
packages."x86_64-linux".default = self.packages."x86_64-linux".quitte;
formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.nixpkgs-fmt;
nixosConfigurations = {
sanddorn = nixpkgs.lib.nixosSystem {
system = "aarch64-linux";
modules = [
{
# nixpkgs.overlays = [ fsr-infoscreen.overlay."aarch64-linux" ];
nixpkgs.config.allowBroken = true;
sdImage.compressImage = false;
}
./hosts/sanddorn/configuration.nix
# ./modules/infoscreen.nix
./modules/base.nix
./modules/desktop.nix
./modules/options.nix
"${nixpkgs}/nixos/modules/installer/sd-card/sd-image-aarch64.nix"
{
fsr.enable_office_bloat = false;
}
];
};
quitte = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
modules = [
inputs.sops-nix.nixosModules.sops
inputs.kpp.nixosModules.default
./hosts/quitte/configuration.nix
./modules/options.nix
./modules/base.nix
./modules/sops.nix
./modules/ldap.nix
./modules/kpp.nix
./modules/ldap
# ./modules/keycloak.nix replaced by portunus
./modules/mail.nix
./modules/mailman.nix
./modules/nginx.nix
./modules/userdir.nix
./modules/hedgedoc.nix
./modules/wiki.nix
./modules/ftp.nix
@ -68,8 +53,7 @@
./hosts/quitte/configuration.nix
./modules/options.nix
./modules/base.nix
./modules/ldap.nix
# ./modules/keycloak.nix replaced by portunus
./modules/ldap
./modules/nginx.nix
./modules/mail.nix
./modules/mailman.nix