diff --git a/common/network/vpn.nix b/common/network/vpn.nix
index 81e7f5a..b854deb 100644
--- a/common/network/vpn.nix
+++ b/common/network/vpn.nix
@@ -72,9 +72,6 @@ in
       config = {
         imports = allModules ++ [ cfg.config ];
 
-        # speeds up evaluation
-        nixpkgs.pkgs = pkgs;
-
         # networking.firewall.enable = mkForce false;
         networking.firewall.trustedInterfaces = [
           # completely trust internal interface to host
diff --git a/common/server/gitea.nix b/common/server/gitea.nix
index 2c741a0..6188d90 100644
--- a/common/server/gitea.nix
+++ b/common/server/gitea.nix
@@ -12,12 +12,14 @@ in
   };
   config = lib.mkIf cfg.enable {
     services.gitea = {
-      domain = cfg.hostname;
-      rootUrl = "https://${cfg.hostname}/";
       appName = cfg.hostname;
       # lfs.enable = true;
       # dump.enable = true;
       settings = {
+        server = {
+          ROOT_URL = "https://${cfg.hostname}/";
+          DOMAIN = cfg.hostname;
+        };
         other = {
           SHOW_FOOTER_VERSION = false;
         };