From 1cadcda1449c46238875b8810b8697d3055011e4 Mon Sep 17 00:00:00 2001 From: Dmitriy Kholkin Date: Fri, 21 Oct 2022 14:00:16 +0300 Subject: [PATCH] enable hibernation on zfs --- machines/AMD-Workstation/default.nix | 2 ++ machines/AMD-Workstation/hardware-configuration.nix | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/machines/AMD-Workstation/default.nix b/machines/AMD-Workstation/default.nix index 6e5b170..d57c8ef 100644 --- a/machines/AMD-Workstation/default.nix +++ b/machines/AMD-Workstation/default.nix @@ -28,6 +28,8 @@ deviceSpecific.enableVirtualisation = true; deviceSpecific.wireguard.enable = true; + boot.zfs.forceImportAll = lib.mkForce false; + hardware.video.hidpi.enable = lib.mkForce false; hardware.firmware = [ pkgs.rtl8761b-firmware ]; diff --git a/machines/AMD-Workstation/hardware-configuration.nix b/machines/AMD-Workstation/hardware-configuration.nix index 2686a86..df0000e 100644 --- a/machines/AMD-Workstation/hardware-configuration.nix +++ b/machines/AMD-Workstation/hardware-configuration.nix @@ -56,10 +56,12 @@ swapDevices = [ { device = "/dev/disk/by-partuuid/7ffa34d9-862b-42ff-a649-da54f7b8fbf0"; - randomEncryption.enable = true; + randomEncryption.enable = false; } ]; + + # Enables DHCP on each ethernet and wireless interface. In case of scripted networking # (the default) this is the recommended approach. When using systemd-networkd it's # still possible to use this option, but it's recommended to use it in conjunction @@ -74,5 +76,5 @@ networking.hostId = "a32bd2dc"; boot.zfs.devNodes = "/dev/disk/by-partuuid/4c6b8cfb-9643-4ff7-961e-89b097328e0e"; boot.supportedFilesystems = [ "zfs" ]; - boot.kernelParams = [ "zfs.zfs_arc_max=12884901888" "nohibernate" ]; + boot.kernelParams = [ "zfs.zfs_arc_max=12884901888" ]; }