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

Merge branch 'main' into matrix

Browse source
This commit is contained in:
Lyn Fugmann 2022-12-17 21:02:56 +01:00
commit 509cfd4121
Signed by: fugi
GPG key ID: 4472A20091BFA792
11 changed files with 172 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

11
flake.nix
View file

@ -1,6 +1,6 @@
{
inputs = {
nixpkgs.url = github:nixos/nixpkgs/nixos-22.05;
nixpkgs.url = github:nixos/nixpkgs/nixos-22.11;
sops-nix.url = github:Mic92/sops-nix;
sops-nix.inputs.nixpkgs.follows = "nixpkgs";
fsr-infoscreen.url = github:fsr/infoscreen;
@ -56,9 +56,11 @@
modules = [
inputs.sops-nix.nixosModules.sops
./hosts/quitte/configuration.nix
./modules/options.nix
./modules/base.nix
./modules/sops.nix
./modules/keycloak.nix
./modules/ldap.nix
# ./modules/keycloak.nix replaced by portunus
./modules/nginx.nix
./modules/hedgedoc.nix
./modules/wiki.nix
@ -66,6 +68,8 @@
./modules/nextcloud.nix
./modules/matrix.nix
{
fsr.enable_office_bloat = false;
fsr.domain = "staging.ifsr.de";
sops.defaultSopsFile = ./secrets/quitte.yaml;
}
];
@ -75,8 +79,9 @@
modules = [
inputs.sops-nix.nixosModules.sops
./hosts/quitte/configuration.nix
./modules/options.nix
./modules/base.nix
./modules/keycloak.nix
# ./modules/keycloak.nix replaced by portunus
./modules/nginx.nix
./modules/hedgedoc.nix
./modules/wiki.nix