From f20d477f6773074944e17c7a9dc455112474693c Mon Sep 17 00:00:00 2001
From: Noah Masur <7386960+nmasur@users.noreply.github.com>
Date: Mon, 2 Jun 2025 02:56:19 +0000
Subject: [PATCH] get around official filebrowser module

---
 flake.lock                                               | 6 +++---
 .../modules/nmasur/presets/services/filebrowser.nix      | 9 ++++++++-
 .../nixos/modules/{ => nmasur}/services/filebrowser.nix  | 6 +++---
 3 files changed, 14 insertions(+), 7 deletions(-)
 rename platforms/nixos/modules/{ => nmasur}/services/filebrowser.nix (91%)

diff --git a/flake.lock b/flake.lock
index 72d3685..15bda14 100644
--- a/flake.lock
+++ b/flake.lock
@@ -310,11 +310,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1746141548,
-        "narHash": "sha256-IgBWhX7A2oJmZFIrpRuMnw5RAufVnfvOgHWgIdds+hc=",
+        "lastModified": 1748693115,
+        "narHash": "sha256-StSrWhklmDuXT93yc3GrTlb0cKSS0agTAxMGjLKAsY8=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "f02fddb8acef29a8b32f10a335d44828d7825b78",
+        "rev": "910796cabe436259a29a72e8d3f5e180fc6dfacc",
         "type": "github"
       },
       "original": {
diff --git a/platforms/nixos/modules/nmasur/presets/services/filebrowser.nix b/platforms/nixos/modules/nmasur/presets/services/filebrowser.nix
index 6ec576b..9b38b07 100644
--- a/platforms/nixos/modules/nmasur/presets/services/filebrowser.nix
+++ b/platforms/nixos/modules/nmasur/presets/services/filebrowser.nix
@@ -13,10 +13,17 @@ in
 
   config = lib.mkIf cfg.enable {
 
-    services.filebrowser = {
+    nmasur.services.filebrowser = {
       enable = true;
       # Generate password: htpasswd -nBC 10 "" | tr -d ':\n'
       passwordHash = "$2y$10$ze1cMob0k6pnXRjLowYfZOVZWg4G.dsPtH3TohbUeEbI0sdkG9.za";
+      # settings = {
+      #   database = "/var/lib/filebrowser/filebrowser.db";
+      #   port = 8020;
+      #   address = "localhost";
+      #   log = "stdout";
+      #   "auth.method" = "json";
+      # };
     };
 
     nmasur.presets.services.caddy.routes = [
diff --git a/platforms/nixos/modules/services/filebrowser.nix b/platforms/nixos/modules/nmasur/services/filebrowser.nix
similarity index 91%
rename from platforms/nixos/modules/services/filebrowser.nix
rename to platforms/nixos/modules/nmasur/services/filebrowser.nix
index 84ba1b9..955c30e 100644
--- a/platforms/nixos/modules/services/filebrowser.nix
+++ b/platforms/nixos/modules/nmasur/services/filebrowser.nix
@@ -5,8 +5,8 @@
   ...
 }:
 let
-  inherit (config.nmasur.settings) hostnames username;
-  cfg = config.services.filebrowser;
+  inherit (config.nmasur.settings) username;
+  cfg = config.nmasur.services.filebrowser;
 
   dataDir = "/var/lib/filebrowser";
 
@@ -26,7 +26,7 @@ let
 in
 {
 
-  options.services.filebrowser = {
+  options.nmasur.services.filebrowser = {
     enable = lib.mkEnableOption "Filebrowser private files";
     passwordHash = lib.mkOption {
       type = lib.types.str;