From e2684012f4f28a49d2cffde7c61a9888461bccfb Mon Sep 17 00:00:00 2001
From: uku <hi@uku.moe>
Date: Sun, 28 Jul 2024 21:04:22 +0200
Subject: [PATCH] chore: move env var to common config

---
 configs/desktop.nix     | 11 +++++++++--
 systems/fuji/nvidia.nix |  1 -
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/configs/desktop.nix b/configs/desktop.nix
index 3139272..f3ff042 100644
--- a/configs/desktop.nix
+++ b/configs/desktop.nix
@@ -35,14 +35,21 @@
     };
   };
 
-  environment.systemPackages = with pkgs; [sbctl];
+  environment = {
+    systemPackages = with pkgs; [sbctl];
+    sessionVariables = {
+      NIXOS_OZONE_WL = "1";
+    };
+  };
 
   fonts = {
     packages = with pkgs; [
+      cantarell-fonts
+      inter
       iosevka
       jetbrains-mono
-      cantarell-fonts
       twitter-color-emoji
+
       (nerdfonts.override {fonts = ["Iosevka" "JetBrainsMono"];})
     ];
 
diff --git a/systems/fuji/nvidia.nix b/systems/fuji/nvidia.nix
index c8cb364..e71afd5 100644
--- a/systems/fuji/nvidia.nix
+++ b/systems/fuji/nvidia.nix
@@ -11,7 +11,6 @@
   ];
 
   environment.sessionVariables = {
-    NIXOS_OZONE_WL = "1";
     LIBVA_DRIVER_NAME = "nvidia";
     __EGL_VENDOR_LIBRARY_FILENAMES = "/run/opengl-driver/share/glvnd/egl_vendor.d/10_nvidia.json";
     MOZ_DISABLE_RDD_SANDBOX = "1";