From a044d5707a3e6733c90f1c184ff94e900a87cea3 Mon Sep 17 00:00:00 2001
From: Philipp <philipp@boehm.sh>
Date: Sat, 31 May 2025 17:54:25 +0200
Subject: [PATCH 1/4] fix(ente-auth): remove build flag from ente-web-auth
 package

Move the build flag from the package to the module, that way everyone
can just define their own URL in the module.
---
 modules/nixos/services/ente-auth/default.nix | 10 +++++++++-
 packages/ente-web-auth/default.nix           |  1 -
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/modules/nixos/services/ente-auth/default.nix b/modules/nixos/services/ente-auth/default.nix
index 10dc6ec..a1b49bf 100644
--- a/modules/nixos/services/ente-auth/default.nix
+++ b/modules/nixos/services/ente-auth/default.nix
@@ -9,6 +9,14 @@ with lib;
 with lib.${namespace};
 let
   cfg = config.${namespace}.services.ente-auth;
+
+  enteApp = 
+    cfg.package.override {
+      extraBuildEnv = {
+        NEXT_PUBLIC_ENTE_ENDPOINT = "https://ente-api.monapona.dev";
+        NEXT_TELEMETRY_DISABLED = "1";
+      };
+    };
 in
 {
   options.${namespace}.services.ente-auth = {
@@ -49,7 +57,7 @@ in
         forceSSL = true;
         useACMEHost = "stahl.sh";
         locations."/" = {
-          root = "${cfg.package}";
+          root = enteApp;
         };
       };
     };
