diff --git a/configuration.nix b/configuration.nix
index 54a74ac..1ed7da9 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -1,7 +1,6 @@
 {
   lib,
   pkgs,
-  inputs,
   ...
 }: {
   imports = [
@@ -21,13 +20,13 @@
   ## Hyprland
   programs.hyprland.enable = true;
   programs.hyprland.withUWSM = true;
-  programs.hyprland.package = inputs.hyprland.packages.${pkgs.system}.hyprland;
-  programs.hyprland.portalPackage = inputs.hyprland.packages.${pkgs.system}.xdg-desktop-portal-hyprland;
 
   programs.hyprlock.enable = true;
 
   programs.xwayland.enable = true;
 
+  services.dbus.enable = true;
+
   ### Freedesktop providers
 
   #### Secrets
@@ -136,9 +135,6 @@
 
   # Nix
   nix.settings = {
-    substituters = ["https://hyprland.cachix.org"];
-    trusted-substituters = ["https://hyprland.cachix.org"];
-    trusted-public-keys = ["hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="];
     experimental-features = ["nix-command" "flakes"];
   };
 
diff --git a/home/guz-lite/desktop.nix b/home/guz-lite/desktop.nix
index e374eb0..2ff271e 100644
--- a/home/guz-lite/desktop.nix
+++ b/home/guz-lite/desktop.nix
@@ -14,8 +14,6 @@
 
   # Hyprland
   wayland.windowManager.hyprland.enable = true;
-  wayland.windowManager.hyprland.package = inputs.hyprland.packages.${pkgs.system}.hyprland;
-  wayland.windowManager.hyprland.portalPackage = inputs.hyprland.packages.${pkgs.system}.xdg-desktop-portal-hyprland;
   wayland.windowManager.hyprland.xwayland.enable = true;
   wayland.windowManager.hyprland.settings = {
     "$MOD" = "SUPER";
diff --git a/home/guz/apps.nix b/home/guz/apps.nix
index c176a7b..82ae36e 100644
--- a/home/guz/apps.nix
+++ b/home/guz/apps.nix
@@ -78,6 +78,8 @@
 
       # Keyboard
       vial
+
+      davinci-resolve
     ])
     # Utils
     ++ (with self.packages.${pkgs.system}; [
diff --git a/hosts/battleship/configuration.nix b/hosts/battleship/configuration.nix
index 93be5a4..0a0d1c8 100644
--- a/hosts/battleship/configuration.nix
+++ b/hosts/battleship/configuration.nix
@@ -19,4 +19,6 @@
     nameservers = ["192.168.0.110"];
     #wireless.enable = lib.mkForce true;
   };
+
+  boot.kernelPackages = pkgs.linuxPackages_latest;
 }
diff --git a/hosts/battleship/gpu-configuration.nix b/hosts/battleship/gpu-configuration.nix
index 2f7c5aa..3f3e903 100644
--- a/hosts/battleship/gpu-configuration.nix
+++ b/hosts/battleship/gpu-configuration.nix
@@ -1,10 +1,4 @@
-{
-  pkgs,
-  inputs,
-  ...
-}: let
-  pkgs-hyprland = inputs.hyprland.inputs.nixpkgs.legacyPackages.${pkgs.system};
-in {
+{pkgs, ...}: {
   imports = [];
 
   boot.kernelModules = ["amdgpu"];
@@ -13,20 +7,29 @@ in {
   # services.xserver.enable = true;
   services.xserver.videoDrivers = ["amdgpu"];
 
+  # Configuration for davinci resolve based on
+  # https://wiki.nixos.org/wiki/DaVinci_Resolve
   environment.variables = {
+    RUSTICL_ENABLE = "radeonsi";
     ROC_ENABLE_PRE_VEGA = "1";
   };
 
+  environment.systemPackages = with pkgs; [
+    mesa-demos
+    vulkan-tools
+    clinfo
+  ];
+
   hardware.graphics.enable = true;
-  hardware.graphics.package = pkgs-hyprland.mesa;
   hardware.graphics.enable32Bit = true;
-  hardware.graphics.package32 = pkgs-hyprland.mesa;
   hardware.graphics.extraPackages = with pkgs; [
-    # OpenCL
-    rocmPackages.clr.icd
-    rocmPackages.rocm-runtime
-    rocmPackages.rocminfo
+    mesa
+    libva
+    libvdpau-va-gl
+    vulkan-loader
+    vulkan-validation-layers
     amdvlk
+    mesa.opencl
   ];
 
   systemd.tmpfiles.rules = [