From 9aab9e6b5f2b0ed005ab218a284cefa1f0ecb0c1 Mon Sep 17 00:00:00 2001
From: ibizaman <ibizapeanut@gmail.com>
Date: Sat, 9 Dec 2023 10:16:41 -0800
Subject: [PATCH] update flake input to point to github

---
 demo/homeassistant/flake.lock | 34 ++++++++++++++++++++++++++--------
 demo/homeassistant/flake.nix  | 21 ++++++++++++++++++---
 2 files changed, 44 insertions(+), 11 deletions(-)

diff --git a/demo/homeassistant/flake.lock b/demo/homeassistant/flake.lock
index a9a4fb9..8f0de03 100644
--- a/demo/homeassistant/flake.lock
+++ b/demo/homeassistant/flake.lock
@@ -81,6 +81,22 @@
         "type": "github"
       }
     },
+    "nmdsrc": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1701431551,
+        "narHash": "sha256-5HPHG1u3koaWHG/TXHl5/YxYPYOuKc58104btrD8ypE=",
+        "ref": "refs/heads/master",
+        "rev": "f18defadcc25e69e95b04493ee02682005472255",
+        "revCount": 65,
+        "type": "git",
+        "url": "https://git.sr.ht/~rycee/nmd"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://git.sr.ht/~rycee/nmd"
+      }
+    },
     "root": {
       "inputs": {
         "nixpkgs": "nixpkgs",
@@ -95,21 +111,23 @@
         "nixpkgs": [
           "nixpkgs"
         ],
+        "nmdsrc": "nmdsrc",
         "sops-nix": [
           "sops-nix"
         ]
       },
       "locked": {
-        "dirtyRev": "052a80567948d3dad69d016bfd0a139b0f75fbd9-dirty",
-        "dirtyShortRev": "052a805-dirty",
-        "lastModified": 1700293838,
-        "narHash": "sha256-iHQPbRA47mA1yGgCIrb4S9AuDC+RfvtvqOqOr+asBe0=",
-        "type": "git",
-        "url": "file:///home/timi/Projects/selfhostblocks"
+        "lastModified": 1702104486,
+        "narHash": "sha256-xFNqHDyMfrhrzy6X6WfwsdIhRk/y/QtqfDNba4+En30=",
+        "owner": "ibizaman",
+        "repo": "selfhostblocks",
+        "rev": "ca2f7039cc22afcf5a62f09bd0f1ef3132c518c6",
+        "type": "github"
       },
       "original": {
-        "type": "git",
-        "url": "file:///home/timi/Projects/selfhostblocks"
+        "owner": "ibizaman",
+        "repo": "selfhostblocks",
+        "type": "github"
       }
     },
     "sops-nix": {
diff --git a/demo/homeassistant/flake.nix b/demo/homeassistant/flake.nix
index d361f57..09b14fc 100644
--- a/demo/homeassistant/flake.nix
+++ b/demo/homeassistant/flake.nix
@@ -5,7 +5,7 @@
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
     sops-nix.url = "github:Mic92/sops-nix";
 
-    selfhostblocks.url = "/home/timi/Projects/selfhostblocks";
+    selfhostblocks.url = "github:ibizaman/selfhostblocks";
     selfhostblocks.inputs.nixpkgs.follows = "nixpkgs";
     selfhostblocks.inputs.sops-nix.follows = "sops-nix";
   };
@@ -38,15 +38,30 @@
           domain = "example.com";
           subdomain = "ldap";
           ldapPort = 3890;
-          httpPort = 17170;
+          webUIListenPort = 17170;
           dcdomain = "dc=example,dc=com";
+          ldapUserPasswordFile = config.sops.secrets."lldap/user_password".path;
+          jwtSecretFile = config.sops.secrets."lldap/jwt_secret".path;
+        };
+        sops.secrets."lldap/user_password" = {
           sopsFile = ./secrets.yaml;
+          mode = "0440";
+          owner = "lldap";
+          group = "lldap";
+          restartUnits = [ "lldap.service" ];
+        };
+        sops.secrets."lldap/jwt_secret" = {
+          sopsFile = ./secrets.yaml;
+          mode = "0440";
+          owner = "lldap";
+          group = "lldap";
+          restartUnits = [ "lldap.service" ];
         };
 
         shb.home-assistant = {
           enable = true;
           domain = "example.com";
-          ldapEndpoint = "http://127.0.0.1:${builtins.toString config.shb.ldap.httpPort}";
+          ldapEndpoint = "http://127.0.0.1:${builtins.toString config.shb.ldap.webUIListenPort}";
           subdomain = "ha";
           sopsFile = ./secrets.yaml;
         };