From c349732361015aaa35ab10d76bbadd6d685244ff Mon Sep 17 00:00:00 2001
From: revol-xut <revol-xut@protonmail.com>
Date: Sat, 20 May 2023 15:27:05 +0200
Subject: [PATCH] testing with more modern version of nixpkgs

---
 flake.lock       | 14 +++++++-------
 flake.nix        |  5 ++++-
 modules/ldap.nix |  8 +++-----
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/flake.lock b/flake.lock
index f2be020..4b4782a 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,16 +2,16 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1684432464,
-        "narHash": "sha256-AIDPtqkmhAON1T141TGpBLq/RBkc2NcOSKpiv1rPzuo=",
+        "lastModified": 1684588578,
+        "narHash": "sha256-0KgeM/MV/OHR4AdgAomMZXAhNxGztVAqSAwygUYtISU=",
         "owner": "revol-xut",
         "repo": "nixpkgs",
-        "rev": "c0687204c83f132b28a537c74470dd2af0c00416",
+        "rev": "64c9ea63174e215b8a36cf5c34bd087d65e0e4f7",
         "type": "github"
       },
       "original": {
         "owner": "revol-xut",
-        "ref": "master",
+        "ref": "regex-opt",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -46,11 +46,11 @@
         "nixpkgs-stable": "nixpkgs-stable"
       },
       "locked": {
-        "lastModified": 1684032930,
-        "narHash": "sha256-ueeSYDii2e5bkKrsSdP12JhkW9sqgYrUghLC8aDfYGQ=",
+        "lastModified": 1684571352,
+        "narHash": "sha256-342PCrDSZ70qVX5hwz1M0cYNBdEcIBVzxyjrU/Um3RU=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "a376127bb5277cd2c337a9458744f370aaf2e08d",
+        "rev": "df8b52249e78a0ac33680c9e0b7a029ec22cd8f5",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 0cac359..5246802 100755
--- a/flake.nix
+++ b/flake.nix
@@ -1,6 +1,6 @@
 {
   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.inputs.nixpkgs.follows = "nixpkgs";
   };
@@ -53,6 +53,9 @@
             ./modules/matrix.nix
             ./modules/sogo.nix
             {
+              nixpkgs.config.permittedInsecurePackages = [
+                "nodejs-16.20.0"
+              ];
               fsr.enable_office_bloat = false;
               fsr.domain = "staging.ifsr.de";
               sops.defaultSopsFile = ./secrets/quitte.yaml;
diff --git a/modules/ldap.nix b/modules/ldap.nix
index dd739b0..3eee415 100644
--- a/modules/ldap.nix
+++ b/modules/ldap.nix
@@ -24,8 +24,6 @@ in
     };
   };
 
-  services.dex.settings.oauth2.skipApprovalScreen = true;
-
   services.portunus = {
     enable = true;
     user = "${portunusUser}";
@@ -37,15 +35,15 @@ in
       enable = true;
     };
     ldap = {
-      user = "${ldapUser}";
-      group = "${ldapGroup}";
+      #user = "${ldapUser}";
+      #group = "${ldapGroup}";
 
       suffix = "dc=ifsr,dc=de";
       searchUserName = "search";
 
       # disables port 389, use 636 with tls
       # `portunus.domain` resolves to localhost
-      # tls = true;
+      tls = false;
     };
 
     seedPath = ../config/portunus_seeds.json;