Pihole: tweaks and updates based on changes to Nixpkgs
This commit is contained in:
parent
afc7fc65af
commit
b17fe30e5d
|
@ -43,14 +43,14 @@ in
|
||||||
"flakes"
|
"flakes"
|
||||||
];
|
];
|
||||||
|
|
||||||
# Set up secondary binary caches for Lix and Hevana
|
# Set up Hevana and Lix as secondary binary caches
|
||||||
substituters = [
|
substituters = [
|
||||||
"https://cache.lix.systems"
|
|
||||||
"https://${config.${namespace}.secrets.services.binary-cache.url}"
|
"https://${config.${namespace}.secrets.services.binary-cache.url}"
|
||||||
|
"https://cache.lix.systems"
|
||||||
];
|
];
|
||||||
trusted-public-keys = [
|
trusted-public-keys = [
|
||||||
"cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o="
|
|
||||||
config.${namespace}.secrets.services.binary-cache.pubcert
|
config.${namespace}.secrets.services.binary-cache.pubcert
|
||||||
|
"cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o="
|
||||||
];
|
];
|
||||||
|
|
||||||
# Authentication for Hevana's binary cache
|
# Authentication for Hevana's binary cache
|
||||||
|
|
|
@ -3,17 +3,26 @@
|
||||||
{
|
{
|
||||||
lib,
|
lib,
|
||||||
modulesPath,
|
modulesPath,
|
||||||
namespace,
|
|
||||||
...
|
...
|
||||||
}:
|
}:
|
||||||
|
|
||||||
{
|
{
|
||||||
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
|
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
|
||||||
|
|
||||||
boot.loader = lib.mkForce {
|
boot = {
|
||||||
|
# Enable audio devices
|
||||||
|
kernelParams = [
|
||||||
|
"snd_bcm2835.enable_hdmi=1"
|
||||||
|
"snd_bcm2835.enable_headphones=1"
|
||||||
|
"dtparam=audio=on"
|
||||||
|
];
|
||||||
|
|
||||||
|
# Configure bootloader
|
||||||
|
loader = lib.mkForce {
|
||||||
grub.enable = false;
|
grub.enable = false;
|
||||||
generic-extlinux-compatible.enable = true;
|
generic-extlinux-compatible.enable = true;
|
||||||
};
|
};
|
||||||
|
};
|
||||||
|
|
||||||
#boot.kernelParams = [
|
#boot.kernelParams = [
|
||||||
# "console=serial0,115200n8"
|
# "console=serial0,115200n8"
|
||||||
|
@ -35,11 +44,9 @@
|
||||||
enableRedistributableFirmware = true;
|
enableRedistributableFirmware = true;
|
||||||
raspberry-pi."4" = {
|
raspberry-pi."4" = {
|
||||||
apply-overlays-dtmerge.enable = true;
|
apply-overlays-dtmerge.enable = true;
|
||||||
|
fkms-3d.enable = true; # Enable GPU
|
||||||
};
|
};
|
||||||
|
|
||||||
deviceTree = {
|
deviceTree.enable = true;
|
||||||
enable = true;
|
|
||||||
filter = "*rpi-4-*.dtb";
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue