Skip to content

Commit ec7a41d

Browse files
committed
nix: user space tailscale
1 parent 17c7a44 commit ec7a41d

File tree

2 files changed

+25
-1
lines changed

2 files changed

+25
-1
lines changed

nix/home.nix

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -945,6 +945,28 @@ in
945945
# }
946946
# )
947947

948+
(
949+
let name = "tailscaled";
950+
in
951+
lib.optionalAttrs prefs.enableHomeManagerTailScale {
952+
services.${name} = {
953+
Unit = {
954+
Description = "user space tailscale daemon";
955+
After = [ "network.target" ];
956+
};
957+
Install = { WantedBy = [ "default.target" ]; };
958+
Service = {
959+
RuntimeDirectory = name;
960+
StateDirectory = name;
961+
NoNewPrivileges = true;
962+
ExecStart = ''
963+
${pkgs.tailscale}/bin/tailscaled --statedir=''${STATE_DIRECTORY} --socket=''${RUNTIME_DIRECTORY}/${name}.sock --port=0 --tun=userspace-networking --verbose 5
964+
'';
965+
};
966+
};
967+
}
968+
)
969+
948970
(
949971
let name = "foot";
950972
in
@@ -964,7 +986,7 @@ in
964986

965987
home = {
966988
extraOutputsToInstall = prefs.extraOutputsToInstall;
967-
packages = allPackages;
989+
packages = allPackages ++ (lib.optionals prefs.enableHomeManagerTailScale [ pkgs.tailscale ]);
968990
stateVersion = prefs.homeManagerStateVersion;
969991
};
970992

nix/prefs.nix

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -291,6 +291,7 @@ let
291291
enableAioproxy = !self.isMinimalSystem;
292292
aioproxyPort = 4443;
293293
enableTailScale = !self.isMinimalSystem;
294+
enableHomeManagerTailScale = false;
294295
enableNetbird = !self.isMinimalSystem;
295296
enableX2goServer = false;
296297
enableDebugInfo = false;
@@ -1025,6 +1026,7 @@ let
10251026
} else if hostname == "zklab-5" then {
10261027
home = "/home/contrun";
10271028
isMinimalSystem = false;
1029+
enableHomeManagerTailScale = true;
10281030
} else if hostname == "aol" then {
10291031
isMinimalSystem = false;
10301032
hostId = "85d4bfd4";

0 commit comments

Comments
 (0)