diff --git a/flake.nix b/flake.nix
index 5d43664..ed14912 100755
--- a/flake.nix
+++ b/flake.nix
@@ -521,7 +521,7 @@
             ./base/base-nogui
             ./base/base-gui
             pi5-disko.nixosModules.disko
-            ./share/disko/pi-uefi-disko.nix
+            ./hosts/pi5/disko.nix
             pi5-cosmic.nixosModules.default
             pi5-impermanence.nixosModules.impermanence
             pi5-sops-nix.nixosModules.sops
diff --git a/hosts/nas/users.nix b/hosts/nas/users.nix
index 419efd8..5a88831 100755
--- a/hosts/nas/users.nix
+++ b/hosts/nas/users.nix
@@ -48,6 +48,14 @@ in
         swtpm
         tigervnc
       ];
+      openssh.authorizedKeys.keys = [
+        # macBook
+        "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCw9zq8DLGByI5v2gAn95hKNyOsm3g61a2buxu2BBMFysQJgmZPCCLUqRJKhSM5Vm/JOgsAmdpRBRZQoHD+6S844CJHb4v4VIbjkyQgYCuM7Rst2IOZ5QybvsA2/D0nwytZ+HXQqDj2AagUYDbz0gyyIHkDQ5YGBMkvkWz/h1Vci6aoBM7VihEDM4KlWoTVuPeASGM8r5IZ2FS83Djbqo4ov6AYvLMrKB9Z7hmFgH6R3LE0gxOkzbGVXtSuvJyrjvgytoT22UhATjjxSQ9D+YJXXkQoB3lUdg8OoIquUPjMZpl4mR8ffvseWPfcvD1XlD5t+TOHFqKpESO547tlOBYhdpew+NSgAXpamCU6oyV8tDCywLQu2ucxHRn78u6WXzWHkDtffdhzmk6TZaPhWqVHuTGjR4higBgGqUfSaKOMszt+FDRZAr3HtuQ2+zJ8bowK9fW5OqilTtK2HtQqroD9ApegDNbqOz6kGy5IycSXvqPURy/M4lxZxbtBPuemcJs= mattjallen@MacBook-Pro.local"
+        # desktop windows
+        "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDZ2PYPjZddOzR8OJj16G88KcUhCDLkvrEmpUQP0wKHDUuA27HQQ2ORo66asadwGHY3k1VDZ1ei9l9H++SIIeKOaaUr5yZdktvj4POUNtbd9ZhcS7sZU7BSF+NMDM+h3tImh6z0S7mWvRQOUv3ZM+ZER+5xTWJVG1OOJEpb1drxJk6Qz0wbZKSR7TPNFBLLXlVy7hkNYf07RtDyhCCxNB3hJfa8c+oztnWumwDhDQWLqiUXWIU2QH6iRLGl/WYnujtNvVVaV/Hn3JJkS6MM9dnV3cpoIO0+J7+WfsN9rZ0wXt5yY3GhiGXwmcO5eYVli8lHlLWtK7aYSETyry6CBsLbojzOQO5rSqhpwfF2njAAFAQU0UjLc8PahisIuFKCwHH4iyXXOagiv5K1Mc/0Ak+WhhMPee6vV2p7NTyNpXRvouDbWy5cSRH31WgQ9fK5mIGe5v8nGGqtEhUubUkiOgP+H3UbT2V/nTv/TFKdJcKw+WmizvTrxBmaMjWALlkYl+s= mattl@Jallen-PC"
+        # desktop nixos
+        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPTBMydhOc6SnOdB5WrEd7X07DrboAtagCUgXiOJjLov matt@matt-nixos"
+      ];
     };
 
     # Nix app account
diff --git a/hosts/pi5/configuration.nix b/hosts/pi5/configuration.nix
index 279a5e7..1fc7cdb 100755
--- a/hosts/pi5/configuration.nix
+++ b/hosts/pi5/configuration.nix
@@ -16,7 +16,7 @@ in
     ./networking.nix
     ./services.nix
     ./sops.nix
-    ../../modules/desktop-environments/cosmic
+    ../../modules/desktop-environments/hyprland
 #    ./hass.nix
   ];
 
@@ -68,11 +68,15 @@ in
 
   environment = {
     systemPackages = with pkgs; [
+      erofs-utils
+      fex
       libraspberrypi
       raspberrypi-eeprom
       raspberrypifw
       raspberrypiWirelessFirmware
       raspberrypi-armstubs
+      squashfuse
+      squashfsTools
     ];
   };
 
