diff options
| author | makefu <github@syntax-fehler.de> | 2021-06-06 19:15:44 +0200 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2021-06-06 19:15:44 +0200 |
| commit | 74058abe0b5da0753c2167d6bab29eb1eae88366 (patch) | |
| tree | 748e9e75c0498161629597f7469933e69303168b /makefu/1systems/x | |
| parent | 88a845f7a1a037bf6bcf23863d41f36c4cedcd7e (diff) | |
| parent | a5bc9126db72f59062ff9d6a72b2fa35437b42cb (diff) | |
Merge branch '21.05'
Diffstat (limited to 'makefu/1systems/x')
| -rw-r--r-- | makefu/1systems/x/x13/default.nix | 2 | ||||
| -rw-r--r-- | makefu/1systems/x/x13/zfs.nix | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/makefu/1systems/x/x13/default.nix b/makefu/1systems/x/x13/default.nix index f0d663ee9..ea557bbef 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"; diff --git a/makefu/1systems/x/x13/zfs.nix b/makefu/1systems/x/x13/zfs.nix index adfebbf96..d6b99df41 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"; |