From 1914559b884dfd72fee00bc8e8dc7e04690fa896 Mon Sep 17 00:00:00 2001
From: MichaelFisher1997 <contact@micahelfisher.tech>
Date: Sat, 10 May 2025 16:56:54 +0100
Subject: [PATCH] refactor build

---
 hosts/hypr-nix/configuration.nix | 23 ++++-------------------
 hosts/hypr-nix/gpu.nix           | 20 ++++++++++++++++----
 hosts/hypr-nix/hyprland.nix      |  1 -
 hosts/hypr-nix/packages.nix      | 11 ++++++-----
 4 files changed, 26 insertions(+), 29 deletions(-)

diff --git a/hosts/hypr-nix/configuration.nix b/hosts/hypr-nix/configuration.nix
index c275f9f..9862a3e 100644
--- a/hosts/hypr-nix/configuration.nix
+++ b/hosts/hypr-nix/configuration.nix
@@ -61,7 +61,9 @@
 
   services = {
     # Enable X11 and configure Wayland support
-    desktopManager.plasma6 = true;
+    desktopManager = {
+      plasma6.enable = true;
+    };
     xserver = {
       enable = true;
       xkb.layout = "gb";
@@ -74,7 +76,6 @@
       # Desktop Managers Configuration
       desktopManager = {
         gnome.enable = true;       # GNOME
-        #plasma6.enable = true;     # Use plasma5 for KDE6 as well
       };
 
       # Window Managers Configuration
@@ -108,7 +109,7 @@
   services.printing.enable = true;
 
   # Enable sound with pipewire.
-  hardware.pulseaudio.enable = false;
+  services.pulseaudio.enable = false;
 
   #sound.enable = true;
   services.flatpak.enable = true;
@@ -171,22 +172,6 @@
   #services.desktopManager.cosmic.enable = true;
   #services.displayManager.cosmic-greeter.enable = true;
 
-  hardware.opengl = {
-    enable = true;
-    #driSupport = true;
-    #driSupport32Bit = true;
-    extraPackages = with pkgs; [
-      vulkan-loader
-      vulkan-validation-layers
-      vulkan-extension-layer
-      intel-media-driver # LIBVA_DRIVER_NAME=iHD
-      intel-vaapi-driver # LIBVA_DRIVER_NAME=i965 (older but works better for Firefox/Chromium)
-      libvdpau-va-gl
-      vaapiVdpau
-      mesa
-    ];
-  };
-
   programs.steam.enable = true;
   programs.steam.gamescopeSession.enable = true;
 
diff --git a/hosts/hypr-nix/gpu.nix b/hosts/hypr-nix/gpu.nix
index 085481e..1f357bb 100644
--- a/hosts/hypr-nix/gpu.nix
+++ b/hosts/hypr-nix/gpu.nix
@@ -1,10 +1,22 @@
 { pkgs, ... }:
 {
-  hardware.opengl.extraPackages = with pkgs; [
-    rocmPackages.clr.icd
-  ];
   environment.systemPackages = [
     pkgs.rocmPackages.rpp
 	];
-
+  hardware.graphics = {
+    enable = true;
+    #driSupport = true;
+    #driSupport32Bit = true;
+    extraPackages = with pkgs; [
+      rocmPackages.clr.icd
+      vulkan-loader
+      vulkan-validation-layers
+      vulkan-extension-layer
+      intel-media-driver # LIBVA_DRIVER_NAME=iHD
+      intel-vaapi-driver # LIBVA_DRIVER_NAME=i965 (older but works better for Firefox/Chromium)
+      libvdpau-va-gl
+      vaapiVdpau
+      mesa
+    ];
+  };
 }
diff --git a/hosts/hypr-nix/hyprland.nix b/hosts/hypr-nix/hyprland.nix
index 63ef794..182cb02 100644
--- a/hosts/hypr-nix/hyprland.nix
+++ b/hosts/hypr-nix/hyprland.nix
@@ -35,7 +35,6 @@
     discocss
     themechanger
     catppuccin-kvantum
-    dolphin
     nwg-drawer
     hyprpaper
 	];
diff --git a/hosts/hypr-nix/packages.nix b/hosts/hypr-nix/packages.nix
index 334a9a9..be483cc 100644
--- a/hosts/hypr-nix/packages.nix
+++ b/hosts/hypr-nix/packages.nix
@@ -8,7 +8,6 @@ in
   environment.systemPackages = with pkgs; [
     # Text Editors
     vim
-    libsForQt5.kate
     sublime
     lunarvim
     vscode
@@ -34,7 +33,6 @@ in
     python3
     php
     php83Packages.composer
-    libsForQt5.kdenlive
     exercism
     betterdiscord-installer
     unstable.go
@@ -112,7 +110,6 @@ in
     eww
     vesktop
     unstable.hyprsunset
-    unstable.hyprshot
     
     # Web Browsers
     brave
@@ -180,7 +177,7 @@ in
     spice-vdagent
     
     # Themes and Customization
-    kdePackages.qt6ct
+    #kdePackages.qt6ct
     catppuccin-kvantum
     
     # Multimedia Tools
@@ -195,7 +192,6 @@ in
     unstable.ghostty
     guacamole-client
     rpi-imager
-    kdePackages.filelight
     light
 
     #games
@@ -214,6 +210,11 @@ in
     modrinth-app
     minecraft
     nsnake
+
+    #kdePackages
+    kdePackages.dolphin
+    kdePackages.filelight
+    kdePackages.kate
   ];
 
 }