ref: disabled xserver and updated vaapi names

Author: sijanthapa171

modules/core/fonts.nix

@@ -9,7 +9,7 @@
 
       # Normal Fonts
       noto-fonts
-      noto-fonts-emoji
+      noto-fonts-color-emoji
     ];
     fontconfig = {
       enable = true;

modules/core/system.nix

@@ -25,7 +25,7 @@ in
     };
   };
   services.xserver = {
-    enable = true;
+    enable = false;
     excludePackages = with pkgs; [ xterm ];
     exportConfiguration = true; # Make sure /etc/X11/xkb is populated so localectl works correctly
     xkb = {

modules/desktop/gnome/default.nix

@@ -9,11 +9,6 @@
     gnome.gnome-initial-setup.enable = false;
     gnome.games.enable = false;
     tlp.enable = lib.mkForce false; # gnome has builtin power management
-    xserver = {
-      enable = true;
-      #layout = "gb";
-      #libinput = { touchpad.tapping = true; };
-    };
   };
 
   environment.gnome.excludePackages = with pkgs; [

modules/desktop/plasma6/default.nix

@@ -17,11 +17,12 @@ in
 {
   programs.thunar.enable = lib.mkForce false;
   services = {
+    # xserver.enable = lib.mkForce true;
+    tlp.enable = lib.mkForce false; # plasma has builtin power management
     desktopManager.plasma6 = {
       enable = true;
       enableQt5Integration = true;
     };
-    tlp.enable = lib.mkForce false; # plasma has builtin power management
   };
 
   environment.plasma6.excludePackages = with pkgs.kdePackages; [

modules/hardware/video/amdgpu.nix

@@ -1,10 +1,7 @@
 # This module is untested since i don't own an amd gpu!
 { pkgs, ... }:
 {
-  services.xserver = {
-    enable = true;
-    videoDrivers = [ "amdgpu" ];
-  };
+  services.xserver.videoDrivers = [ "amdgpu" ];
   environment.systemPackages = with pkgs; [ rocmPackages.amdsmi ];
   # TODO: Use this instead of hardware.graphics
   # Can't test since i have nvidia
@@ -27,7 +24,7 @@
     extraPackages = with pkgs; [
       amdvlk
       libvdpau-va-gl
-      vaapiVdpau
+      libva-vdpau-driver
     ];
     extraPackages32 = with pkgs; [ driversi686Linux.amdvlk ];
   };

modules/hardware/video/intel.nix

@@ -1,9 +1,13 @@
-{ pkgs, ... }:
+{ pkgs, lib, config, ... }:
 {
   nixpkgs.config.packageOverrides = pkgs: {
     vaapiIntel = pkgs.vaapiIntel.override { enableHybridCodec = true; };
   };
 
+  environment.sessionVariables = lib.optionalAttrs config.programs.hyprland.enable {
+    LIBVA_DRIVER_NAME = "iHD";
+  };
+
   boot.kernelParams = [
     "intel_pstate=active"
     "i915.enable_guc=2" # Enable GuC/HuC firmware loading
@@ -20,10 +24,11 @@
 
   # OpenGL
   hardware.graphics = {
+    enable = true;
     extraPackages = with pkgs; [
       intel-media-driver
       vaapiIntel
-      vaapiVdpau
+      libva-vdpau-driver
       libvdpau-va-gl
     ];
   };

modules/hardware/video/nvidia.nix

@@ -45,7 +45,7 @@ in
       enable32Bit = true;
       extraPackages = with pkgs; [
         nvidia-vaapi-driver
-        vaapiVdpau
+        libva-vdpau-driver
         libvdpau-va-gl
       ];
     };

modules/hardware/video/nvk.nix

@@ -40,7 +40,7 @@ in
         mesa # Enables mesa
 
         nvidia-vaapi-driver # Not sure if this is needed
-        vaapiVdpau # Not sure if this is needed
+        libva-vdpau-driver # Not sure if this is needed
         libvdpau-va-gl # Not sure if this is needed
       ];
     };