colin/nix-files
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

wg-home: dont force each host to define its IP address twice

Browse Source
This commit is contained in:
Colin
2025-06-01 20:07:53 +00:00
parent db9b5dcfeb
commit ef4373f704
6 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
hosts/by-name/desko/default.nix
View File

@@ -1,4 +1,4 @@
{ config, pkgs, ... }:
{ pkgs, ... }:
{
imports = [
./fs.nix
@@ -25,7 +25,6 @@
sane.roles.work = true;
sane.services.ollama.enable = true;
sane.services.wg-home.enable = true;
sane.services.wg-home.ip = config.sane.hosts.by-name."desko".wg-home.ip;
sane.ovpn.addrV4 = "172.26.55.21";
# sane.ovpn.addrV6 = "fd00:0000:1337:cafe:1111:1111:20c1:a73c";
sane.services.rsync-net.enable = true;

3
hosts/by-name/lappy/default.nix
View File

@@ -1,4 +1,4 @@
{ config, lib, pkgs, ... }:
{ lib, pkgs, ... }:
{
imports = [
./fs.nix
@@ -7,7 +7,6 @@
sane.roles.client = true;
sane.roles.pc = true;
sane.services.wg-home.enable = true;
sane.services.wg-home.ip = config.sane.hosts.by-name."lappy".wg-home.ip;
sane.ovpn.addrV4 = "172.23.119.72";
# sane.ovpn.addrV6 = "fd00:0000:1337:cafe:1111:1111:0332:aa96/128";

3
hosts/by-name/moby/default.nix
View File

@@ -6,7 +6,7 @@
# - Mobian wiki: <https://wiki.mobian-project.org/doku.php?id=start>
# - recommended apps, chatrooms
{ config, ... }:
{ ... }:
{
imports = [
./fs.nix
@@ -16,7 +16,6 @@
sane.roles.client = true;
sane.roles.handheld = true;
sane.services.wg-home.enable = true;
sane.services.wg-home.ip = config.sane.hosts.by-name."moby".wg-home.ip;
sane.ovpn.addrV4 = "172.24.87.255";
# sane.ovpn.addrV6 = "fd00:0000:1337:cafe:1111:1111:18cd:a72b";

2
hosts/by-name/servo/default.nix
View File

@@ -1,4 +1,4 @@
{ config, pkgs, ... }:
{ pkgs, ... }:
{
imports = [

1
hosts/by-name/servo/net/wg-home.nix
View File

@@ -4,7 +4,6 @@
sane.services.wg-home.visibleToWan = true;
sane.services.wg-home.forwardToWan = true;
sane.services.wg-home.routeThroughServo = false;
sane.services.wg-home.ip = config.sane.hosts.by-name."servo".wg-home.ip;
services.unbound.settings.server.interface = [
# provide DNS to my wireguard clients
config.sane.hosts.by-name."servo".wg-home.ip

1
hosts/modules/wg-home.nix
View File

@@ -33,6 +33,7 @@ in
};
sane.services.wg-home.ip = mkOption {
type = types.str;
default = config.sane.hosts.by-name."${config.networking.hostName}".wg-home.ip;
};
};