move env variables

flake.lock

@@ -558,11 +558,11 @@
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1723110881,
-        "narHash": "sha256-VqQuxeai86PP/Vh1r6AqOi2pPllqBi68HVJKEk72Z0E=",
+        "lastModified": 1723215081,
+        "narHash": "sha256-HVaAneYjMwsXXpbxDVmk+G2h1uQvAhog3QxZGuVDbX8=",
         "ref": "refs/heads/main",
-        "rev": "83a334f97df4389ca30cb63e50317a66a82562b9",
-        "revCount": 5070,
+        "rev": "fd1d4e288edd586a3d5273cda053a51f5b14cad7",
+        "revCount": 5072,
         "submodules": true,
         "type": "git",
         "url": "https://github.com/hyprwm/Hyprland"
@@ -831,15 +831,16 @@
       "locked": {
         "lastModified": 1722813957,
         "narHash": "sha256-IAoYyYnED7P8zrBFMnmp7ydaJfwTnwcnqxUElC1I26Y=",
-        "owner": "NixOS",
+        "owner": "nixos",
         "repo": "nixpkgs",
         "rev": "cb9a96f23c491c081b38eab96d22fa958043c9fa",
         "type": "github"
       },
       "original": {
-        "id": "nixpkgs",
+        "owner": "nixos",
         "ref": "nixos-unstable",
-        "type": "indirect"
+        "repo": "nixpkgs",
+        "type": "github"
       }
     },
     "nixvim": {

flake.nix

@@ -23,7 +23,7 @@
     };
     nix-colors.url = "github:misterio77/nix-colors";
     ## unstable
-    nixpkgs-unstable.url = "nixpkgs/nixos-unstable";
+    nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
     home-manager-unstable = {
       url = "github:nix-community/home-manager/master";
       inputs.nixpkgs.follows = "nixpkgs-unstable";

home-manager/hyprland/hyprland-settings.nix

@@ -51,7 +51,13 @@ in {
         # source = ~/.config/hypr/myColors.conf
 
         # Some default env vars.
-        env = [ "XCURSOR_SIZE,24" "NIXOS_OZONE_WL,1" ];
+        env =
+          [ "XCURSOR_SIZE,24" "NIXOS_OZONE_WL,1" "WLR_NO_HARDWARE_CURSORS,1" ]
+          // lib.optional osConfig.custom.hardware.nvidia.enable [
+            "LIBVA_DRIVER_NAME,nvidia"
+            "GBM_BACKEND,nvidia-drm"
+            "__GLX_VENDOR_LIBRARY_NAME,nvidia"
+          ];
 
         # For all categories, see https://wiki.hyprland.org/Configuring/Variables/
         input = {

modules/graphical/hyprland.nix

@@ -19,19 +19,6 @@ in {
         };
     };
 
-    environment.sessionVariables = {
-      WLR_NO_HARDWARE_CURSORS = "1";
-      #WLR_DRM_NO_ATOMIC="1";
-      #WLR_DRM_DEVICES = "/dev/dri/card0";
-      #WLR_RENDERER_ALLOW_SOFTWARE = "1";
-    } // lib.mkIf config.custom.hardware.nvidia.enable {
-      LIBVA_DRIVER_NAME = "nvidia";
-      # black screen :(
-      #XDG_SESSION_TYPE = "wayland";
-      GBM_BACKEND = "nvidia-drm";
-      __GLX_VENDOR_LIBRARY_NAME = "nvidia";
-      #WLR_BACKENDS="x11,way
-    };
     nix.settings = {
       substituters = [ "https://hyprland.cachix.org" ];
       trusted-public-keys = [