3 files changed, 26 insertions, 21 deletions
diff --git a/chaski/services/bahnhof-name.nix b/chaski/services/bahnhof-name.nix
index 7360372..69d54cc 100644
--- a/chaski/services/bahnhof-name.nix
+++ b/chaski/services/bahnhof-name.nix
@@ -19,8 +19,13 @@
       enableACME = true;
       forceSSL = true;
       locations."/".proxyPass = "http://localhost:8080";
+      extraConfig = ''
+        proxy_set_header X-Forwarded-Host $host;
+      '';
     }; in builtins.listToAttrs
     (map (name: { inherit name; value = vhost; })
       ["bahnhof.name" "ril100.bahnhof.name"
-       "ds100.bahnhof.name" "leitpunkt.bahnhof.name"]);
+       "ds100.bahnhof.name" "leitpunkt.bahnhof.name"
+       "rnv.bahnhof.name"
+      ]);
 }
diff --git a/chaski/services/chat.nix b/chaski/services/chat.nix
index 6d26ada..484a3b9 100644
--- a/chaski/services/chat.nix
+++ b/chaski/services/chat.nix
@@ -4,7 +4,7 @@
 # (and not deal with having an irc relay)
 {
 
-  imports = [ inputs.home-manager.nixosModule ];
+  imports = [ inputs.home-manager.nixosModules.default ];
 
   programs.mosh.enable = true;
   programs.fish.enable = true;
diff --git a/chaski/services/headscale.nix b/chaski/services/headscale.nix
index 8240d93..80153e4 100644
--- a/chaski/services/headscale.nix
+++ b/chaski/services/headscale.nix
@@ -1,27 +1,27 @@
 { config, lib, pkgs, ... }:
 
 {
-  services.headscale = {
-    enable = true;
-    settings = {
-      server_url = "https://headscale.noms.ing";
-      listen_addr = "127.0.0.1:8323";
+  # services.headscale = {
+  #   enable = true;
+  #   settings = {
+  #     server_url = "https://headscale.noms.ing";
+  #     listen_addr = "127.0.0.1:8323";
 
-      # oidc = {
-      #   only_start_if_oidc_is_available = true;
-      #   issuer = "https://idm.cuties.network/oauth2/openid/headscale";
-      #   client_id = "headscale";
-      #   client_secret_path = "/run/secrets/headscale_oidc_secret";
-      #   strip_email_domain = true;
-      # };
+  #     # oidc = {
+  #     #   only_start_if_oidc_is_available = true;
+  #     #   issuer = "https://idm.cuties.network/oauth2/openid/headscale";
+  #     #   client_id = "headscale";
+  #     #   client_secret_path = "/run/secrets/headscale_oidc_secret";
+  #     #   strip_email_domain = true;
+  #     # };
 
-      dns_config.magic_dns = true;
-      dns_config.domains = [ "nodes.headscale.noms.ing" ];
-      # dns_config.base_domain = "ts.cuties.network";
-    };
-  };
+  #     # dns_config.magic_dns = true;
+  #     # dns_config.domains = [ "nodes.headscale.noms.ing" ];
+  #     # dns_config.base_domain = "ts.cuties.network";
+  #   };
+  # };
 
-  users.users.headscale.extraGroups = [ config.users.groups.keys.name ];
+  # users.users.headscale.extraGroups = [ config.users.groups.keys.name ];
   # sops.secrets.headscale_oidc_secret = {
   #   owner = config.users.users.headscale.name;
   #   sopsFile = ./headscale.sops.yaml;
@@ -36,5 +36,5 @@
     };
   };
 
-  services.tailscale.enable = true;
+  # services.tailscale.enable = true;
 }