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

Decompose some Genesis options

Browse Source
This commit is contained in:
Greg Hellings
2024-04-20 01:15:18 -05:00
parent 025dbaf8af
commit 071af09085
2 changed files with 31 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hosts/genesis/net/hosts
+29
View File
@@ -0,0 +1,29 @@
# Local hosts
10.42.0.1 switch switch.thehellings.lan # Core switch for the network
10.42.0.4 joel.thehellings.lan # Proxmox
10.42.0.5 sanswitch.thehellings.lan # Core switch for the SAN
# Home servers
10.42.1.1 pve1.thehellings.lan
10.42.1.2 opnsense router opnsense.thehellings.lan router.thehellings.lan
10.42.1.3 printer.thehellings.lan
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 speedtest.thehellings.lan nixcache.thehellings.lan gitcache.thehellings.lan s3.thehellings.lan
10.42.1.6 isaiah isaiah.thehellings.lan
10.42.1.7 hosea hosea.thehellings.lan
10.42.1.12 tv
10.42.100.6 isaiahbmc isaiahbmc.thehellings.lan
# Tailscale hosts
100.90.74.19 jude.home
100.88.91.27 dns.home
100.119.228.115 chronicles.home nas.home chronicles.shire-zebra.ts.net
100.115.57.8 linode.home
100.88.91.27 genesis.home jellyfin.home smart.home zwave.home nixcache.home gitcache.home
100.84.183.79 myself.home myself.shire-zebra.ts.net
100.78.226.76 gitlab.home gitlab.shire-zebra.ts.net gitlab.thehellings.lan registry.thehellings.lan git.thehellings.lan
100.68.203.1 hosea.home hosea.shire-zebra.ts.net
# Dev hosts
10.42.101.1 icdm.lan wiki.icdm.lan *.icdm.lan
hosts/genesis/networking.nix
+2 -27
View File
@@ -5,33 +5,7 @@ let
iot = "ens19"; iot = "ens19";
iotIP = "192.168.66.250"; iotIP = "192.168.66.250";
routerIP = "10.42.1.2"; routerIP = "10.42.1.2";
extraHosts = builtins.concatStringsSep "\n" [ extraHosts = builtins.readFile ./net/hosts;
# Local hosts
"10.42.0.1 switch switch.thehellings.lan"
"10.42.1.1 pve1.thehellings.lan"
"10.42.1.2 opnsense router opnsense.thehellings.lan router.thehellings.lan"
"10.42.1.3 printer.thehellings.lan"
"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 speedtest.thehellings.lan nixcache.thehellings.lan gitcache.thehellings.lan s3.thehellings.lan"
"10.42.1.6 isaiah isaiah.thehellings.lan"
"10.42.1.7 hosea hosea.thehellings.lan"
"10.42.1.12 tv"
"10.42.100.6 isaiahbmc isaiahbmc.thehellings.lan"
# Tailscale hosts
"100.90.74.19 jude.home"
"100.88.91.27 dns.home"
"100.119.228.115 chronicles.home nas.home chronicles.shire-zebra.ts.net"
"100.115.57.8 linode.home"
"100.88.91.27 genesis.home jellyfin.home smart.home zwave.home nixcache.home gitcache.home"
"100.84.183.79 myself.home myself.shire-zebra.ts.net"
"100.78.226.76 gitlab.home gitlab.shire-zebra.ts.net gitlab.thehellings.lan registry.thehellings.lan git.thehellings.lan"
"100.68.203.1 hosea.home hosea.shire-zebra.ts.net"
# Dev hosts
"10.42.101.1 icdm.lan wiki.icdm.lan *.icdm.lan"
];
adblockUpdate = pkgs.writeShellScriptBin "adblockUpdate" (builtins.readFile ./adblockUpdate.sh); adblockUpdate = pkgs.writeShellScriptBin "adblockUpdate" (builtins.readFile ./adblockUpdate.sh);
proxyPort = 3128; proxyPort = 3128;
@@ -161,6 +135,7 @@ in {
]; ];
dhcp-host = [ dhcp-host = [
# Static IPs for personal work # Static IPs for personal work
"2a:5d:23:10:4e:22,10.42.0.5" # SAN Switch
"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 "01:a8:a1:59:c7:8a:12,10.42.2.253" # BMC management interface for isaiah