Reorganize for zfs

machines/kholinar/default.nix

@@ -1,21 +1,28 @@
-{ config, pkgs, ... }:
+{ pkgs, lib, ... }:
 
 {
   imports = [
     <home-manager/nixos>
     ./hardware.nix
     ./secret.nix
+    ../../configurations/eid.nix
     ../../profiles/bluetooth/default.nix
     ../../profiles/common/default.nix
     ../../profiles/graphical/default.nix
   ];
 
-  boot.loader = {
-    systemd-boot.enable = true;
-    efi.canTouchEfiVariables = true;
+  # Use the systemd-boot EFI boot loader.
+  boot = {
+    loader = {
+      systemd-boot.enable = true;
+      efi.canTouchEfiVariables = true;
+    };
   };
 
-  networking.hostName = "pentos";
+  networking = {
+    hostId = "3cc1a4b2";
+    hostName = "kholinar";
+  };
 
   time.timeZone = "Europe/Brussels";
 
@@ -25,14 +32,18 @@
   # 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
+  # Machine-specific settings
   custom = {
     git.email = "charlotte@vanpetegem.me";
+    zfs = {
+      enable = true;
+      encrypted = true;
+    };
   };
 }

machines/kholinar/hardware.nix

@@ -0,0 +1,48 @@
+# Do not modify this file!  It was generated by ‘nixos-generate-config’
+# and may be overwritten by future invocations.  Please make changes
+# to /etc/nixos/configuration.nix instead.
+{ config, lib, pkgs, modulesPath, ... }:
+
+{
+  imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
+
+  boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usbhid" "usb_storage" "sd_mod" "sdhci_pci" ];
+  boot.initrd.kernelModules = [ "i915" ];
+  boot.kernelModules = [ "kvm-intel" ];
+  boot.extraModulePackages = [ ];
+
+  fileSystems."/" = {
+    device = "rpool/local/root";
+    fsType = "zfs";
+  };
+
+  fileSystems."/nix" = {
+    device = "rpool/local/nix";
+    fsType = "zfs";
+  };
+
+  fileSystems."/data" = {
+    device = "rpool/safe/data";
+    fsType = "zfs";
+  };
+
+  fileSystems."/cache" = {
+    device = "rpool/local/cache";
+    fsType = "zfs";
+  };
+
+
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-uuid/BEEE-D83A";
+    fsType = "vfat";
+  };
+
+
+  swapDevices = [
+    { 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/default.nix

@@ -5,6 +5,7 @@
     <home-manager/nixos>
     ./hardware.nix
     ./secret.nix
+    ../../configurations/eid.nix
     ../../profiles/bluetooth/default.nix
     ../../profiles/common/default.nix
     ../../profiles/graphical/default.nix

machines/pentos/hardware.nix

@@ -1,29 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
-  imports = [ <nixpkgs/nixos/modules/installer/scan/not-detected.nix> ];
-
-  boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usbhid" "usb_storage" "sd_mod" "sr_mod" ];
-  # Early KMS start
-  boot.initrd.kernelModules = [ "i915" ];
-  boot.kernelModules = [ "kvm-intel" ];
-  boot.extraModulePackages = [ ];
-
-  fileSystems."/" = {
-    device = "/dev/disk/by-uuid/0eb8b94a-5fc2-4b24-962a-94b3675b6f5b";
-    fsType = "ext4";
-  };
-
-  fileSystems."/boot" = {
-    device = "/dev/disk/by-uuid/46AC-2E2E";
-    fsType = "vfat";
-  };
-
-  swapDevices = [
-    { device = "/dev/disk/by-uuid/b8f6154e-6b1f-42d7-8fe0-c03d7ad150f3"; }
-  ];
-
-  nix.maxJobs = lib.mkDefault 8;
-  powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
-  hardware.cpu.intel.updateMicrocode = true;
-}