@@ -82,7 +86,8 @@ in
     mutableUsers = false;
     users."${user}" = {
       isNormalUser = true;
-      hashedPasswordFile = password;
+#      hashedPasswordFile = password;
+      password = "BogieDudie1";
       extraGroups = [
         "wheel"
         "docker"
@@ -101,4 +106,6 @@ in
     };
     users.root.shell = pkgs.zsh;
   };
+
+  zramSwap.enable = true;
 }
diff --git a/hosts/pi5/disko.nix b/hosts/pi5/disko.nix
new file mode 100644
index 0000000..3e631cc
--- /dev/null
+++ b/hosts/pi5/disko.nix
@@ -0,0 +1,109 @@
+{ ... }:
+let
+  rootDisk = "/dev/nvme0n1";
+in
+{
+  disko.devices.disk.main.imageSize = "15G";
+  disko.devices = {
+    nodev."/" = {
+      fsType = "tmpfs";
+      mountOptions = [
+        "mode=755"
+        "defaults"
+        "size=2G"
+      ];
+    };
+    # root disk setup
+    disk.main = {
+      type = "disk";
+      device = rootDisk;
+      content = {
+        type = "gpt";
+        # specify partitions
+        partitions = {
+          # /boot/firmware
+          FIRMWARE = {
+            priority = 1;
+            name = "FIRMWARE";
+            start = "1M";
+            end = "1G";
+            type = "0700";
+            content = {
+              type = "filesystem";
+              format = "vfat";
+              mountpoint = "/boot/firmware";
+              mountOptions = [ "umask=0077" ];
+            };
+          };
+          # /boot
+          ESP = {
+            priority = 2;
+            name = "ESP";
+            # start = "1G";
+            # end = "2G";
+            size = "1G";
+            type = "EF00";
+            content = {
+              type = "filesystem";
+              format = "vfat";
+              mountpoint = "/boot";
+              mountOptions = [ "umask=0077" ];
+            };
+          };
+
+          root = {
+            name = "btrfs-root";
+            size = "100%";
+            content = {
+              type = "btrfs";
+              extraArgs = [ "-f" ]; # Override existing partition
+              # Subvolumes must set a mountpoint in order to be mounted,
+              # unless their parent is mounted
+              subvolumes = {
+                "home" = {
+                  mountOptions = [ "compress=zstd" ];
+                  mountpoint = "/home";
+                };
+                "root" = {
+                  mountOptions = [
+                    "compress=zstd"
+                    "noatime"
+                  ];
+                  mountpoint = "/root";
+                };
+                "nix" = {
+                  mountOptions = [
+                    "compress=zstd"
+                    "noatime"
+                  ];
+                  mountpoint = "/nix";
+                };
+                "etc" = {
+                  mountOptions = [
+                    "compress=zstd"
+                    "noatime"
+                  ];
+                  mountpoint = "/etc";
+                };
+                "tmp" = {
+                  mountOptions = [
+                    "compress=zstd"
+                    "noatime"
+                  ];
+                  mountpoint = "/tmp";
+                };
+                "log" = {
+                  mountOptions = [
+                    "compress=zstd"
+                    "noatime"
+                  ];
+                  mountpoint = "/var/log";
+                };
+              };
+            };
+          };
+        };
+      };
+    };
+  };
+}
diff --git a/modules/desktop-environments/hyprland/default.nix b/modules/desktop-environments/hyprland/default.nix
index e7a1199..b272610 100755
--- a/modules/desktop-environments/hyprland/default.nix
+++ b/modules/desktop-environments/hyprland/default.nix
@@ -17,12 +17,12 @@ in
         theme = sddmTheme;
         wayland.enable = true;
       };
-      gdm.enable = lib.mkForce false;
+#      gdm.enable = lib.mkForce false;
       defaultSession = "hyprland";
     };
     # disable plasma
     desktopManager.plasma6.enable = lib.mkForce false;
-    desktopManager.gnome.enable = lib.mkForce false;
+#    desktopManager.gnome.enable = lib.mkForce false;
 
     dbus.enable = true;
 
diff --git a/modules/desktop-environments/hyprland/environment.nix b/modules/desktop-environments/hyprland/environment.nix
index e492e66..2513abf 100755
--- a/modules/desktop-environments/hyprland/environment.nix
+++ b/modules/desktop-environments/hyprland/environment.nix
@@ -45,7 +45,6 @@ in
     polkit_gnome
     qt5.qtwayland
     qt6.qtwayland
-    rocmPackages.rocm-smi
     rofi-wayland
     waybar
     waybarUpdatesScript