From e701ecbb8fb9d3e7a14b1ac99499b32e01ac13da Mon Sep 17 00:00:00 2001
From: Cian Hughes <chughes000@gmail.com>
Date: Mon, 1 Dec 2025 00:38:51 +0000
Subject: [PATCH] Fix for renamed components

---
 home-manager/worklaptop/packages.nix | 2 +-
 nixos/core/packages.nix              | 2 +-
 nixos/worklaptop.nix                 | 4 ++--
 nixos/worklaptop/services.nix        | 4 ++--
 nixos/worklaptop/theming.nix         | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/home-manager/worklaptop/packages.nix b/home-manager/worklaptop/packages.nix
index 2acffb2..c8ce28d 100644
--- a/home-manager/worklaptop/packages.nix
+++ b/home-manager/worklaptop/packages.nix
@@ -20,7 +20,7 @@
   };
 in {
   home.packages = [
-    pkgs.bitwarden
+    pkgs.bitwarden-desktop
     pkgs.blueman
     pkgs.distrobox
     pkgs.feh
diff --git a/nixos/core/packages.nix b/nixos/core/packages.nix
index 5737e35..9098f2f 100644
--- a/nixos/core/packages.nix
+++ b/nixos/core/packages.nix
@@ -12,7 +12,7 @@
     pkgs.bitwarden-cli
     pkgs.bottom
     pkgs.delta
-    pkgs.du-dust
+    pkgs.dust
     pkgs.duf
     pkgs.fastfetch
     pkgs.fd
diff --git a/nixos/worklaptop.nix b/nixos/worklaptop.nix
index e249ab4..2ee6a7a 100644
--- a/nixos/worklaptop.nix
+++ b/nixos/worklaptop.nix
@@ -37,8 +37,8 @@
         pkgs.libvdpau-va-gl
         pkgs.mesa
         pkgs.nvidia-vaapi-driver
-        pkgs.vaapiIntel
-        pkgs.vaapiVdpau
+        pkgs.intel-vaapi-driver
+        pkgs.libva-vdpau-driver
       ];
     };
     nvidia = {
diff --git a/nixos/worklaptop/services.nix b/nixos/worklaptop/services.nix
index 27412c9..d07b4a8 100644
--- a/nixos/worklaptop/services.nix
+++ b/nixos/worklaptop/services.nix
@@ -8,11 +8,11 @@
 }: {
   services = {
     displayManager.defaultSession = "hyprland-uwsm";
+    desktopManager.gnome.enable = false;
+    displayManager.gdm.enable = true;
     xserver = {
       videoDrivers = ["nvidia"]; # or "nvidiaLegacy470 etc.
       enable = true;
-      displayManager.gdm.enable = true;
-      desktopManager.gnome.enable = false;
       xkb = {
         layout = "ie";
         variant = "";
diff --git a/nixos/worklaptop/theming.nix b/nixos/worklaptop/theming.nix
index 2d462dd..147a7be 100644
--- a/nixos/worklaptop/theming.nix
+++ b/nixos/worklaptop/theming.nix
@@ -34,7 +34,7 @@
       pkgs.nerd-font-patcher
       pkgs.noto-fonts
       pkgs.noto-fonts-color-emoji
-      pkgs.vistafonts
+      pkgs.vista-fonts
       pkgs.winePackages.fonts
     ];
   };