3 files changed, 45 insertions, 31 deletions
diff --git a/hosts/microwave/configuration.nix b/hosts/microwave/configuration.nix
index 35c88f2..9ae9c2d 100644
--- a/hosts/microwave/configuration.nix
+++ b/hosts/microwave/configuration.nix
@@ -27,17 +27,29 @@
   services.fstrim.enable = true;
 
   boot = {
-    supportedFilesystems = [ "btrfs" ];
-
-    # use systemd boot by default
     loader = {
-      systemd-boot.enable = true;
       efi.canTouchEfiVariables = true;
+      grub = {
+        enable = true;
+        efiSupport = true;
+        device = "nodev";
+      };
     };
-    tmpOnTmpfs = true;
+    supportedFilesystems = [ "zfs" ];
+    kernelParams = [ "nohibernate" ];
+    zfs.devNodes = "/dev/";
     plymouth.enable = false;
   };
 
+  services.zfs = {
+    trim.enable = true;
+    autoScrub = {
+      enable = true;
+      pools = [ "rpool" ];
+    };
+    autoSnapshot.enable = true;
+  };
+
   # update the microcode
   hardware.cpu.intel.updateMicrocode = true;
   hardware.enableAllFirmware = true;
@@ -74,6 +86,7 @@
     enable = true;
     package = pkgs.wireshark;
   };
+  time.timeZone = "Europe/Berlin";
 
 
   programs.steam.enable = true;
@@ -83,7 +96,7 @@
   # 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 = "22.05"; # Did you read the comment?
+  system.stateVersion = "22.11"; # Did you read the comment?
 
 }
 
diff --git a/hosts/microwave/hardware-configuration.nix b/hosts/microwave/hardware-configuration.nix
index 0870699..7b2be8b 100644
--- a/hosts/microwave/hardware-configuration.nix
+++ b/hosts/microwave/hardware-configuration.nix
@@ -16,47 +16,47 @@
 
   fileSystems."/" =
     {
-      device = "/dev/disk/by-uuid/f9edd500-f47b-42e5-9b88-7b6d86f76caa";
-      fsType = "btrfs";
-      options = [ "subvol=root" "noatime" "compress=zstd" ];
+      device = "rpool/nixos";
+      fsType = "zfs";
+      options = [ "zfsutil" ];
     };
 
-  boot.initrd.luks.devices."nixos-crypt".device = "/dev/disk/by-uuid/dbee4082-85ae-40f0-9c80-034f3574688f";
-
-  fileSystems."/boot" =
+  fileSystems."/nix" =
     {
-      device = "/dev/disk/by-uuid/4B02-CE16";
-      fsType = "vfat";
+      device = "rpool/nixos/nix";
+      fsType = "zfs";
+      options = [ "zfsutil" ];
     };
 
   fileSystems."/home" =
     {
-      device = "/dev/disk/by-uuid/f9edd500-f47b-42e5-9b88-7b6d86f76caa";
-      fsType = "btrfs";
-      options = [ "subvol=home" "noatime" "compress=zstd" ];
+      device = "rpool/userdata/home";
+      fsType = "zfs";
+      options = [ "zfsutil" ];
     };
 
-  fileSystems."/nix" =
+  fileSystems."/boot" =
     {
-      device = "/dev/disk/by-uuid/f9edd500-f47b-42e5-9b88-7b6d86f76caa";
-      fsType = "btrfs";
-      options = [ "subvol=nix" "noatime" "compress=zstd" ];
+      device = "/dev/disk/by-uuid/A8AA-1CC4";
+      fsType = "vfat";
+      options = [ "X-mount.mkdir" ];
     };
 
-  fileSystems."/tmp" =
-    {
-      device = "/dev/disk/by-uuid/f9edd500-f47b-42e5-9b88-7b6d86f76caa";
-      fsType = "btrfs";
-      options = [ "subvol=tmp" "noatime" "compress=zstd" ];
-    };
+  swapDevices =
+    [{
+      device = "/dev/disk/by-partuuid/f9712640-96a5-46e1-b07d-53b0cba19057";
+      randomEncryption = true;
+    }];
 
-  # The global useDHCP flag is deprecated, therefore explicitly set to false here.
-  # Per-interface useDHCP will be mandatory in the future, so this generated config
-  # replicates the default behaviour.
-  networking.useDHCP = lib.mkDefault false;
+  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
+  # (the default) this is the recommended approach. When using systemd-networkd it's
+  # still possible to use this option, but it's recommended to use it in conjunction
+  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
+  networking.useDHCP = lib.mkDefault true;
   networking.interfaces.enp53s0.useDHCP = lib.mkDefault true;
   networking.interfaces.wlp54s0.useDHCP = lib.mkDefault true;
 
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
   powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
   hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 }
diff --git a/hosts/microwave/network.nix b/hosts/microwave/network.nix
index c6a6d16..c71e89d 100644
--- a/hosts/microwave/network.nix
+++ b/hosts/microwave/network.nix
@@ -4,6 +4,7 @@
   ];
   networking = {
     hostName = "microwave"; # Define your hostname.
+    hostId = "7da4f1e6";
     firewall.enable = true;
     useNetworkd = true;
     wireguard.enable = true;