From d18469f1fae4996d1ec5e4530554e0b447e7e75b Mon Sep 17 00:00:00 2001 From: Guanran Wang Date: Tue, 19 Dec 2023 02:01:26 +0800 Subject: [PATCH] nixos: presets: remove wayland.nix --- nixos/hosts/Aristotle/default.nix | 1 - nixos/profiles/core/default.nix | 1 + nixos/profiles/opt-in/wayland.nix | 7 ------- .../guanranwang/home-manager/applications/sway/default.nix | 1 + 4 files changed, 2 insertions(+), 8 deletions(-) delete mode 100755 nixos/profiles/opt-in/wayland.nix diff --git a/nixos/hosts/Aristotle/default.nix b/nixos/hosts/Aristotle/default.nix index 48613a1..3463799 100644 --- a/nixos/hosts/Aristotle/default.nix +++ b/nixos/hosts/Aristotle/default.nix @@ -5,7 +5,6 @@ ../../profiles/device-type/laptop ../../profiles/opt-in/zram-generator.nix ../../profiles/opt-in/gaming.nix - ../../profiles/opt-in/wayland.nix ../../profiles/opt-in/virt-manager.nix # User diff --git a/nixos/profiles/core/default.nix b/nixos/profiles/core/default.nix index 45c1b0c..a29ad1f 100644 --- a/nixos/profiles/core/default.nix +++ b/nixos/profiles/core/default.nix @@ -61,6 +61,7 @@ "[ 5.996722] amdgpu 0000:67:00.0: Fatal error during GPU init"} ''; + hardware.nvidia.nvidiaSettings = false; ### WORKAROUND: Revert to NVIDIA version 470.223.02 due to performance issues in version 545.29.06, # this shouldn't affect non-nvidia machines. nixpkgs.config.nvidia.acceptLicense = true; diff --git a/nixos/profiles/opt-in/wayland.nix b/nixos/profiles/opt-in/wayland.nix deleted file mode 100755 index f6a01d1..0000000 --- a/nixos/profiles/opt-in/wayland.nix +++ /dev/null @@ -1,7 +0,0 @@ -_: { - programs.xwayland.enable = true; # enable XWayland - hardware.nvidia.nvidiaSettings = false; # NVIDIA settings menu, wont do anything on wayland - environment.sessionVariables = { - "NIXOS_OZONE_WL" = "1"; # let electron applications use wayland - }; -} diff --git a/users/guanranwang/home-manager/applications/sway/default.nix b/users/guanranwang/home-manager/applications/sway/default.nix index 00fc8a9..f04a706 100644 --- a/users/guanranwang/home-manager/applications/sway/default.nix +++ b/users/guanranwang/home-manager/applications/sway/default.nix @@ -16,6 +16,7 @@ home.sessionVariables = { GTK_IM_MODULE = lib.mkForce "wayland"; # use text-input-v3 + NIXOS_OZONE_WL = "1"; # let electron applications use wayland }; dconf.settings = {