From f444567479fb575fd1bcfc9706b44cbf1240bf3c Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Wed, 15 Apr 2020 13:24:04 +0000
Subject: sys/atuin: switch to ZFS

---
 sys/atuin.nix | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

(limited to 'sys')

diff --git a/sys/atuin.nix b/sys/atuin.nix
index 70c7a4dd8720..2fcf0d00b514 100644
--- a/sys/atuin.nix
+++ b/sys/atuin.nix
@@ -12,11 +12,18 @@
 
   boot.initrd.availableKernelModules = [ "xen_blkfront" ];
 
-  fileSystems."/" = {
-    device = "/dev/disk/by-uuid/abbb92f4-ea6e-4283-8a86-012516cc1a44";
-    fsType = "ext4";
+  fileSystems = {
+    "/" = { device = "rpool/root"; fsType = "zfs"; neededForBoot = true; };
+    "/boot" = { device = "/dev/disk/by-partlabel/boot"; fsType = "ext4"; };
+    "/nix" = { device = "rpool/nix"; fsType = "zfs"; neededForBoot = true; };
+    "/var" = { device = "rpool/var"; fsType = "zfs"; };
+
+    "/home/qyliss" = { device = "rpool/home/qyliss"; fsType = "zfs"; };
+    "/root" = { device = "rpool/home/root"; fsType = "zfs"; };
   };
 
+  boot.zfs.devNodes = "/dev";
+
   swapDevices = [
     { device = "/dev/disk/by-uuid/49f18b74-5f6e-4e61-b569-f7cc9dc5c600"; }
   ];
@@ -25,9 +32,13 @@
 
   boot.loader.grub.enable = true;
   boot.loader.grub.version = 2;
-  boot.loader.grub.device = "/dev/xvda";
+  boot.loader.grub.device = "nodev";
+  boot.loader.grub.configurationLimit = 2;
+
+  boot.supportedFilesystems = [ "zfs" ];
 
   networking.hostName = "atuin";
+  networking.hostId = "238d1961";
   networking.domain = "qyliss.net";
   networking.interfaces.eth0 = {
     ipv4.addresses = [
@@ -47,6 +58,7 @@
   '';
 
   boot.kernelPackages = pkgs.linuxPackages;
+  boot.kernelParams = [ "zfs.zfs_arc_max=356515840" ];
 
   networking.nat.enable = true;
   networking.nat.externalInterface = "eth0";
-- 
cgit 1.4.1