Move oldtown to ZFS and rename to kharbranth

machines/kharbranth/configuration.nix

@@ -1,14 +1,7 @@
 { config, pkgs, ... }:
 
-let
-  findImport = (import ../../lib.nix).findImport;
-  nixos-hardware = findImport "nixos-hardware";
-in
 {
   imports = [
-    "${nixos-hardware}/common/cpu/intel"
-    "${nixos-hardware}/common/pc/laptop"
-    "${nixos-hardware}/common/pc/laptop/ssd"
     ./hardware.nix
     ./secret.nix
     ../../configurations/eid.nix
@@ -17,7 +10,10 @@ in
     ../../profiles/graphical.nix
   ];
 
-  networking.hostName = "oldtown";
+  networking = {
+    hostId = "e718389d";
+    hostName = "kharbranth";
+  };
 
   time.timeZone = "Europe/Brussels";
 
@@ -27,14 +23,18 @@ in
   # this value at the release version of the first install of this system.
   # Before changing this value read the documentation for this option
   # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
-  system.stateVersion = "20.03";
+  system.stateVersion = "20.09";
 
   home-manager.users.charlotte = { ... }: {
-    home.stateVersion = "20.03";
+    home.stateVersion = "20.09";
   };
 
   # Machine-specific application settings
   custom = {
     git.email = "charlotte.vanpetegem@ugent.be";
+    zfs = {
+      enable = true;
+      encrypted = true;
+    };
   };
 }

machines/kharbranth/hardware.nix

@@ -0,0 +1,56 @@
+{ config, lib, pkgs, modulesPath, ... }:
+
+{
+  imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
+
+  boot = {
+    # Use the systemd-boot EFI boot loader.
+    loader = {
+      systemd-boot.enable = true;
+      efi.canTouchEfiVariables = true;
+    };
+    initrd = {
+      availableKernelModules = [ "xhci_pci" "ahci" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
+      kernelModules = [ "i915" ];
+    };
+    kernelModules = [ "kvm-intel" ];
+    extraModulePackages = [ ];
+  };
+
+  fileSystems."/" = {
+    device = "rpool/local/root";
+    fsType = "zfs";
+  };
+
+  fileSystems."/nix" = {
+    device = "rpool/local/nix";
+    fsType = "zfs";
+  };
+
+  fileSystems."/nix/store" = {
+    device = "rpool/local/nix-store";
+    fsType = "zfs";
+  };
+
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-uuid/A5BA-352A";
+    fsType = "vfat";
+  };
+
+  fileSystems."/cache" = {
+    device = "rpool/local/cache";
+    fsType = "zfs";
+  };
+
+  fileSystems."/data" = {
+    device = "rpool/safe/data";
+    fsType = "zfs";
+  };
+
+  swapDevices = [
+    { device = "/dev/disk/by-uuid/1de27da4-5e97-4104-ab2b-18ab14a2b90b"; }
+  ];
+
+  powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
+  hardware.cpu.intel.updateMicrocode = true;
+}

machines/kholinar/configuration.nix

@@ -1,12 +1,7 @@
 { pkgs, lib, ... }:
 
-let
-  findImport = (import ../../lib.nix).findImport;
-  nixos-hardware = findImport "nixos-hardware";
-in
 {
   imports = [
-    "${nixos-hardware}/lenovo/thinkpad/t490"
     ./hardware.nix
     ./secret.nix
     ../../configurations/eid.nix

machines/kholinar/hardware.nix

@@ -48,7 +48,6 @@
     { device = "/dev/disk/by-uuid/6c09b90f-8971-4702-a18a-f06dfb3d8dcd"; }
   ];
 
-  nix.maxJobs = lib.mkDefault 8;
   powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
   hardware.cpu.intel.updateMicrocode = true;
 }

machines/oldtown/hardware.nix

@@ -1,36 +0,0 @@
-{ config, lib, pkgs, modulesPath, ... }:
-
-{
-  imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
-
-  boot = {
-    loader = {
-      systemd-boot.enable = true;
-      efi.canTouchEfiVariables = true;
-    };
-    initrd = {
-      availableKernelModules = [ "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
-      kernelModules = [ "i915" ];
-    };
-    kernelModules = [ "kvm-intel" ];
-    extraModulePackages = [ ];
-  };
-
-  fileSystems."/" = {
-    device = "/dev/disk/by-uuid/e4b7eae2-546d-412b-9258-389315f4b835";
-    fsType = "ext4";
-  };
-
-  fileSystems."/boot" = {
-    device = "/dev/disk/by-uuid/A4C4-7B9F";
-    fsType = "vfat";
-  };
-
-  swapDevices = [
-    { device = "/dev/disk/by-uuid/72c82e3c-ea61-488b-8b24-b3c27368a2ba"; }
-  ];
-
-  nix.maxJobs = lib.mkDefault 8;
-  powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
-  hardware.cpu.intel.updateMicrocode = true;
-}