From 3a05e0b63fe194bdf1b0a477348f01aac0ca2b73 Mon Sep 17 00:00:00 2001 From: Aditya Date: Wed, 11 Sep 2024 14:31:45 +0530 Subject: [PATCH] change env vars and add xfce4 --- hosts/default/home.nix | 2 +- modules/home-manager/session-vars/default.nix | 2 +- modules/nixos/display-manager/default.nix | 6 +++++- modules/nixos/hyprland/config/hypr/hyprland/env.conf | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/hosts/default/home.nix b/hosts/default/home.nix index bc227ab..2286339 100644 --- a/hosts/default/home.nix +++ b/hosts/default/home.nix @@ -29,7 +29,7 @@ home.sessionVariables = { NIXPKGS_ALLOW_UNFREE = 1; NIXOS_OZONE_WL = 1; - #QT_QPA_PLATFORM = "wayland"; + QT_QPA_PLATFORM = "xcb"; }; # The home.packages option allows you to install Nix packages into your diff --git a/modules/home-manager/session-vars/default.nix b/modules/home-manager/session-vars/default.nix index 79ef3a6..10b9a3e 100644 --- a/modules/home-manager/session-vars/default.nix +++ b/modules/home-manager/session-vars/default.nix @@ -12,7 +12,7 @@ _: { GIT_ASKPASS = "/home/user/.nix-profile/bin/ksshaskpass"; WAYLAND_DISPLAY = "wayland-1"; - QT_QPA_PLATFORM = "wayland"; + QT_QPA_PLATFORM = "xcb"; QT_WAYLAND_DISABLE_WINDOWDECORATION = "1"; SDL_VIDEODRIVER = "wayland"; CLUTTER_BACKEND = "wayland"; diff --git a/modules/nixos/display-manager/default.nix b/modules/nixos/display-manager/default.nix index 5aeec98..37788f6 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 = true; + wayland.enable = false; }; }; xserver = { @@ -29,6 +29,10 @@ }; }; desktopManager.plasma6.enable = true; + xserver.desktopManager.xfce = { + enable = true; + enableXfwm = true; + }; }; environment.systemPackages = with pkgs; [ dunst diff --git a/modules/nixos/hyprland/config/hypr/hyprland/env.conf b/modules/nixos/hyprland/config/hypr/hyprland/env.conf index 0bc2984..0576ec7 100644 --- a/modules/nixos/hyprland/config/hypr/hyprland/env.conf +++ b/modules/nixos/hyprland/config/hypr/hyprland/env.conf @@ -9,7 +9,7 @@ env = GLFW_IM_MODULE, ibus env = INPUT_METHOD, fcitx # Themes -env = QT_QPA_PLATFORM, wayland +env = QT_QPA_PLATFORM, xcb env = QT_QPA_PLATFORMTHEME, qt5ct # env = QT_STYLE_OVERRIDE,kvantum env = WLR_NO_HARDWARE_CURSORS, 1