diff --git a/flake.lock b/flake.lock
index bb6c6dc..37f15bb 100644
--- a/flake.lock
+++ b/flake.lock
@@ -11,11 +11,11 @@
         "yafas": "yafas"
       },
       "locked": {
-        "lastModified": 1718729996,
-        "narHash": "sha256-VO+5K2V1VpkIuYkqKH/aBsdlqUZFTjoxktbVVcbie4s=",
+        "lastModified": 1718824152,
+        "narHash": "sha256-DhOlFPKCnCV8J2AmlUFzx4j0tl1bIlDHRv1/X2uxNMs=",
         "owner": "chaotic-cx",
         "repo": "nyx",
-        "rev": "741b5b7885bdbf32abafb2753cdd9436236b6c5c",
+        "rev": "84e8d701524a8eaf5418217029c3b0793a202537",
         "type": "github"
       },
       "original": {
@@ -227,11 +227,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1718716991,
-        "narHash": "sha256-sKrD/utGvmtQALvuDj4j0CT3AJXP1idOAq2p+27TpeE=",
+        "lastModified": 1718788307,
+        "narHash": "sha256-SqiOz0sljM0GjyQEVinPXQxaGcbOXw5OgpCWGPgh/vo=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "fab8e511d58f9c3f1cf8456abd685bfd381f7ebe",
+        "rev": "d7830d05421d0ced83a0f007900898bdcaf2a2ca",
         "type": "github"
       },
       "original": {
@@ -268,11 +268,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1718716991,
-        "narHash": "sha256-sKrD/utGvmtQALvuDj4j0CT3AJXP1idOAq2p+27TpeE=",
+        "lastModified": 1718788307,
+        "narHash": "sha256-SqiOz0sljM0GjyQEVinPXQxaGcbOXw5OgpCWGPgh/vo=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "fab8e511d58f9c3f1cf8456abd685bfd381f7ebe",
+        "rev": "d7830d05421d0ced83a0f007900898bdcaf2a2ca",
         "type": "github"
       },
       "original": {
@@ -486,11 +486,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1718548414,
-        "narHash": "sha256-1obyIuQPR/Kq1j5/i/5EuAfQrDwjYnjCDG8iLtXmBhQ=",
+        "lastModified": 1718806950,
+        "narHash": "sha256-E+W/kbedZAiOuPtT+KQRposLaXGDLd7lyK7oL3IH/5U=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "cde8f7e11f036160b0fd6a9e07dc4c8e4061cf06",
+        "rev": "acb4f0e9bfa8ca2d6fca5e692307b5c994e7dbda",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 1555139..6df2181 100644
--- a/flake.nix
+++ b/flake.nix
@@ -128,7 +128,7 @@
         };
 
         # Pi4
-        "nixos-pi4" = nixpkgs-unstable.lib.nixosSystem {
+        "pi4" = nixpkgs-unstable.lib.nixosSystem {
           system = "aarch64-linux";
           modules = [
             nixos-hardware.nixosModules.raspberry-pi-4
diff --git a/hosts/pi4/configuration.nix b/hosts/pi4/configuration.nix
index f5a1cf5..f9a82f3 100644
--- a/hosts/pi4/configuration.nix
+++ b/hosts/pi4/configuration.nix
@@ -40,6 +40,7 @@ in
     ];
     loader = {
       systemd-boot.enable = true;
+      generic-extlinux-compatible.enable = lib.mkForce false;
     };
     # kernelParams = [
     #   "snd_bcm2835.enable_hdmi=1"
diff --git a/hosts/pi4/hardware-configuration.nix b/hosts/pi4/hardware-configuration.nix
index a6f807e..5291b0c 100644
--- a/hosts/pi4/hardware-configuration.nix
+++ b/hosts/pi4/hardware-configuration.nix
@@ -1,38 +1,74 @@
 # 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,
-  ...
-}:
+{ config, lib, pkgs, modulesPath, ... }:
 
 {
-  imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
+  imports =
+    [ (modulesPath + "/installer/scan/not-detected.nix")
+    ];
 
-  boot.initrd.availableKernelModules = [ "xhci_pci" ];
+  boot.initrd.availableKernelModules = [ "xhci_pci" "uas" ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" = {
-    device = "/dev/disk/by-uuid/ec969af6-d557-408a-a149-ba23d31fd8a2";
-    fsType = "ext4";
-  };
+  fileSystems."/" =
+    { device = "none";
+      fsType = "tmpfs";
+    };
 
-  fileSystems."/media/T5" = {
-    device = "/dev/disk/by-uuid/191ce486-899d-4718-81e3-5c9b3ea860e4";
-    fsType = "ext4";
-  };
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-uuid/1DE6-4D02";
+      fsType = "vfat";
+      options = [ "fmask=0022" "dmask=0022" ];
+    };
 
-  fileSystems."/FIRMWARE" = {
-    device = "/dev/disk/by-uuid/5A9F-FC90";
-    fsType = "vfat";
-  };
+  fileSystems."/boot/firmware" =
+    { device = "/dev/disk/by-uuid/1BE6-CB10";
+      fsType = "vfat";
+      options = [ "fmask=0022" "dmask=0022" ];
+    };
 
-  swapDevices = [ { device = "/dev/disk/by-uuid/d9909ef7-c345-48f7-b210-ad7cbe72224b"; } ];
+  fileSystems."/boot/uefi" =
+    { device = "/dev/disk/by-uuid/1BE3-8523";
+      fsType = "vfat";
+      options = [ "fmask=0022" "dmask=0022" ];
+    };
+
+  fileSystems."/nix" =
+    { device = "/dev/disk/by-uuid/7df3c990-7e55-4140-adab-de8ddc4db21a";
+      fsType = "btrfs";
+      options = [ "subvol=nix" ];
+    };
+
+  fileSystems."/etc" =
+    { device = "/dev/disk/by-uuid/7df3c990-7e55-4140-adab-de8ddc4db21a";
+      fsType = "btrfs";
+      options = [ "subvol=etc" ];
+    };
+
+  fileSystems."/root" =
+    { device = "/dev/disk/by-uuid/7df3c990-7e55-4140-adab-de8ddc4db21a";
+      fsType = "btrfs";
+      options = [ "subvol=root" ];
+    };
+
+  fileSystems."/var/log" =
+    { device = "/dev/disk/by-uuid/7df3c990-7e55-4140-adab-de8ddc4db21a";
+      fsType = "btrfs";
+      options = [ "subvol=log" ];
+    };
+
+  fileSystems."/home" =
+    { device = "/dev/disk/by-uuid/7df3c990-7e55-4140-adab-de8ddc4db21a";
+      fsType = "btrfs";
+      options = [ "subvol=home" ];
+    };
+
+  swapDevices =
+    [ { device = "/dev/disk/by-uuid/8b5640bb-2fbf-4e69-9504-fb9508d49f01"; }
+    ];
 
   # 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