Merge branch 'main' into vaultwarden

This commit is contained in:
Rouven Seifert 2023-07-12 15:54:36 +02:00
commit d7e85c3d43
Signed by untrusted user: rouven.seifert
GPG key ID: B95E8FE6B11C4D09
5 changed files with 180 additions and 7 deletions

View file

@ -6,8 +6,12 @@
kpp.url = "github:fsr/kpp";
kpp.inputs.nixpkgs.follows = "nixpkgs";
# fsr-infoscreen.url = github:fsr/infoscreen; # some anonymous strukturer accidentally removed the flake.nix
course-management = {
url = "github:fsr/course-management";
inputs.nixpkgs.follows = "nixpkgs";
};
};
outputs = { self, nixpkgs, sops-nix, kpp, ... }@inputs:
outputs = { self, nixpkgs, sops-nix, kpp, course-management, ... }@inputs:
{
packages."x86_64-linux".quitte = self.nixosConfigurations.quitte-vm.config.system.build.vm;
packages."x86_64-linux".default = self.packages."x86_64-linux".quitte;
@ -19,6 +23,7 @@
modules = [
inputs.sops-nix.nixosModules.sops
inputs.kpp.nixosModules.default
course-management.nixosModules.default
./hosts/quitte/configuration.nix
./modules/options.nix
./modules/base.nix
@ -39,6 +44,7 @@
./modules/mautrix-telegram.nix
./modules/sogo.nix
./modules/vaultwarden.nix
./modules/course-management.nix
{
fsr.enable_office_bloat = false;
fsr.domain = "staging.ifsr.de";