home-manager/hyprland/default.nix

@@ -12,8 +12,5 @@
     ./swaync
   ];
 
-  wayland.windowManager.hyprland = {
-    enable = true;
-    systemd.variables = [ "--all" ]; # Import environment into systemd
-  };
+  wayland.windowManager.hyprland.enable = true;
 }

home-manager/hyprland/settings.nix

@@ -13,15 +13,16 @@ in
 
     # Autostart
     exec-once = [
-      app.browser
-      app.terminal
+      "${app.browser}"
+      "${app.terminal}"
       "hypridle"
       "systemctl --user start hyprpolkitagent"
+      # "waybar"
       "waypaper --restore"
     ];
 
     env = [
-      "ELECTRON_OZONE_PLATFORM_HINT,auto" # Tell Electron apps to use Wayland
+      "ELECTRON_OZONE_PLATFORM_HINT,auto"
     ];
 
     general = {

modules/hardware/graphics/default.nix

@@ -1,8 +1,19 @@
+{ pkgs, ... }:
+
 {
   imports = [
     ./nvidia.nix
   ];
 
+  # For hardware acceleration
+  environment.sessionVariables.LIBVA_DRIVER_NAME = "iHD";
+
   # Enable OpenGL
-  hardware.graphics.enable = true;
+  hardware.graphics = {
+    enable = true;
+    extraPackages = with pkgs; [
+      # Used for hardware-acceleration
+      intel-media-driver # For Broadwell (2014) or newer processors. LIBVA_DRIVER_NAME=iHD
+    ];
+  };
 }

modules/hardware/graphics/nvidia.nix

@@ -1,26 +1,11 @@
-{ pkgs, ... }:
-
 {
-  boot.kernelParams = [ "nvidia.NVreg_PreserveVideoMemoryAllocations=1" ];
-
-  # For hardware acceleration
-  environment.sessionVariables.LIBVA_DRIVER_NAME = "nvidia";
-
-  hardware = {
-    graphics.extraPackages = with pkgs; [
-      # Used for hardware-acceleration
-      nvidia-vaapi-driver
-    ];
-    nvidia = {
-      # Required
-      modesetting.enable = true;
-      # Use closed-source drivers
-      open = false;
-      # Enable the Nvidia settings menu
-      nvidiaSettings = true;
-      # Enable nvidia-suspend.service, nvidia-hibernate.service and nvidia-resume.service
-      powerManagement.enable = true;
-    };
+  hardware.nvidia = {
+    # Required
+    modesetting.enable = true;
+    # Use closed-source drivers
+    open = false;
+    # Enable the Nvidia settings menu
+    nvidiaSettings = true;
   };
 
   # Load Nvidia driver for Xorg and Wayland

modules/hyprland/default.nix

@@ -17,7 +17,6 @@
     hyprland = {
       enable = true;
       xwayland.enable = true;
-      withUWSM = true;
     };
     hyprlock.enable = true; # Lock screen
   };