refactored

also 595 update

hosts/modules/env.nix

@@ -1,6 +1,5 @@
 {
   pkgs,
-  lib,
   config,
   ...
 }: {
@@ -12,30 +11,6 @@
     XCURSOR_SIZE = toString config.theme.cursorSize;
     QT_QPA_PLATFORMTHEME = config.theme.qtTheme;
     QT_STYLE_OVERRIDE = config.theme.qtOverride;
-    CC = "${pkgs.gcc}/bin/gcc";
-    LIBCLANG_PATH = "${pkgs.llvmPackages.libclang.lib}/lib";
-    LUA_PATH = "${pkgs.luajit}/share/lua/${pkgs.luajit.luaversion}/?.lua;${pkgs.luajit}/share/lua/${pkgs.luajit.luaversion}/?/init.lua;;";
-    LUA_CPATH = "${pkgs.luajit}/lib/lua/${pkgs.luajit.luaversion}/?.so;;";
-  };
-
-  environment.sessionVariables = {
-    PKG_CONFIG_PATH = lib.makeSearchPath "lib/pkgconfig" [
-      pkgs.portaudio
-      pkgs.alsa-lib
-      pkgs.stdenv.cc.cc
-    ];
-
-    LD_LIBRARY_PATH = lib.makeLibraryPath [
-      pkgs.libglvnd
-      pkgs.mesa
-      pkgs.cudatoolkit
-      pkgs.mangohud
-      pkgs.portaudio
-      pkgs.alsa-lib
-      pkgs.wayland
-      pkgs.libxkbcommon
-      pkgs.glib
-    ];
   };
 
   environment.pathsToLink = [
@@ -45,6 +20,21 @@
     "/share/pixmaps"
   ];
 
+  programs.nix-ld = {
+    enable = true;
+    libraries = with pkgs; [
+      libglvnd
+      mesa
+      cudatoolkit
+      mangohud
+      portaudio
+      alsa-lib
+      wayland
+      libxkbcommon
+      glib
+    ];
+  };
+
   programs.direnv = {
     enable = true;
     nix-direnv.enable = true;