headscale works

flake.nix

@@ -49,7 +49,7 @@
     # nix run github:serokell/deploy-rs
     deploy.nodes = {
       vps = {
-        hostname = "10.0.0.3";
+        hostname = "vps.vpn";
         sshUser = "root";
         magicRollbackTimeout = 120;
         profiles.system = {
@@ -60,7 +60,7 @@
       };
 
       desktop = {
-        hostname = "10.0.0.2";
+        hostname = "desktop.vpn";
         sshUser = "root";
         magicRollbackTimeout = 120;
         profiles.system = {

hosts/desktop/default.nix

@@ -7,6 +7,7 @@
 	../../modules/network.nix
 	../../modules/ssh.nix
 	../../modules/wireguard.nix
+	../../modules/headscale.nix
 	../../modules/tailscale.nix
 
 	../../modules/site.nix

hosts/vps/default.nix

@@ -7,7 +7,7 @@
     ../../modules/network.nix
     ../../modules/ssh.nix
     ../../modules/wireguard.nix
-	../../modules/headscale.nix
+	../../modules/tailscale.nix
 
     ../../modules/http-forwarding.nix
   ];

modules/headscale.nix

@@ -1,11 +1,17 @@
 { config, lib, pkgs, ... }:
 
 {
+systemd.services.headscale.environment = {
+  GODEBUG = "netdns=go";
+};
+networking.enableIPv6 = false;
+  environment.etc."headscale/derp.yaml".source = ./derp.yaml;
   services.headscale = {
+
     enable = true;
 	settings = {
       server_url = "https://vpn.grasswren.net";
-	  listen_addr = "127.0.0.1:8080";
+	  listen_addr = "0.0.0.0:8080";
 
 	  database.type = "sqlite";
 
@@ -15,8 +21,9 @@
       ];
 
 	  dns = {
-	    magic_domain = true;
+	    magic_dns = true;
-	    base_domain = "vpn.grasswren.net";
+	    base_domain = "vpn";
+		nameservers.global = [ "1.1.1.1" ];
 	  };
 	};
   };

modules/ripping.nix

@@ -10,8 +10,8 @@
     enable = true;
 
     settings = {
-      directory = "/var/lib/media/music";
+      directory = "/var/lib/music";
-      library = "/var/lib/media/music/library.db";
+      library = "/var/lib/music/library.db";
 
       plugins = [
 	    "musicbrainz"

modules/ssh.nix

@@ -6,7 +6,7 @@ in
 {
   networking.firewall = {
     enable = true;
-	interfaces.wg0.allowedTCPPorts = [ 22 ];
+	allowedTCPPorts = [ 22 ];
   };
   services.openssh = {
     enable = true;
@@ -16,7 +16,7 @@ in
 	  KbdInteractiveAuthentication = false;
 	};
 	listenAddresses = [{
-      addr = me.address-vpn;
+      addr = "0.0.0.0";
 	  port = 22;
 	}];
   };