defiant: update to nixos 26.05
This commit is contained in:
@@ -3,7 +3,11 @@
|
|||||||
# Boot drives are defined in ./hardware-configuration.nix
|
# Boot drives are defined in ./hardware-configuration.nix
|
||||||
|
|
||||||
boot = {
|
boot = {
|
||||||
zfs.extraPools = [ "tank" ];
|
zfs = {
|
||||||
|
extraPools = [ "tank" ];
|
||||||
|
forceImportRoot = false;
|
||||||
|
};
|
||||||
|
|
||||||
supportedFilesystems = [ "zfs" ];
|
supportedFilesystems = [ "zfs" ];
|
||||||
};
|
};
|
||||||
services.prometheus.exporters.zfs.enable = true;
|
services.prometheus.exporters.zfs.enable = true;
|
||||||
|
|||||||
@@ -11,6 +11,7 @@
|
|||||||
fileSystems."/var/lib/libvirt/images" = {
|
fileSystems."/var/lib/libvirt/images" = {
|
||||||
device = "/tank/iso";
|
device = "/tank/iso";
|
||||||
options = [ "bind" ];
|
options = [ "bind" ];
|
||||||
|
fsType = "auto";
|
||||||
};
|
};
|
||||||
|
|
||||||
# On a gui-enabled machine, connect with:
|
# On a gui-enabled machine, connect with:
|
||||||
|
|||||||
@@ -9,10 +9,15 @@ in {
|
|||||||
|
|
||||||
# TODO: Migrate sqlite to postgres
|
# TODO: Migrate sqlite to postgres
|
||||||
|
|
||||||
settings.server = {
|
settings = {
|
||||||
domain = "grafana.home.feal.no";
|
server = {
|
||||||
http_port = 2342;
|
domain = "grafana.home.feal.no";
|
||||||
http_addr = "127.0.0.1";
|
http_port = 2342;
|
||||||
|
http_addr = "127.0.0.1";
|
||||||
|
};
|
||||||
|
security = {
|
||||||
|
secret_key = "SW2YcwTIb9zpOOhoPsMm"; # TODO - Rotate
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
provision = {
|
provision = {
|
||||||
|
|||||||
@@ -1,12 +1,13 @@
|
|||||||
{ config, pkgs, ... }:
|
{ config, pkgs, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
services.prometheus.exporters.snmp = {
|
# TODO - Fix. Broken in 26.05
|
||||||
enable = true;
|
# services.prometheus.exporters.snmp = {
|
||||||
configurationPath = ./snmp-exporter-conf.yml;
|
# enable = true;
|
||||||
# snmp.yml is built from
|
# configurationPath = ./snmp-exporter-conf.yml;
|
||||||
# https://github.com/prometheus/snmp_exporter/blob/main/snmp.yml
|
# # snmp.yml is built from
|
||||||
# and
|
# # https://github.com/prometheus/snmp_exporter/blob/main/snmp.yml
|
||||||
# https://global.download.synology.com/download/Document/Software/DeveloperGuide/Firmware/DSM/All/enu/Synology_DiskStation_MIB_Guide.pdf
|
# # and
|
||||||
};
|
# # https://global.download.synology.com/download/Document/Software/DeveloperGuide/Firmware/DSM/All/enu/Synology_DiskStation_MIB_Guide.pdf
|
||||||
|
# };
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ let
|
|||||||
dnsHost = "192.168.10.175";
|
dnsHost = "192.168.10.175";
|
||||||
webuiListen = "127.0.1.2:5053";
|
webuiListen = "127.0.1.2:5053";
|
||||||
in {
|
in {
|
||||||
# Flame - Homelab dashboard/linktree
|
# Pihole - Ad-blocking DNS recursor and authoritative DNS/DHCP
|
||||||
virtualisation.oci-containers.containers = {
|
virtualisation.oci-containers.containers = {
|
||||||
pihole = {
|
pihole = {
|
||||||
image = "pihole/pihole";
|
image = "pihole/pihole";
|
||||||
|
|||||||
@@ -16,10 +16,10 @@ in {
|
|||||||
privateKeyFile = "/etc/wireguard/defiant.private";
|
privateKeyFile = "/etc/wireguard/defiant.private";
|
||||||
|
|
||||||
postSetup = ''
|
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 = ''
|
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);
|
peers = (import ../../../common/wireguard-peers.nix);
|
||||||
|
|||||||
Reference in New Issue
Block a user