From 5920dc9595dd3e0e94849b198b43058645b42220 Mon Sep 17 00:00:00 2001
From: kat witch <kat@kittywit.ch>
Date: Sat, 4 Sep 2021 23:26:14 +0100
Subject: [PATCH] glauth: Further work

---
 config/modules/nixos/glauth.nix    | 2 +-
 config/services/glauth/default.nix | 6 +++---
 nix/sources.json                   | 6 +++---
 overlays/exprs                     | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/config/modules/nixos/glauth.nix b/config/modules/nixos/glauth.nix
index af781375..cde2d6d1 100644
--- a/config/modules/nixos/glauth.nix
+++ b/config/modules/nixos/glauth.nix
@@ -142,7 +142,7 @@ in
         after = databaseServices;
         bindsTo = databaseServices;
         wantedBy = singleton "multi-user.target";
-        path = [
+        path = with pkgs; [
           cfg.package
           replace-secret
         ];
diff --git a/config/services/glauth/default.nix b/config/services/glauth/default.nix
index 0d5c9879..7f873e1f 100644
--- a/config/services/glauth/default.nix
+++ b/config/services/glauth/default.nix
@@ -5,7 +5,7 @@
     database = {
       enable = true;
       type = "postgres";
-      passwordFile = config.secrets.files.glauth-password-file.path;
+      passwordFile = config.secrets.files.glauth-postgres-file.path;
     };
     settings = {
       syslog = true;
@@ -24,7 +24,7 @@
       };
       users = [{
         name = "kat";
-        passsha256 = tf.variables.glauth-password.ref;
+        passsha256 = tf.variables.glauth-password-hash.ref;
         uidnumber = 1000;
         primarygroup = 1500;
       }];
@@ -43,7 +43,7 @@
 
   secrets.files = {
     glauth-postgres-file = {
-      text = "${tf.variables.glauth-postgres.ref}";
+      text = tf.variables.glauth-postgres.ref;
       owner = "glauth";
       group = "glauth";
     };
diff --git a/nix/sources.json b/nix/sources.json
index 978c262d..99f2bd8c 100644
--- a/nix/sources.json
+++ b/nix/sources.json
@@ -89,10 +89,10 @@
         "homepage": null,
         "owner": "kittywitch",
         "repo": "nixexprs",
-        "rev": "ee427185906d11bb33b10fa9215d65f9cc8cfc37",
-        "sha256": "13b910rhv8fhf0ls1ajnvz2nc9dvkphxf1hyqbf13c448rvn8ds3",
+        "rev": "90f41efe41ef038648a9b7bb3c86f82a94faec98",
+        "sha256": "125msdla0kk7jswcxyvbslwdl76v5dmpx3jb4i0psvxafyhr6zbx",
         "type": "tarball",
-        "url": "https://github.com/kittywitch/nixexprs/archive/ee427185906d11bb33b10fa9215d65f9cc8cfc37.tar.gz",
+        "url": "https://github.com/kittywitch/nixexprs/archive/90f41efe41ef038648a9b7bb3c86f82a94faec98.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "niv": {
diff --git a/overlays/exprs b/overlays/exprs
index ee427185..90f41efe 160000
--- a/overlays/exprs
+++ b/overlays/exprs
@@ -1 +1 @@
-Subproject commit ee427185906d11bb33b10fa9215d65f9cc8cfc37
+Subproject commit 90f41efe41ef038648a9b7bb3c86f82a94faec98