summaryrefslogtreecommitdiff
path: root/nixosConfigurations
diff options
context:
space:
mode:
authorAzat Bahawi <azat@bahawi.net>2023-05-21 23:10:32 +0300
committerAzat Bahawi <azat@bahawi.net>2023-05-21 23:10:32 +0300
commitb07e10139c88d6060e57ca52b2dc12b17b53ac82 (patch)
tree5b5cddc2f47bddb8e8914aa66ae18d52cd519965 /nixosConfigurations
parent8f7371998f813857f25afef4160075665f924ab7 (diff)
2023-05-21
Diffstat (limited to 'nixosConfigurations')
-rw-r--r--nixosConfigurations/eonwe/default.nix16
-rw-r--r--nixosConfigurations/varda/default.nix8
2 files changed, 18 insertions, 6 deletions
diff --git a/nixosConfigurations/eonwe/default.nix b/nixosConfigurations/eonwe/default.nix
index 5de3315..1545925 100644
--- a/nixosConfigurations/eonwe/default.nix
+++ b/nixosConfigurations/eonwe/default.nix
@@ -16,7 +16,7 @@ with lib; {
games = {
lutris.enable = true;
- # minecraft.client.enable = true; # FIXME Build fails.
+ minecraft.client.enable = true;
steam.enable = true;
steam-run.quirks.crusaderKings3 = true;
};
@@ -81,10 +81,14 @@ with lib; {
cores = 32;
};
+ # Required[1] for using ZFS kernel modules with "unsupported" kernels.
+ #
+ # [1]: https://github.com/NixOS/nixpkgs/pull/121113#issuecomment-830003344
+ # [1]: https://github.com/NixOS/nixpkgs/pull/230498#issuecomment-1551328615
+ nixpkgs.config.allowBroken = true;
+
boot = {
- # TODO Override Xanmod kernel to support ZFS. This probably will require
- # some patching.
- kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages;
+ kernelPackages = pkgs.linuxPackages_xanmod;
kernelParams = [
# Silence benign MCE errors:
@@ -94,8 +98,8 @@ with lib; {
# mce: [Hardware Error]: PROCESSOR 2:a60f12 TIME 1669988017 SOCKET 0 APIC 2 microcode a601201
# ```
"mce=nobootlog"
- # This disables[1] User Mode Instruction Protection (UMIP)[2]. Required
- # for some games to run via Wine.
+ # This disables[1] User Mode Instruction Protection (UMIP)[2]. This is
+ # required for some games to run via Wine.
#
# [1]: https://docs.kernel.org/x86/cpuinfo.html
# [2]: https://en.wikichip.org/wiki/x86/umip
diff --git a/nixosConfigurations/varda/default.nix b/nixosConfigurations/varda/default.nix
index 2ff8993..230521e 100644
--- a/nixosConfigurations/varda/default.nix
+++ b/nixosConfigurations/varda/default.nix
@@ -22,6 +22,14 @@ with lib; {
"virtio_pci"
"virtio_scsi"
];
+
+ # https://github.com/NixOS/nixpkgs/issues/89025
+ # https://forum.netcup.de/administration-of-a-server-vserver/vserver-server-kvm-server/p67571-icmpv6-ra-ndisc-router-discovery-failed-to-add-default-route/#post67571
+ # https://superuser.com/questions/33196/how-to-disable-autoconfiguration-on-ipv6-in-linux
+ kernel.sysctl = {
+ "net.ipv6.conf.all.autoconf" = 0;
+ "net.ipv6.conf.all.accept_ra" = 0;
+ };
};
fileSystems = {