diff --git a/packages/ente-web-auth/default.nix b/packages/ente-web-auth/default.nix
index cd3451d..6108b43 100644
--- a/packages/ente-web-auth/default.nix
+++ b/packages/ente-web-auth/default.nix
@@ -39,7 +39,6 @@ stdenv.mkDerivation (finalAttrs: {
   env = extraBuildEnv;
 
   buildPhase = ''
-    export NEXT_PUBLIC_ENTE_ENDPOINT=https://ente-api.monapona.dev
     yarn build:auth
   '';
 

From 40a9483bd04ad986b5ff105281618c8c8793baeb Mon Sep 17 00:00:00 2001
From: Philipp <philipp@boehm.sh>
Date: Sat, 31 May 2025 17:55:09 +0200
Subject: [PATCH 2/4] update(fish): update fish to use flakeRoot path

---
 modules/home/cli-apps/fish/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/modules/home/cli-apps/fish/default.nix b/modules/home/cli-apps/fish/default.nix
index c91e43d..2ef905b 100644
--- a/modules/home/cli-apps/fish/default.nix
+++ b/modules/home/cli-apps/fish/default.nix
@@ -9,6 +9,7 @@ let
   inherit (lib) mkEnableOption mkIf;
 
   cfg = config.${namespace}.cli-apps.fish;
+  flakeRoot = "/home/philipp/Documents/nix-config";
 in
 {
   options.${namespace}.cli-apps.fish = {
@@ -19,11 +20,11 @@ in
     programs.fish = {
       enable = true;
       shellAliases = {
-        nix-dns = "nixos-rebuild switch --flake .#dns --target-host dns-1 --use-remote-sudo && nixos-rebuild switch --flake .#dns --target-host dns-2 --use-remote-sudo";
-        nix-blarm = "nixos-rebuild switch --flake .#blarm --target-host blarm --use-remote-sudo";
+        nix-dns = "nixos-rebuild switch --flake ${flakeRoot}/.#dns --target-host dns-1 --use-remote-sudo && nixos-rebuild switch --flake ${flakeRoot}/.#dns --target-host dns-2 --use-remote-sudo";
+        nix-blarm = "nixos-rebuild switch --flake ${flakeRoot}/.#blarm --target-host blarm --use-remote-sudo";
         cd = "z";
-        ls = "exa";
-        l = "exa --icons";
+        ls = "exa --icons";
+        l = "exa";
       };
       plugins = [
         {

From f86394d5a2988b9cc83c4630bfe72f4c6adf8951 Mon Sep 17 00:00:00 2001
From: Philipp <philipp@boehm.sh>
Date: Sat, 31 May 2025 17:55:58 +0200
Subject: [PATCH 3/4] update(services): update to use flakeRoot for paths

---
 modules/nixos/cli/nh/default.nix                 |  2 +-
 modules/nixos/services/searxng/default.nix       |  3 +--
 modules/nixos/system/flakeRoot/default.nix       | 16 ++++++++++++++++
 .../virtualisation/podman/invidious/default.nix  |  4 ++--
 4 files changed, 20 insertions(+), 5 deletions(-)
 create mode 100644 modules/nixos/system/flakeRoot/default.nix

diff --git a/modules/nixos/cli/nh/default.nix b/modules/nixos/cli/nh/default.nix
index fac140f..9d1d099 100644
--- a/modules/nixos/cli/nh/default.nix
+++ b/modules/nixos/cli/nh/default.nix
@@ -19,7 +19,7 @@ in
       enable = true;
       clean.enable = true;
       clean.extraArgs = "--keep-since 4d --keep 3";
-      flake = "${config.home-manager.users.philipp.home.homeDirectory}/Documents/nix-config";
+      flake = "${config.flakeRoot}";
     };
   };
 
diff --git a/modules/nixos/services/searxng/default.nix b/modules/nixos/services/searxng/default.nix
index cc71ea3..db9ce46 100644
--- a/modules/nixos/services/searxng/default.nix
+++ b/modules/nixos/services/searxng/default.nix
@@ -36,8 +36,7 @@ in
         default = "reddit.stahl.sh";
       };
     };
-
-  };
+};
 
   config = mkIf cfg.enable {
     networking.firewall.allowedTCPPorts = mkIf cfg.nginx.enable [
diff --git a/modules/nixos/system/flakeRoot/default.nix b/modules/nixos/system/flakeRoot/default.nix
new file mode 100644
index 0000000..671f6bd
--- /dev/null
+++ b/modules/nixos/system/flakeRoot/default.nix
@@ -0,0 +1,16 @@
+{
+  config,
+  lib,
+  namespace,
+  ...
+}:
+with lib;
+with lib.${namespace};
+{
+  options.flakeRoot = mkOption {
+    type = types.str;
+    description = "Path to the flake root directory.";
+  };
+
+  config.flakeRoot = "${config.users.users.philipp.home}/Documents/nix-config";
+}
diff --git a/modules/nixos/virtualisation/podman/invidious/default.nix b/modules/nixos/virtualisation/podman/invidious/default.nix
index 71e013e..5966102 100644
--- a/modules/nixos/virtualisation/podman/invidious/default.nix
+++ b/modules/nixos/virtualisation/podman/invidious/default.nix
@@ -72,8 +72,8 @@ in
         hostname = "invidious-db";
         volumes = [
           "postgresdata:/var/lib/postgresql/data"
-          "/home/philipp/nix-config/modules/nixos/virtualisation/podman/invidious/config/sql:/config/sql"
-          "/home/philipp/nix-config/modules/nixos/virtualisation/podman/invidious/init-invidious-db.sh:/docker-entrypoint-initdb.d/init-invidious-db.sh"
+          "${config.flakeRoot}/modules/nixos/virtualisation/podman/invidious/config/sql:/config/sql"
+          "${config.flakeRoot}/modules/nixos/virtualisation/podman/invidious/init-invidious-db.sh:/docker-entrypoint-initdb.d/init-invidious-db.sh"
         ];
         environmentFiles = [ /run/secrets/invidious-db ];
       };

From 6eeb49f93c26a69677349aaca7be4c70631a4cd9 Mon Sep 17 00:00:00 2001
From: Philipp <philipp@boehm.sh>
Date: Sat, 31 May 2025 17:57:35 +0200
Subject: [PATCH 4/4] fix(all): nixfmt

---
 modules/nixos/services/ente-auth/default.nix | 11 +++++------
 modules/nixos/services/searxng/default.nix   |  2 +-
 systems/x86_64-linux/dns/default.nix         |  1 +
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/modules/nixos/services/ente-auth/default.nix b/modules/nixos/services/ente-auth/default.nix
index a1b49bf..d457223 100644
--- a/modules/nixos/services/ente-auth/default.nix
+++ b/modules/nixos/services/ente-auth/default.nix
@@ -10,13 +10,12 @@ with lib.${namespace};
 let
   cfg = config.${namespace}.services.ente-auth;
 
-  enteApp = 
-    cfg.package.override {
-      extraBuildEnv = {
-        NEXT_PUBLIC_ENTE_ENDPOINT = "https://ente-api.monapona.dev";
-        NEXT_TELEMETRY_DISABLED = "1";
-      };
+  enteApp = cfg.package.override {
+    extraBuildEnv = {
+      NEXT_PUBLIC_ENTE_ENDPOINT = "https://ente-api.monapona.dev";
+      NEXT_TELEMETRY_DISABLED = "1";
     };
+  };
 in
 {
   options.${namespace}.services.ente-auth = {
diff --git a/modules/nixos/services/searxng/default.nix b/modules/nixos/services/searxng/default.nix
index db9ce46..5ad29fc 100644
--- a/modules/nixos/services/searxng/default.nix
+++ b/modules/nixos/services/searxng/default.nix
@@ -36,7 +36,7 @@ in
         default = "reddit.stahl.sh";
       };
     };
-};
+  };
 
   config = mkIf cfg.enable {
     networking.firewall.allowedTCPPorts = mkIf cfg.nginx.enable [
diff --git a/systems/x86_64-linux/dns/default.nix b/systems/x86_64-linux/dns/default.nix
index b53c7e8..46cf364 100644
--- a/systems/x86_64-linux/dns/default.nix
+++ b/systems/x86_64-linux/dns/default.nix
@@ -1,5 +1,6 @@
 {
   lib,
+  pkgs,
   modulesPath,
   namespace,
   ...