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 = [
         {
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/ente-auth/default.nix b/modules/nixos/services/ente-auth/default.nix
index 10dc6ec..d457223 100644
--- a/modules/nixos/services/ente-auth/default.nix
+++ b/modules/nixos/services/ente-auth/default.nix
@@ -9,6 +9,13 @@ 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 +56,7 @@ in
         forceSSL = true;
         useACMEHost = "stahl.sh";
         locations."/" = {
-          root = "${cfg.package}";
+          root = enteApp;
         };
       };
     };
diff --git a/modules/nixos/services/searxng/default.nix b/modules/nixos/services/searxng/default.nix
index cc71ea3..5ad29fc 100644
--- a/modules/nixos/services/searxng/default.nix
+++ b/modules/nixos/services/searxng/default.nix
@@ -36,7 +36,6 @@ in
         default = "reddit.stahl.sh";
       };
     };
-
   };
 
   config = mkIf cfg.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 ];
       };
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
   '';
 
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,
   ...