From aed589c845c09311a96d986454388b780817fec5 Mon Sep 17 00:00:00 2001
From: coolneng <akasroua@gmail.com>
Date: Sat, 28 Mar 2026 20:29:47 +0100
Subject: [PATCH] Set environment variables via standard mechanism

---
 modules/gui.nix | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/modules/gui.nix b/modules/gui.nix
index 1ce8df0..438b523 100644
--- a/modules/gui.nix
+++ b/modules/gui.nix
@@ -42,22 +42,24 @@ with pkgs;
       udiskie
       brightnessctl
     ];
-    extraSessionCommands = ''
-      export MOZ_ENABLE_WAYLAND=1
-      export MOZ_USE_XINPUT2=1
-      export GRIM_DEFAULT_DIR=/home/coolneng/Photos/Screenshots
-      export _JAVA_AWT_WM_NONREPARENTING=1
-      export SDL_VIDEODRIVER=wayland
-      export XDG_SESSION_TYPE=wayland
-      export XDG_CURRENT_DESKTOP=sway
-      export NVIM_LISTEN_ADDRESS=/tmp/nvimsocket
-      export GIT_CONFIG_NOSYSTEM=true
-      export SYSTEMD_LESS=FRSMK
-      export WLR_RENDERER=vulkan
-    '';
     wrapperFeatures.gtk = true;
   };
 
+  # Session variables
+  environment.sessionVariables = rec {
+    MOZ_ENABLE_WAYLAND = "1";
+    MOZ_USE_XINPUT2 = "1";
+    GRIM_DEFAULT_DIR = "/home/coolneng/Photos/Screenshots";
+    _JAVA_AWT_WM_NONREPARENTING = "1";
+    SDL_VIDEODRIVER = "wayland";
+    XDG_SESSION_TYPE = "wayland";
+    XDG_CURRENT_DESKTOP = "sway";
+    NVIM_LISTEN_ADDRESS = "/tmp/nvimsocket";
+    GIT_CONFIG_NOSYSTEM = "true";
+    SYSTEMD_LESS = "FRSMK";
+    WLR_RENDERER = "vulkan";
+  };
+
   # Blue light filter
   location.provider = "geoclue2";