From aabe75696c9aa7b63c023ed42265ccf8ca1b51cf Mon Sep 17 00:00:00 2001 From: vaxerski <43317083+vaxerski@users.noreply.github.com> Date: Sun, 5 Mar 2023 13:43:30 +0000 Subject: [PATCH] remove all mentions of wrappers --- pages/Configuring/Environment-variables.md | 11 ++++++----- pages/FAQ/_index.md | 2 +- pages/Getting Started/Master-Tutorial.md | 5 ++--- pages/Nvidia/_index.md | 20 +++++++++----------- 4 files changed, 18 insertions(+), 20 deletions(-) diff --git a/pages/Configuring/Environment-variables.md b/pages/Configuring/Environment-variables.md index f4db0bc..e46ed6a 100644 --- a/pages/Configuring/Environment-variables.md +++ b/pages/Configuring/Environment-variables.md @@ -1,7 +1,8 @@ -As [aforementioned](../../Getting-Started/Master-Tutorial/#launching-hyprland-part-1), it's -useful using a wrapper to launch Hyprland. Whether you start Hyprland through TTY or a Display -Manager, it is always suggested to use one. As such, you can pass certain environment -variables to improve Wayland compatibility, or simply change certain aspects of your desktop. +You can use the `env` keyword to set environment variables prior to the initialization of +the Display Server, e.g.: +```ini +env = GTK_THEME,Nord +``` Please avoid putting those environment variables in /etc/environment. That will cause all sessions (including Xorg ones) to pick up your wayland-specific environment on traditional @@ -14,7 +15,7 @@ Linux distros. - `XDG_SESSION_DESKTOP=Hyprland` XDG specific environment variables are often detected through portals and applications that may -set those for you, however it is a good idea to provide them in your wrapper script as a fail-safe. +set those for you, however it is not a bad idea to set them explicitly. # QT Variables diff --git a/pages/FAQ/_index.md b/pages/FAQ/_index.md index c69106d..031f47f 100644 --- a/pages/FAQ/_index.md +++ b/pages/FAQ/_index.md @@ -120,7 +120,7 @@ After that, add `exec-once=hyprctl setcursor [THEME] [SIZE]` to your config and restart Hyprland. For QT applications, Hyprland exports XCURSOR_SIZE as 24, which is the default. -You can overwrite this by exporting XCURSOR_SIZE to a different value in your wrapper. +You can overwrite this by exporting XCURSOR_SIZE to a different value with `env`. Alternatively, change the config files manually according to the [XDG specification (Arch Wiki link)](https://wiki.archlinux.org/title/Cursor_themes#Configuration). diff --git a/pages/Getting Started/Master-Tutorial.md b/pages/Getting Started/Master-Tutorial.md index cf392c3..9adbcd1 100644 --- a/pages/Getting Started/Master-Tutorial.md +++ b/pages/Getting Started/Master-Tutorial.md @@ -16,9 +16,8 @@ distros' repositories. _If not using an NVIDIA card, skip this step_ Please take a look at -[The Nvidia page](../../Nvidia) before launching. You should **first** make a -wrapper, as described in a section a bit below, then follow the instructions from -the Nvidia page, and then continue on with sections below. +[The Nvidia page](../../Nvidia) before launching. It has a lot of info regarding the needed +environment and tweaks. ## VM? _If not using a VM, skip this step_ diff --git a/pages/Nvidia/_index.md b/pages/Nvidia/_index.md index f01b426..5a2f847 100644 --- a/pages/Nvidia/_index.md +++ b/pages/Nvidia/_index.md @@ -27,22 +27,20 @@ use that one instead. Note that on a laptop, it could cause problems with the su {{< hint >}}To get multi monitor to work properly on a hybrid graphics device (a laptop with both an Intel and an Nvidia GPU), you will need to remove the `optimus-manager` package if installed (disabling the service does not work). You also need to change your BIOS settings from hybrid graphics to discrete graphics. {{< /hint >}} -Following the wrapping instructions found on -[the Quick Start page](../Getting-Started/Quick-start#wrapping-the-launcher-recommended), -wrap the launcher and additionally export these: +Export these variables in your config: ```sh -export LIBVA_DRIVER_NAME=nvidia -export XDG_SESSION_TYPE=wayland -export GBM_BACKEND=nvidia-drm -export __GLX_VENDOR_LIBRARY_NAME=nvidia -export WLR_NO_HARDWARE_CURSORS=1 +env = LIBVA_DRIVER_NAME,nvidia +env = XDG_SESSION_TYPE,wayland +env = GBM_BACKEND,nvidia-drm +env = __GLX_VENDOR_LIBRARY_NAME,nvidia +env = WLR_NO_HARDWARE_CURSORS,1 ``` -{{< hint >}}If you encounter crashes in Firefox, remove the line `export GBM_BACKEND=nvidia-drm` from your launcher. +{{< hint >}}If you encounter crashes in Firefox, remove the line `env = GBM_BACKEND,nvidia-drm`. {{< /hint >}} -{{< hint >}}If you face problems with Discord windows not displaying or screen sharing not working in Zoom, remove or comment the line `export __GLX_VENDOR_LIBRARY_NAME=nvidia` from your launcher. +{{< hint >}}If you face problems with Discord windows not displaying or screen sharing not working in Zoom, remove or comment the line `env = __GLX_VENDOR_LIBRARY_NAME,nvidia`. {{< /hint >}} Install `qt5-wayland`, `qt5ct` and `libva`. Additionally @@ -51,7 +49,7 @@ applications, such as Unity Hub. Reboot your computer -Launch Hyprland with the wrapper. +Launch Hyprland. It _should_ work now.