From 09553231664cb88422482c449cc939bfb503f518 Mon Sep 17 00:00:00 2001 From: Aditya Date: Mon, 16 Sep 2024 10:03:37 +0530 Subject: [PATCH] disable wayland --- hosts/default/home.nix | 2 +- modules/home-manager/session-vars/default.nix | 10 +++++----- modules/nixos/display-manager/default.nix | 4 ++-- modules/nixos/environment/default.nix | 2 +- modules/nixos/hyprland/default.nix | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/hosts/default/home.nix b/hosts/default/home.nix index d7ee525..c92de24 100644 --- a/hosts/default/home.nix +++ b/hosts/default/home.nix @@ -28,7 +28,7 @@ # Manage session variables home.sessionVariables = { NIXPKGS_ALLOW_UNFREE = 1; - NIXOS_OZONE_WL = 1; + # NIXOS_OZONE_WL = 1; QT_QPA_PLATFORM = "xcb"; }; diff --git a/modules/home-manager/session-vars/default.nix b/modules/home-manager/session-vars/default.nix index 10b9a3e..fb8ef0a 100644 --- a/modules/home-manager/session-vars/default.nix +++ b/modules/home-manager/session-vars/default.nix @@ -11,12 +11,12 @@ _: { # Store git credentials in KDE Wallet GIT_ASKPASS = "/home/user/.nix-profile/bin/ksshaskpass"; - WAYLAND_DISPLAY = "wayland-1"; + #WAYLAND_DISPLAY = "wayland-1"; QT_QPA_PLATFORM = "xcb"; - QT_WAYLAND_DISABLE_WINDOWDECORATION = "1"; - SDL_VIDEODRIVER = "wayland"; - CLUTTER_BACKEND = "wayland"; - MOZ_ENABLE_WAYLAND = "1"; + #QT_WAYLAND_DISABLE_WINDOWDECORATION = "1"; + #SDL_VIDEODRIVER = "wayland"; + #CLUTTER_BACKEND = "wayland"; + #MOZ_ENABLE_WAYLAND = "1"; DISPLAY = ":0"; }; } diff --git a/modules/nixos/display-manager/default.nix b/modules/nixos/display-manager/default.nix index 37788f6..ce2dfba 100644 --- a/modules/nixos/display-manager/default.nix +++ b/modules/nixos/display-manager/default.nix @@ -12,7 +12,7 @@ displayManager = { sddm = { enable = true; - wayland.enable = false; + # wayland.enable = false; }; }; xserver = { @@ -53,6 +53,6 @@ virtiofsd ]; xdg.portal.enable = true; - programs.xwayland.enable = true; + # programs.xwayland.enable = true; }; } diff --git a/modules/nixos/environment/default.nix b/modules/nixos/environment/default.nix index 2be989b..e404529 100644 --- a/modules/nixos/environment/default.nix +++ b/modules/nixos/environment/default.nix @@ -4,7 +4,7 @@ _: { localBinInPath = true; # Include ~/.local/bin in $PATH sessionVariables = { # tell electron apps to use wayland - NIXOS_OZONE_WL = "1"; + # NIXOS_OZONE_WL = "1"; }; }; } diff --git a/modules/nixos/hyprland/default.nix b/modules/nixos/hyprland/default.nix index 0749853..754b7d3 100644 --- a/modules/nixos/hyprland/default.nix +++ b/modules/nixos/hyprland/default.nix @@ -9,7 +9,7 @@ config = lib.mkIf config.hyprland.enable { programs.hyprland = { enable = true; - xwayland.enable = true; + # xwayland.enable = true; }; }; }