greg/nixos
1
0
Fork 2
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

Update networking

Browse Source
This commit is contained in:
Greg Hellings
2023-12-07 11:45:13 -06:00
parent 19dd85e89e
commit d740880c5f
2 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hosts/genesis/networking.nix
+16 -10
View File
@@ -7,21 +7,23 @@ let
routerIP = "10.42.1.2"; routerIP = "10.42.1.2";
extraHosts = builtins.concatStringsSep "\n" [ extraHosts = builtins.concatStringsSep "\n" [
# Local hosts # Local hosts
"10.42.0.1 switch" "10.42.0.1 switch switch.thehellings.lan"
"10.42.1.1 pve1.thehellings.lan" "10.42.1.1 pve1.thehellings.lan"
"10.42.1.2 opnsense router opnsense.thehellings.lan router.thehellings.lan" "10.42.1.2 opnsense router opnsense.thehellings.lan router.thehellings.lan"
"10.42.1.3 printer" "10.42.1.3 printer.thehellings.lan"
"10.42.1.4 chronicles nas" "10.42.1.4 chronicles chronicles.thehellings.lan nas.thehellings.lan"
"10.42.1.5 genesis genesis.thehellings.lan dns dns.thehellings.lan smart smart.thehellings.lan jellyfin jellyfin.thehellings.lan" "10.42.1.5 genesis genesis.thehellings.lan dns dns.thehellings.lan smart smart.thehellings.lan jellyfin jellyfin.thehellings.lan"
"10.42.1.6 isaiah isaiah.thehellings.lan"
"10.42.1.12 tv" "10.42.1.12 tv"
"10.42.100.6 isaiahbmc isaiahbmc.thehellings.lan"
# Tailscale hosts # Tailscale hosts
"100.90.74.19 jude.shire-zebra.ts.net" "100.90.74.19 jude.home"
"100.88.91.27 dns.shire-zebra.ts.net" "100.88.91.27 dns.home"
"100.119.228.115 chronicles.shire-zebra.ts.net" "100.119.228.115 chronicles.home nas.home"
"100.115.57.8 linode.shire-zebra.ts.net" "100.115.57.8 linode.home"
"100.88.91.27 genesis.shire-zebra.ts.net jellyfin.home smart.home zwave.home" "100.88.91.27 genesis.home jellyfin.home smart.home zwave.home"
"100.78.16.88 mm.shire-zebra.ts.net" "100.78.16.88 mm.home"
# Dev hosts # Dev hosts
"10.42.101.1 icdm.lan wiki.icdm.lan *.icdm.lan" "10.42.101.1 icdm.lan wiki.icdm.lan *.icdm.lan"
@@ -87,9 +89,9 @@ in {
]; ];
}; };
nftables.enable = true; nftables.enable = true;
extraHosts = "${extraHosts}";
}; };
environment.etc."hosts.d/local".text = extraHosts;
fileSystems."/media" = { fileSystems."/media" = {
device = "10.42.1.4:/volume1/video/"; device = "10.42.1.4:/volume1/video/";
@@ -148,6 +150,7 @@ in {
dhcp-host = [ dhcp-host = [
# Static IPs for personal work # Static IPs for personal work
"00:00:de:ad:be:ef,10.42.2.254" "00:00:de:ad:be:ef,10.42.2.254"
"01:a8:a1:59:c7:8a:12,10.42.2.253" # BMC management interface for isaiah
# Static IPs for things in the IOT range # Static IPs for things in the IOT range
"b4:b0:24:9a:02:4a,192.168.66.5" # LD125 "b4:b0:24:9a:02:4a,192.168.66.5" # LD125
@@ -181,7 +184,9 @@ in {
expand-hosts = true; expand-hosts = true;
log-dhcp = true; log-dhcp = true;
log-queries = true; log-queries = true;
no-hosts = true; # Do not read /etc/hosts, which makes genesis resolve to 127.0.0.2
addn-hosts = "/etc/adblock_hosts"; addn-hosts = "/etc/adblock_hosts";
hostsdir = "/etc/hosts.d/";
server = dnsServers; server = dnsServers;
}; };
extraConfig = "${extraConfig}"; extraConfig = "${extraConfig}";
@@ -207,5 +212,6 @@ in {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
curl # Used by dnsmasq fetching curl # Used by dnsmasq fetching
sqlite
]; ];
} }
modules-linux/default.nix
+1 -1
View File
@@ -30,7 +30,7 @@
networking = { networking = {
search = [ search = [
"thehellings.lan" "thehellings.lan"
"shire-zebra.ts.net" "home"
]; ];
networkmanager.enable = true; networkmanager.enable = true;
}; };