Toast/nix-stuff
1
0
Fork 0
Code Issues Pull requests Projects 1 Wiki Activity

Compare commits

base: Toast:7ad95300406d3016f510ab7a8e5674b1ee4564a7
Branches Tags
Toast:main
Toast:plasma-refactor
Toast:headscale
Toast:plasma6
Toast:catppuccin
Toast:kde-stuff
Toast:firefox
Toast:upgrade-to-23.05
..
compare: Toast:32b291be200ad9ecc6e9e89fa04f149f5f44c7f7
Branches Tags
Toast:main
Toast:plasma-refactor
Toast:headscale
Toast:plasma6
Toast:catppuccin
Toast:kde-stuff
Toast:firefox
Toast:upgrade-to-23.05

No commits in common. "7ad95300406d3016f510ab7a8e5674b1ee4564a7" and "32b291be200ad9ecc6e9e89fa04f149f5f44c7f7" have entirely different histories.
7ad9530040 ... 32b291be20

8 changed files with 9 additions and 1768 deletions
Download patch file Download diff file Expand all files Collapse all files

4
flake.nix
View file

@ -111,9 +111,7 @@
nixpkgs-patched = nixpkgs-raw.legacyPackages.x86_64-linux.applyPatches { nixpkgs-patched = nixpkgs-raw.legacyPackages.x86_64-linux.applyPatches {
name = "patched-nixpkgs"; name = "patched-nixpkgs";
src = nixpkgs-raw; src = nixpkgs-raw;
patches = [ patches = [];
./nixpkgs-patches/backport_unstable_headscale_changes.patch
];
}; };
# https://discourse.nixos.org/t/proper-way-of-applying-patch-to-system-managed-via-flake/21073/26 # https://discourse.nixos.org/t/proper-way-of-applying-patch-to-system-managed-via-flake/21073/26
nixpkgs-unstable = (import "${nixpkgs-unstable-patched}/flake.nix").outputs {self = inputs.self;}; nixpkgs-unstable = (import "${nixpkgs-unstable-patched}/flake.nix").outputs {self = inputs.self;};

1757
nixpkgs-patches/backport_unstable_headscale_changes.patch
View file

File diff suppressed because it is too large Load diff

4
roles/server/adguard.nix
View file

@ -18,8 +18,8 @@ in {
}; };
}; };
headscale.settings.dns= { headscale.settings.dns_config = {
nameservers.global = lib.mkForce ["100.100.0.1"]; nameservers = lib.mkForce ["100.100.0.1"];
extra_records = [ extra_records = [
{ {
name = domain; name = domain;

2
roles/server/caddy.nix
View file

@ -47,7 +47,7 @@ in {
}; };
}; };
}; };
services.headscale.settings.dns.extra_records = let services.headscale.settings.dns_config.extra_records = let
makeRecords = builtins.map (recordName: { makeRecords = builtins.map (recordName: {
name = recordName; name = recordName;
type = "A"; type = "A";

2
roles/server/forgejo.nix
View file

@ -45,7 +45,7 @@ in {
}; };
# Add a record for forgejo # Add a record for forgejo
services.headscale.settings.dns.extra_records = [ services.headscale.settings.dns_config.extra_records = [
{ {
name = "git.everest.tailscale"; name = "git.everest.tailscale";
type = "A"; type = "A";

4
roles/server/headscale.nix
View file

@ -6,9 +6,9 @@
ip_prefixes = [ ip_prefixes = [
"100.100.0.0/16" "100.100.0.0/16"
]; ];
dns = { dns_config = {
base_domain = "tailscale"; base_domain = "tailscale";
nameservers.global = ["9.9.9.9"]; nameservers = ["9.9.9.9"];
override_local_dns = true; override_local_dns = true;
}; };
}; };

2
roles/server/syncthing.nix
View file

@ -40,7 +40,7 @@
}; };
# Add a record for syncthing # Add a record for syncthing
services.headscale.settings.dns.extra_records = [ services.headscale.settings.dns_config.extra_records = [
{ {
name = "sync.everest.tailscale"; name = "sync.everest.tailscale";
type = "A"; type = "A";

2
roles/server/transmission.nix
View file

@ -38,7 +38,7 @@ in {
}; };
# Add a record for transmission # Add a record for transmission
services.headscale.settings.dns.extra_records = [ services.headscale.settings.dns_config.extra_records = [
{ {
name = "transmission.everest.tailscale"; name = "transmission.everest.tailscale";
type = "A"; type = "A";