nixos-26.05 #7

Open
felixalb wants to merge 8 commits from nixos-26.05 into main
6 changed files with 27 additions and 16 deletions
Showing only changes of commit f474909415 - Show all commits
+5 -1
View File
@@ -3,7 +3,11 @@
# Boot drives are defined in ./hardware-configuration.nix
boot = {
zfs.extraPools = [ "tank" ];
zfs = {
extraPools = [ "tank" ];
forceImportRoot = false;
};
supportedFilesystems = [ "zfs" ];
};
services.prometheus.exporters.zfs.enable = true;
+1
View File
@@ -11,6 +11,7 @@
fileSystems."/var/lib/libvirt/images" = {
device = "/tank/iso";
options = [ "bind" ];
fsType = "auto";
};
# On a gui-enabled machine, connect with:
@@ -9,11 +9,16 @@ in {
# TODO: Migrate sqlite to postgres
settings.server = {
settings = {
server = {
domain = "grafana.home.feal.no";
http_port = 2342;
http_addr = "127.0.0.1";
};
security = {
secret_key = "SW2YcwTIb9zpOOhoPsMm"; # TODO - Rotate
};
};
provision = {
enable = true;
@@ -1,12 +1,13 @@
{ config, pkgs, ... }:
{
services.prometheus.exporters.snmp = {
enable = true;
configurationPath = ./snmp-exporter-conf.yml;
# snmp.yml is built from
# https://github.com/prometheus/snmp_exporter/blob/main/snmp.yml
# and
# https://global.download.synology.com/download/Document/Software/DeveloperGuide/Firmware/DSM/All/enu/Synology_DiskStation_MIB_Guide.pdf
};
# TODO - Fix. Broken in 26.05
# services.prometheus.exporters.snmp = {
# enable = true;
# configurationPath = ./snmp-exporter-conf.yml;
# # snmp.yml is built from
# # https://github.com/prometheus/snmp_exporter/blob/main/snmp.yml
# # and
# # https://global.download.synology.com/download/Document/Software/DeveloperGuide/Firmware/DSM/All/enu/Synology_DiskStation_MIB_Guide.pdf
# };
}
+1 -1
View File
@@ -4,7 +4,7 @@ let
dnsHost = "192.168.10.175";
webuiListen = "127.0.1.2:5053";
in {
# Flame - Homelab dashboard/linktree
# Pihole - Ad-blocking DNS recursor and authoritative DNS/DHCP
virtualisation.oci-containers.containers = {
pihole = {
image = "pihole/pihole";
+2 -2
View File
@@ -16,10 +16,10 @@ in {
privateKeyFile = "/etc/wireguard/defiant.private";
postSetup = ''
${pkgs.iptables}/bin/iptables -t nat -A POSTROUTING -s 10.100.0.0/24 -d 192.168.10.0/24 -o eth0 -j MASQUERADE
${pkgs.iptables}/bin/iptables -t nat -A POSTROUTING -s 10.100.0.0/24 -d 192.168.10.0/24 -o enp3s0 -j MASQUERADE
'';
postShutdown = ''
${pkgs.iptables}/bin/iptables -t nat -D POSTROUTING -s 10.100.0.0/24 -d 192.168.10.0/24 -o eth0 -j MASQUERADE
${pkgs.iptables}/bin/iptables -t nat -D POSTROUTING -s 10.100.0.0/24 -d 192.168.10.0/24 -o enp3s0 -j MASQUERADE
'';
peers = (import ../../../common/wireguard-peers.nix);