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

testing with more modern version of nixpkgs

Browse source
This commit is contained in:
revol-xut 2023-05-20 15:27:05 +02:00
parent a044f9d053
commit c349732361
No known key found for this signature in database
GPG key ID: 4F56FF7759627D07
3 changed files with 14 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

14
flake.lock generated
View file

@ -2,16 +2,16 @@
"nodes": { "nodes": {
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1684432464, "lastModified": 1684588578,
"narHash": "sha256-AIDPtqkmhAON1T141TGpBLq/RBkc2NcOSKpiv1rPzuo=", "narHash": "sha256-0KgeM/MV/OHR4AdgAomMZXAhNxGztVAqSAwygUYtISU=",
"owner": "revol-xut", "owner": "revol-xut",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c0687204c83f132b28a537c74470dd2af0c00416", "rev": "64c9ea63174e215b8a36cf5c34bd087d65e0e4f7",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "revol-xut", "owner": "revol-xut",
"ref": "master", "ref": "regex-opt",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@ -46,11 +46,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1684032930, "lastModified": 1684571352,
"narHash": "sha256-ueeSYDii2e5bkKrsSdP12JhkW9sqgYrUghLC8aDfYGQ=", "narHash": "sha256-342PCrDSZ70qVX5hwz1M0cYNBdEcIBVzxyjrU/Um3RU=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "a376127bb5277cd2c337a9458744f370aaf2e08d", "rev": "df8b52249e78a0ac33680c9e0b7a029ec22cd8f5",
"type": "github" "type": "github"
}, },
"original": { "original": {

5
flake.nix
View file

@ -1,6 +1,6 @@
{ {
inputs = { inputs = {
nixpkgs.url = github:revol-xut/nixpkgs/master; nixpkgs.url = github:/revol-xut/nixpkgs/regex-opt;
sops-nix.url = github:Mic92/sops-nix; sops-nix.url = github:Mic92/sops-nix;
sops-nix.inputs.nixpkgs.follows = "nixpkgs"; sops-nix.inputs.nixpkgs.follows = "nixpkgs";
}; };
@ -53,6 +53,9 @@
./modules/matrix.nix ./modules/matrix.nix
./modules/sogo.nix ./modules/sogo.nix
{ {
nixpkgs.config.permittedInsecurePackages = [
"nodejs-16.20.0"
];
fsr.enable_office_bloat = false; fsr.enable_office_bloat = false;
fsr.domain = "staging.ifsr.de"; fsr.domain = "staging.ifsr.de";
sops.defaultSopsFile = ./secrets/quitte.yaml; sops.defaultSopsFile = ./secrets/quitte.yaml;

8
modules/ldap.nix
View file

@ -24,8 +24,6 @@ in
}; };
}; };
services.dex.settings.oauth2.skipApprovalScreen = true;
services.portunus = { services.portunus = {
enable = true; enable = true;
user = "${portunusUser}"; user = "${portunusUser}";
@ -37,15 +35,15 @@ in
enable = true; enable = true;
}; };
ldap = { ldap = {
user = "${ldapUser}"; #user = "${ldapUser}";
group = "${ldapGroup}"; #group = "${ldapGroup}";
suffix = "dc=ifsr,dc=de"; suffix = "dc=ifsr,dc=de";
searchUserName = "search"; searchUserName = "search";
# disables port 389, use 636 with tls # disables port 389, use 636 with tls
# `portunus.domain` resolves to localhost # `portunus.domain` resolves to localhost
# tls = true; tls = false;
}; };
seedPath = ../config/portunus_seeds.json; seedPath = ../config/portunus_seeds.json;