diff options
| author | tv <tv@krebsco.de> | 2021-06-10 21:42:06 +0200 |
|---|---|---|
| committer | tv <tv@krebsco.de> | 2021-06-10 21:42:06 +0200 |
| commit | 0e6e8b7188b4a2aab7ca467cb20514a70ba09011 (patch) | |
| tree | cfa9ab8a1a83e0dd139255cf7f7b29bf9a37fdf6 /makefu/1systems/x | |
| parent | 44c4cb6a453f5bc34c870caa6802548c099e9435 (diff) | |
| parent | 04a081a3be600cc5e74aadd4f0fee899d6987a85 (diff) | |
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'makefu/1systems/x')
| -rw-r--r-- | makefu/1systems/x/config.nix | 2 | ||||
| -rw-r--r-- | makefu/1systems/x/x13/default.nix | 6 | ||||
| -rw-r--r-- | makefu/1systems/x/x13/zfs.nix | 1 |
3 files changed, 7 insertions, 2 deletions
diff --git a/makefu/1systems/x/config.nix b/makefu/1systems/x/config.nix index 80655f99..fee4145b 100644 --- a/makefu/1systems/x/config.nix +++ b/makefu/1systems/x/config.nix @@ -130,7 +130,7 @@ # Virtualization # <stockholm/makefu/2configs/virtualisation/libvirt.nix> <stockholm/makefu/2configs/virtualisation/docker.nix> - # <stockholm/makefu/2configs/virtualisation/virtualbox.nix> + <stockholm/makefu/2configs/virtualisation/virtualbox.nix> #{ # networking.firewall.allowedTCPPorts = [ 8080 ]; # networking.nat = { diff --git a/makefu/1systems/x/x13/default.nix b/makefu/1systems/x/x13/default.nix index ac601845..ea557bbe 100644 --- a/makefu/1systems/x/x13/default.nix +++ b/makefu/1systems/x/x13/default.nix @@ -8,7 +8,7 @@ <nixos-hardware/lenovo/thinkpad/l14/amd> # close enough # <stockholm/makefu/2configs/hw/tpm.nix> <stockholm/makefu/2configs/hw/ssd.nix> - <stockholm/makefu/2configs/hw/xmm7360.nix> + # <stockholm/makefu/2configs/hw/xmm7360.nix> ]; boot.zfs.requestEncryptionCredentials = true; networking.hostId = "f8b8e0a2"; @@ -32,5 +32,9 @@ users.groups.video = {}; users.users.makefu.extraGroups = [ "video" ]; + + boot.extraModprobeConfig = '' + options thinkpad_acpi fan_control=1 + ''; } diff --git a/makefu/1systems/x/x13/zfs.nix b/makefu/1systems/x/x13/zfs.nix index adfebbf9..d6b99df4 100644 --- a/makefu/1systems/x/x13/zfs.nix +++ b/makefu/1systems/x/x13/zfs.nix @@ -13,6 +13,7 @@ boot.kernelModules = [ "kvm-amd" ]; boot.extraModulePackages = [ ]; + boot.zfs.enableUnstable = true; # required for 21.05 fileSystems."/" = { device = "zroot/root/nixos"; fsType = "zfs"; |