havent committed in a while im scared for the amount of conflicts

base/apollo/configuration.nix

@@ -52,7 +52,8 @@ SUBSYSTEMS=="usb", ATTRS{idVendor}=="05c6", ATTRS{idProduct}=="9008", MODE="0666
   hardware.graphics = {
     enable = true;
     enable32Bit = true;
-    extraPackages = with pkgs; [mesa.opencl];
+    extraPackages = with pkgs; [mesa.opencl libvdpau-va-gl vaapiVdpau vulkan-validation-layers];
+    extraPackages32 = with pkgs; [driversi686Linux.amdvlk driversi686Linux.mesa.opencl];
   };
   environment.variables = { 
     ROC_ENABLE_PRE_VEGA = "1";

base/overrides.nix

@@ -9,6 +9,7 @@
          gamescope
          antimicrox
          sc-controller
+	 
        ];
 
        extraLibraries =  pkgs: [
@@ -32,6 +33,8 @@
          pkgsi686Linux.xorg.libXi
          pkgsi686Linux.libsndfile
          pkgsi686Linux.libmpg123
+	 gnome2.GConf
+	 
        ];
     })
   ];

home/packages.nix

@@ -2,8 +2,9 @@
   home.packages = with pkgs; [
     prismlauncher
     libgpod
-    ark
-    qv4l2
+    kdePackages.ark
+    vesktop
+    v4l-utils
     nextcloud-client
     blender-hip
     cinny-desktop