diff --git a/modules/home/cli-apps/fish/default.nix b/modules/home/cli-apps/fish/default.nix
index 2ef905b..c91e43d 100644
--- a/modules/home/cli-apps/fish/default.nix
+++ b/modules/home/cli-apps/fish/default.nix
@@ -9,7 +9,6 @@ let
   inherit (lib) mkEnableOption mkIf;
 
   cfg = config.${namespace}.cli-apps.fish;
-  flakeRoot = "/home/philipp/Documents/nix-config";
 in
 {
   options.${namespace}.cli-apps.fish = {
@@ -20,11 +19,11 @@ in
     programs.fish = {
       enable = true;
       shellAliases = {
-        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";
+        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";
         cd = "z";
-        ls = "exa --icons";
-        l = "exa";
+        ls = "exa";
+        l = "exa --icons";
       };
       plugins = [
         {
diff --git a/modules/nixos/cli/nh/default.nix b/modules/nixos/cli/nh/default.nix
index 9d1d099..fac140f 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.flakeRoot}";
+      flake = "${config.home-manager.users.philipp.home.homeDirectory}/Documents/nix-config";
     };
   };
 
diff --git a/modules/nixos/services/ente-auth/default.nix b/modules/nixos/services/ente-auth/default.nix
index d457223..10dc6ec 100644
--- a/modules/nixos/services/ente-auth/default.nix
+++ b/modules/nixos/services/ente-auth/default.nix
@@ -9,13 +9,6 @@ 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 = {
@@ -56,7 +49,7 @@ in
         forceSSL = true;
         useACMEHost = "stahl.sh";
         locations."/" = {
-          root = enteApp;
+          root = "${cfg.package}";
         };
       };
     };
diff --git a/modules/nixos/services/searxng/default.nix b/modules/nixos/services/searxng/default.nix
index 5ad29fc..cc71ea3 100644
--- a/modules/nixos/services/searxng/default.nix
+++ b/modules/nixos/services/searxng/default.nix
@@ -36,6 +36,7 @@ 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
deleted file mode 100644
index 671f6bd..0000000
--- a/modules/nixos/system/flakeRoot/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  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 5966102..71e013e 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"
-          "${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"
+          "/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"
         ];
         environmentFiles = [ /run/secrets/invidious-db ];
       };
diff --git a/packages/ente-web-auth/default.nix b/packages/ente-web-auth/default.nix
index 6108b43..cd3451d 100644
--- a/packages/ente-web-auth/default.nix
+++ b/packages/ente-web-auth/default.nix
@@ -39,6 +39,7 @@ 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 46cf364..b53c7e8 100644
--- a/systems/x86_64-linux/dns/default.nix
+++ b/systems/x86_64-linux/dns/default.nix
@@ -1,6 +1,5 @@
 {
   lib,
-  pkgs,
   modulesPath,
   namespace,
   ...