From a3db400a4474ce40476e6104eaadbfbee701127b Mon Sep 17 00:00:00 2001 From: jacekpoz Date: Wed, 14 Feb 2024 15:49:51 +0100 Subject: [PATCH] move hyprland envvars to the module --- hosts/niks/configuration.nix | 14 -------------- modules/gui/hyprland.nix | 18 ++++++++++++++++++ 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/hosts/niks/configuration.nix b/hosts/niks/configuration.nix index 1c703740..792c702c 100644 --- a/hosts/niks/configuration.nix +++ b/hosts/niks/configuration.nix @@ -146,26 +146,12 @@ QT_IM_MODULE = "fcitx"; XMODIFIERS = "@im=fcitx"; - LIBSEAT_BACKEND = "logind"; QT_QPA_PLATFORMTHEME = "qt5ct"; GOPATH = "\$HOME/.local/share/go"; - XDG_CURRENT_DESKTOP = "Hyprland"; - XDG_SESSION_TYPE = "wayland"; - XDG_SESSION_DESKTOP = "Hyprland"; - - QT_QPA_PLATFORM = "wayland"; MOZ_ENABLE_WAYLAND = "1"; MOZ_DRM_DEVICE = "/dev/dri/card0"; - - SDL_VIDEODRIVER = "wayland"; - - _JAVA_AWT_WM_NONEREPARENTING = "1"; - - CLUTTER_BACKEND = "wayland"; - - GDK_BACKEND = "wayland"; XCURSOR_THEME = "Bibata-Modern-Classic"; XCURSOR_SIZE = "24"; diff --git a/modules/gui/hyprland.nix b/modules/gui/hyprland.nix index b5c8bfa6..3407a95e 100644 --- a/modules/gui/hyprland.nix +++ b/modules/gui/hyprland.nix @@ -36,6 +36,24 @@ in { trusted-public-keys = [ "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" ]; }; + environment.sessionVariables = { + XDG_CURRENT_DESKTOP = "Hyprland"; + XDG_SESSION_TYPE = "wayland"; + XDG_SESSION_DESKTOP = "Hyprland"; + + SDL_VIDEODRIVER = "wayland"; + + _JAVA_AWT_WM_NONEREPARENTING = "1"; + + CLUTTER_BACKEND = "wayland"; + + GDK_BACKEND = "wayland"; + + QT_QPA_PLATFORM = "wayland"; + + LIBSEAT_BACKEND = "logind"; + }; + xdg.portal = { enable = true; extraPortals = [