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

Fixup typos and remove cruft

Browse Source
This commit is contained in:
Greg Hellings
2023-12-13 15:19:42 -06:00
parent 9981262308
commit d9b8ec9f1e
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hosts/genesis/networking.nix
+3 -5
View File
@@ -17,6 +17,7 @@ let
"10.42.1.12 tv" "10.42.1.12 tv"
"10.42.100.6 isaiahbmc isaiahbmc.thehellings.lan" "10.42.100.6 isaiahbmc isaiahbmc.thehellings.lan"
# Tailscale hosts # Tailscale hosts
"100.90.74.19 jude.home" "100.90.74.19 jude.home"
"100.88.91.27 dns.home" "100.88.91.27 dns.home"
@@ -24,15 +25,12 @@ let
"100.115.57.8 linode.home" "100.115.57.8 linode.home"
"100.88.91.27 genesis.home jellyfin.home smart.home zwave.home" "100.88.91.27 genesis.home jellyfin.home smart.home zwave.home"
"100.78.16.88 mm.home" "100.78.16.88 mm.home"
"100..84.183.79 myself.home myself.shire-zebra.ts.net" "100.84.183.79 myself.home myself.shire-zebra.ts.net git.thehellings.lan"
# 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"
]; ];
extraConfig = builtins.concatStringsSep "\n" [
];
adblockUpdate = pkgs.writeShellScriptBin "adblockUpdate" (builtins.readFile ./adblockUpdate.sh); adblockUpdate = pkgs.writeShellScriptBin "adblockUpdate" (builtins.readFile ./adblockUpdate.sh);
proxyPort = 3128; proxyPort = 3128;
dnsPort = 53; dnsPort = 53;
@@ -190,7 +188,6 @@ in {
hostsdir = "/etc/hosts.d/"; hostsdir = "/etc/hosts.d/";
server = dnsServers; server = dnsServers;
}; };
extraConfig = "${extraConfig}";
}; };
# Update adblock list # Update adblock list
@@ -212,6 +209,7 @@ in {
#}; #};
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
bind
curl # Used by dnsmasq fetching curl # Used by dnsmasq fetching
sqlite sqlite
]; ];