Merge pull request 'nvidia-wayland' (#1) from nvidia-wayland into master

Reviewed-on: https://git.sortug.com/polwex/nixconf/pulls/1

1 files changed, 14 insertions, 6 deletions

diff --git a/hosts/local/wayland.nix b/hosts/local/wayland.nix
index 674c54b..8f588c8 100644
--- a/hosts/local/wayland.nix
+++ b/hosts/local/wayland.nix
@@ -1,4 +1,8 @@
-{pkgs, ...}: {
+{
+  inputs,
+  pkgs,
+  ...
+}: {
   nixpkgs.config.packageOVerrides = pkgs: {
     intel-vaapi-driver = pkgs.intel-vaapi-driver.override {enableHybridCodec = true;};
     vaapiIntel = pkgs.vaapiIntel.override {enableHybridCodec = true;};
@@ -15,7 +19,7 @@
   programs.sway = {
     enable = true;
     wrapperFeatures.gtk = true;
-    extraOptions = ["--verbose" "--debug"];
+    extraOptions = ["unsupported-gpu" "--verbose" "--debug"];
     extraPackages = with pkgs; [
       xdg-utils
       xdg-desktop-portal
@@ -29,9 +33,6 @@
       brightnessctl
       swayidle
       foot
-      (waybar.override {
-        wireplumberSupport = false;
-      })
       mako
       kanshi
       grim
@@ -42,6 +43,10 @@
       playerctl
       blueman
       wdisplays
+      inputs.nixpkgs-wayland.packages.x86_64-linux.waybar
+      glxinfo
+      vulkan-tools
+      glmark2
     ];
     extraSessionCommands = ''
     '';
@@ -51,8 +56,11 @@
   #    exec swayc
   #  fi
   #'';
-
+  environment.variables = {
+    WLR_NO_HARDWARE_CURSOR = "1";
+  };
   environment.sessionVariables = {
+    WLR_NO_HARDWARE_CURSOR = "1";
     NIXOS_OZONE_WL = "1";
     SDL_VIDEODRIVER = "wayland";
     QT_QPA_PLATFORM = "wayland";