diff --git a/gui.nix b/gui.nix
index d941be1..9829363 100644
--- a/gui.nix
+++ b/gui.nix
@@ -9,6 +9,11 @@ in
     videoDrivers = [ "amdgpu" ];
   };
 
+  # Fix for HIP libraries
+  systemd.tmpfiles.rules = [
+    "L+    /opt/rocm/hip   -    -    -     -    ${pkgs.rocmPackages.clr}"
+  ];
+
   # Configure keymap in X11
   # services.xserver.xkb.layout = "us";
   # services.xserver.xkb.options = "eurosign:e,caps:escape";
@@ -31,9 +36,6 @@ in
     enable = true;
     driSupport = true;
     extraPackages = with pkgs; [
-      # TODO: figure out why this doesn't work
-      # Looks like it requires unfree
-      # rocmPackages.clr.icd
       amdvlk
       libva
       mesa.drivers
@@ -63,7 +65,7 @@ in
   # Enable the sway window manager
   programs.sway = {
     enable = true;
-    package = unstable.sway;
+    #package = unstable.sway;
     wrapperFeatures.gtk = true;
   };
   # Use greetd as the displaymanager
diff --git a/hardware-configuration.nix b/hardware-configuration.nix
index c07fcf4..f047b42 100644
--- a/hardware-configuration.nix
+++ b/hardware-configuration.nix
@@ -9,7 +9,7 @@
       (modulesPath + "/installer/scan/not-detected.nix")
     ];
 
-  boot.kernelPackages = pkgs.linuxPackages_zen;
+  boot.kernelPackages = pkgs.linuxPackages_latest;
   boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "thunderbolt" "usb_storage" "usbhid" "sd_mod" "sdhci_pci" ];
   boot.initrd.kernelModules = [ "kvm-amd" "amdgpu" ];
   boot.kernelModules = [ "kvm-amd" "amdgpu" ];