From 83b85a749555a67e3c239ed052f6a9da609395b7 Mon Sep 17 00:00:00 2001
From: niten <niten@fudo.org>
Date: Wed, 6 Sep 2023 15:49:34 -0700
Subject: [PATCH] Moved the stupid hack somewhere more reasonable

---
 lib/fudo/ldap.nix | 46 +++++++++++++++++-----------------------------
 1 file changed, 17 insertions(+), 29 deletions(-)

diff --git a/lib/fudo/ldap.nix b/lib/fudo/ldap.nix
index c70129d..b7e7fbe 100644
--- a/lib/fudo/ldap.nix
+++ b/lib/fudo/ldap.nix
@@ -31,35 +31,23 @@ let
     else
       "/home/${user-opts.primary-group}/${username}";
 
-  userLdif = base: name: group-map: opts:
-    let
-      # TODO: HORRIBLE HACK
-      domains = {
-        fudo = "fudo.org";
-        selby = "selby.ca";
-        informis = "informis.land";
-      };
-      email = if (opts.email != null) then
-        opts.email
-      else
-        "${name}@${domains."${opts.primary-group}"}";
-    in ''
-      dn: uid=${name},ou=members,${base}
-      uid: ${name}
-      objectClass: account
-      objectClass: shadowAccount
-      objectClass: posixAccount
-      cn: ${opts.common-name}
-      uidNumber: ${toString (opts.uid)}
-      gidNumber: ${toString (getUserGidNumber opts group-map)}
-      homeDirectory: ${mkHomeDir name opts}
-      description: ${opts.description}
-      shadowLastChange: 12230
-      shadowMax: 99999
-      shadowWarning: 7
-      userPassword: ${opts.ldap-hashed-passwd}
-      mail: ${email}
-    '';
+  userLdif = base: name: group-map: opts: ''
+    dn: uid=${name},ou=members,${base}
+    uid: ${name}
+    objectClass: account
+    objectClass: shadowAccount
+    objectClass: posixAccount
+    cn: ${opts.common-name}
+    uidNumber: ${toString (opts.uid)}
+    gidNumber: ${toString (getUserGidNumber opts group-map)}
+    homeDirectory: ${mkHomeDir name opts}
+    description: ${opts.description}
+    shadowLastChange: 12230
+    shadowMax: 99999
+    shadowWarning: 7
+    userPassword: ${opts.ldap-hashed-passwd}
+    mail: ${opts.email}
+  '';
 
   systemUserLdif = base: name: opts: ''
     dn: cn=${name},${base}