aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--machines/darwin/aarch64-darwin/mba-m2.nix2
-rw-r--r--machines/nixos/x86_64-linux/rivendell.nix15
-rw-r--r--profiles/tailscale.nix9
-rw-r--r--secrets/rivendell/ts.age7
-rw-r--r--secrets/secrets.nix5
5 files changed, 0 insertions, 38 deletions
diff --git a/machines/darwin/aarch64-darwin/mba-m2.nix b/machines/darwin/aarch64-darwin/mba-m2.nix
index f083afa..046e0ff 100644
--- a/machines/darwin/aarch64-darwin/mba-m2.nix
+++ b/machines/darwin/aarch64-darwin/mba-m2.nix
@@ -19,8 +19,6 @@
networking.hostName = "mba-m2";
- services.tailscale.enable = true;
-
users = {
users.${adminUser.name} = {
home = "/Users/${adminUser.name}";
diff --git a/machines/nixos/x86_64-linux/rivendell.nix b/machines/nixos/x86_64-linux/rivendell.nix
index 90fbce3..73e3002 100644
--- a/machines/nixos/x86_64-linux/rivendell.nix
+++ b/machines/nixos/x86_64-linux/rivendell.nix
@@ -15,7 +15,6 @@
../../../profiles/keycloak.nix
../../../profiles/remote-unlock.nix
../../../profiles/server.nix
- ../../../profiles/tailscale.nix
];
age = {
@@ -23,9 +22,6 @@
wireguard = {
file = ../../../secrets/rivendell/wireguard.age;
};
- ts = {
- file = ../../../secrets/rivendell/ts.age;
- };
};
};
@@ -68,17 +64,6 @@
networking.firewall.allowedUDPPorts = [ 51871 ];
- services.tailscale = {
- useRoutingFeatures = "both";
- authKeyFile = config.age.secrets.ts.path;
- extraSetFlags = [
- "--accept-dns=true"
- "--accept-routes=true"
- "--advertise-exit-node=true"
- "--ssh"
- ];
- };
-
home-manager = {
users.${adminUser.name} = {
imports = [
diff --git a/profiles/tailscale.nix b/profiles/tailscale.nix
deleted file mode 100644
index 87b1f47..0000000
--- a/profiles/tailscale.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ ... }:
-{
- services.tailscale = {
- enable = true;
- interfaceName = "tailscale0";
- };
- networking.firewall.trustedInterfaces = [ "tailscale0" ];
- networking.firewall.checkReversePath = "loose";
-}
diff --git a/secrets/rivendell/ts.age b/secrets/rivendell/ts.age
deleted file mode 100644
index 1395c6f..0000000
--- a/secrets/rivendell/ts.age
+++ /dev/null
@@ -1,7 +0,0 @@
-age-encryption.org/v1
--> ssh-ed25519 pFjJaA PGPTpGAwtNlmeqiL8x+D+XiDLjzFIguuPt3WAu7r+CU
-BWophs8BWgdYkP4oYatp2sO3kic/BeVLizfsbgPKbRM
--> ssh-ed25519 Y5h84Q pGQSWR798tJtUvAIIQsW0OrCANtlB6dZWUrLHD4YiTs
-lrLz8PewUz0ASgPfsCwBO2N++k7yqWn0ZgSoShIFIjg
---- PmLlCjtBfGMs+Ry8+H4ye5y32VuJXQvMAUiPKRamnis
-_dԴVMcP,j[(/|s{ȕ9oXś/ւ vy>EFaEpǧRfB6nv \ No newline at end of file
diff --git a/secrets/secrets.nix b/secrets/secrets.nix
index ce1ab49..658da54 100644
--- a/secrets/secrets.nix
+++ b/secrets/secrets.nix
@@ -59,9 +59,4 @@ in
users.fcuny
hosts.rivendell
];
-
- "rivendell/ts.age".publicKeys = [
- users.fcuny
- hosts.rivendell
- ];
}