diff --git a/systems/aarch64-linux/macbook-pro-nixos/hardware-configuration.nix b/systems/aarch64-linux/macbook-pro-nixos/hardware-configuration.nix
index 165c4ee..6287f89 100644
--- a/systems/aarch64-linux/macbook-pro-nixos/hardware-configuration.nix
+++ b/systems/aarch64-linux/macbook-pro-nixos/hardware-configuration.nix
@@ -1,78 +1,68 @@
 # 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.
-{
-  lib,
-  modulesPath,
-  ...
-}:
+{ config, lib, pkgs, modulesPath, ... }:
 
 {
-  imports = [
-    (modulesPath + "/installer/scan/not-detected.nix")
-  ];
+  imports =
+    [ (modulesPath + "/installer/scan/not-detected.nix")
+    ];
 
-  boot.initrd.availableKernelModules = [
-    "usb_storage"
-    "sdhci_pci"
-  ];
+  boot.initrd.availableKernelModules = [ "usbhid" "usb_storage" "sdhci_pci" ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" = {
-    device = "none";
-    fsType = "tmpfs";
-    options = [ "mode=755" ];
-  };
+  fileSystems."/" =
+    { device = "none";
+      fsType = "tmpfs";
+    };
 
-  fileSystems."/boot" = {
-    device = "/dev/disk/by-uuid/E66E-1A03";
-    fsType = "vfat";
-    options = [
-      "fmask=0022"
-      "dmask=0022"
-    ];
-  };
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-uuid/80CC-18FC";
+      fsType = "vfat";
+      options = [ "fmask=0022" "dmask=0022" ];
+    };
 
-  fileSystems."/root" = {
-    device = "/dev/disk/by-uuid/335f1bb3-6fdb-474e-972c-77b64e930d03";
-    fsType = "btrfs";
-    options = [ "subvol=root" ];
-  };
+  fileSystems."/home" =
+    { device = "/dev/mapper/cryptroot";
+      fsType = "btrfs";
+      options = [ "subvol=home" ];
+    };
 
-  fileSystems."/etc" = {
-    device = "/dev/disk/by-uuid/335f1bb3-6fdb-474e-972c-77b64e930d03";
-    fsType = "btrfs";
-    options = [ "subvol=etc" ];
-  };
+  boot.initrd.luks.devices."cryptroot".device = "/dev/disk/by-uuid/6fc86225-2bd4-4d9f-ba51-c3bc6b1dc7f9";
 
-  fileSystems."/nix" = {
-    device = "/dev/disk/by-uuid/335f1bb3-6fdb-474e-972c-77b64e930d03";
-    fsType = "btrfs";
-    options = [ "subvol=nix" ];
-  };
+  fileSystems."/persist" =
+    { device = "/dev/mapper/cryptroot";
+      fsType = "btrfs";
+      options = [ "subvol=persist" ];
+    };
 
-  fileSystems."/var/log" = {
-    device = "/dev/disk/by-uuid/335f1bb3-6fdb-474e-972c-77b64e930d03";
-    fsType = "btrfs";
-    options = [ "subvol=log" ];
-  };
+  fileSystems."/etc" =
+    { device = "/dev/mapper/cryptroot";
+      fsType = "btrfs";
+      options = [ "subvol=etc" ];
+    };
 
-  fileSystems."/home" = {
-    device = "/dev/disk/by-uuid/335f1bb3-6fdb-474e-972c-77b64e930d03";
-    fsType = "btrfs";
-    options = [ "subvol=home" ];
-  };
+  fileSystems."/root" =
+    { device = "/dev/mapper/cryptroot";
+      fsType = "btrfs";
+      options = [ "subvol=root" ];
+    };
+
+  fileSystems."/nix" =
+    { device = "/dev/mapper/cryptroot";
+      fsType = "btrfs";
+      options = [ "subvol=nix" ];
+    };
+
+  fileSystems."/var/log" =
+    { device = "/dev/mapper/cryptroot";
+      fsType = "btrfs";
+      options = [ "subvol=log" ];
+    };
 
   swapDevices = [ ];
 
-  # 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.wlan0.useDHCP = lib.mkDefault true;
-
   nixpkgs.hostPlatform = lib.mkDefault "aarch64-linux";
-}
+}
\ No newline at end of file