diff options
| author | Alyssa Ross <hi@alyssa.is> | 2019-12-24 23:11:58 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2020-01-09 16:07:29 +0000 |
| commit | 5bd71f522a4a52f60e454c8f3a5c27b5ba3ecdc9 (patch) | |
| tree | d9ea5fc99e6fbfa8ecc2ed8bf7faaf26a9d39ab3 /sys | |
| parent | 7f1db9802db5ee801d56a05ad949bb3bc3cc8495 (diff) | |
| download | nixlib-5bd71f522a4a52f60e454c8f3a5c27b5ba3ecdc9.tar nixlib-5bd71f522a4a52f60e454c8f3a5c27b5ba3ecdc9.tar.gz nixlib-5bd71f522a4a52f60e454c8f3a5c27b5ba3ecdc9.tar.bz2 nixlib-5bd71f522a4a52f60e454c8f3a5c27b5ba3ecdc9.tar.lz nixlib-5bd71f522a4a52f60e454c8f3a5c27b5ba3ecdc9.tar.xz nixlib-5bd71f522a4a52f60e454c8f3a5c27b5ba3ecdc9.tar.zst nixlib-5bd71f522a4a52f60e454c8f3a5c27b5ba3ecdc9.zip | |
sys/x220: migrate to ZFS
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/x220.nix | 35 |
1 files changed, 29 insertions, 6 deletions
diff --git a/sys/x220.nix b/sys/x220.nix index c994134a054c..537dfd211790 100644 --- a/sys/x220.nix +++ b/sys/x220.nix @@ -20,22 +20,45 @@ boot.cleanTmpDir = true; - boot.initrd.luks.devices."nixos-decrypted".device = - "/dev/disk/by-uuid/bb59aa96-f934-4900-a98b-a364b8dccefe"; + networking.hostId = "008dd68a"; + + boot.supportedFilesystems = [ "zfs" ]; + + boot.zfs.requestEncryptionCredentials = true; fileSystems."/" = { - device = "/dev/disk/by-uuid/002e2225-6a03-4692-bac2-f57e5588ee49"; - fsType = "ext4"; + device = "rpool/root"; + fsType = "zfs"; + }; + + fileSystems."/home" = { + device = "rpool/home/qyliss"; + fsType = "zfs"; + }; + + fileSystems."/root" = { + device = "rpool/home/root"; + fsType = "zfs"; + }; + + fileSystems."/nix" = { + device = "rpool/nix"; + fsType = "zfs"; + }; + + fileSystems."/var" = { + device = "rpool/var"; + fsType = "zfs"; }; fileSystems."/boot" = { - device = "/dev/disk/by-uuid/01ac4fac-03c2-433e-9297-eb84268a0c0f"; + device = "/dev/disk/by-uuid/6c2a9dd7-45b4-413a-bded-fccf682ffa36"; fsType = "ext4"; }; swapDevices = [ { - device = "/dev/disk/by-partuuid/201f5472-f45e-49b7-88c9-7fd9458a30f7"; + device = "/dev/disk/by-partuuid/82326179-f409-4f28-9233-805c44a04879"; randomEncryption = true; } ]; |