Use `with pkg` when it's there

6 files changed, 36 insertions, 36 deletions

diff --git a/nix/amdgpu.nix b/nix/amdgpu.nix
index 3b6a1c6..9c25608 100644
--- a/nix/amdgpu.nix
+++ b/nix/amdgpu.nix
@@ -1,17 +1,17 @@
 { pkgs, ... }: {
   boot.kernelParams = [ "amdgpu.ppfeaturemask=0xffffffff" ];
-  environment.sessionVariables = {
+  environment.sessionVariables = with pkgs; {
     VDPAU_DRIVER = "radeonsi";
     LIBVA_DRIVER_NAME = "radeonsi";
     AMD_VULKAN_ICD = "RADV";
-    VK_ICD_FILENAMES="${pkgs.pkgsi686Linux.mesa}/share/vulkan/icd.d/radeon_icd.i686.json:${pkgs.mesa}/share/vulkan/icd.d/radeon_icd.x86_64.json";
-    __EGL_VENDOR_LIBRARY_FILENAMES="${pkgs.pkgsi686Linux.mesa}/share/glvnd/egl_vendor.d/50_mesa.json:${pkgs.mesa}/share/glvnd/egl_vendor.d/50_mesa.json";
+    VK_ICD_FILENAMES="${pkgsi686Linux.mesa}/share/vulkan/icd.d/radeon_icd.i686.json:${mesa}/share/vulkan/icd.d/radeon_icd.x86_64.json";
+    __EGL_VENDOR_LIBRARY_FILENAMES="${pkgsi686Linux.mesa}/share/glvnd/egl_vendor.d/50_mesa.json:${mesa}/share/glvnd/egl_vendor.d/50_mesa.json";
   };
   environment.systemPackages = with pkgs; [
     radeontop
-    (pkgs.writeShellScriptBin "proton-env-amdvlk" ''
+    (writeShellScriptBin "proton-env-amdvlk" ''
       export AMD_VULKAN_ICD="AMDVLK"
-      export VK_ICD_FILENAMES="${pkgs.amdvlk}/share/vulkan/icd.d/amd_icd64.json"
+      export VK_ICD_FILENAMES="${amdvlk}/share/vulkan/icd.d/amd_icd64.json"
       proton-env "$@"
     '')
   ];
diff --git a/nix/gaming.nix b/nix/gaming.nix
index 821ae5b..462e5bb 100644
--- a/nix/gaming.nix
+++ b/nix/gaming.nix
@@ -7,25 +7,25 @@ in {
   };
   environment.systemPackages = with pkgs; lib.lists.flatten [
     mangohud
-    (pkgs.asNeeded "protontricks" ["protontricks" "protontricks-launch"])
-    (pkgs.asNeeded "[lutris umu-launcher]" ["lutris"])
-    (pkgs.asNeeded "prismlauncher" ["prismlauncher"])
-    (pkgs.asNeeded "retroarch" ["retroarch"])
-    (pkgs.asNeeded "dolphin-emu" ["dolphin-emu"])
-    (pkgs.asNeeded "pcsx2" ["pcsx2-qt"])
-    (pkgs.asNeeded "(ppsspp.override { enableQt = true; })" ["ppsspp"])
-    (pkgs.asNeeded "cemu" ["cemu"])
-    (pkgs.asNeeded "rpcs3" ["rpcs3"])
-    (pkgs.asNeeded "ryujinx" ["ryujinx"])
-    (pkgs.asNeeded "osu-lazer-bin" ["osu!"])
-    (pkgs.asNeeded "parsec-bin" ["parsecd"])
-    (pkgs.writeShellScriptBin "run-steam-gamescope" ''
+    (asNeeded "protontricks" ["protontricks" "protontricks-launch"])
+    (asNeeded "[lutris umu-launcher]" ["lutris"])
+    (asNeeded "prismlauncher" ["prismlauncher"])
+    (asNeeded "retroarch" ["retroarch"])
+    (asNeeded "dolphin-emu" ["dolphin-emu"])
+    (asNeeded "pcsx2" ["pcsx2-qt"])
+    (asNeeded "(ppsspp.override { enableQt = true; })" ["ppsspp"])
+    (asNeeded "cemu" ["cemu"])
+    (asNeeded "rpcs3" ["rpcs3"])
+    (asNeeded "ryujinx" ["ryujinx"])
+    (asNeeded "osu-lazer-bin" ["osu!"])
+    (asNeeded "parsec-bin" ["parsecd"])
+    (writeShellScriptBin "run-steam-gamescope" ''
       export TTY=/dev/tty4
       export XDG_VTNR=4
       cd $HOME
       exec ${pkgs.kbd}/bin/openvt --switch --login --console 4 -f -- steam-gamescope
     '')
-    (pkgs.writeShellScriptBin "proton-env" ''
+    (writeShellScriptBin "proton-env" ''
       export STEAM_COMPAT_LAUNCHER_SERVICE=proton
       export DXVK_HUD=compiler
       export DXVK_LOG_LEVEL=none
diff --git a/nix/intel.nix b/nix/intel.nix
index 0ebfb8f..7b69ba8 100644
--- a/nix/intel.nix
+++ b/nix/intel.nix
@@ -1,10 +1,10 @@
 { pkgs, ... }: {
-  environment.sessionVariables = {
+  environment.sessionVariables = with pkgs; {
     VDPAU_DRIVER = "va_gl";
     LIBVA_DRIVER_NAME = "iHD";
     AMD_VULKAN_ICD = "ANV";
-    VK_ICD_FILENAMES="${pkgs.pkgsi686Linux.mesa}/share/vulkan/icd.d/intel_icd.i686.json:${pkgs.mesa}/share/vulkan/icd.d/intel_icd.x86_64.json";
-    __EGL_VENDOR_LIBRARY_FILENAMES="${pkgs.pkgsi686Linux.mesa}/share/glvnd/egl_vendor.d/50_mesa.json:${pkgs.mesa}/share/glvnd/egl_vendor.d/50_mesa.json";
+    VK_ICD_FILENAMES="${pkgsi686Linux.mesa}/share/vulkan/icd.d/intel_icd.i686.json:${mesa}/share/vulkan/icd.d/intel_icd.x86_64.json";
+    __EGL_VENDOR_LIBRARY_FILENAMES="${pkgsi686Linux.mesa}/share/glvnd/egl_vendor.d/50_mesa.json:${mesa}/share/glvnd/egl_vendor.d/50_mesa.json";
   };
   hardware.graphics = {
     extraPackages = with pkgs; [
diff --git a/nix/mesa_git.nix b/nix/mesa_git.nix
index b4bfd1f..ba2dcc1 100644
--- a/nix/mesa_git.nix
+++ b/nix/mesa_git.nix
@@ -1,15 +1,15 @@
 { pkgs, ... }: {
   environment.systemPackages = with pkgs; [
-    (pkgs.writeShellScriptBin "proton-env-anv" ''
+    (writeShellScriptBin "proton-env-anv" ''
       export AMD_VULKAN_ICD="ANV"
-      export VK_ICD_FILENAMES="${pkgs.pkgsi686Linux.mesa_git.drivers}/share/vulkan/icd.d/intel_icd.i686.json:${pkgs.mesa_git.drivers}/share/vulkan/icd.d/intel_icd.x86_64.json"
+      export VK_ICD_FILENAMES="${pkgsi686Linux.mesa_git}/share/vulkan/icd.d/intel_icd.i686.json:${mesa_git}/share/vulkan/icd.d/intel_icd.x86_64.json"
       proton-env "$@"
     '')
-    (pkgs.writeShellScriptBin "proton-env-radv" ''
+    (writeShellScriptBin "proton-env-radv" ''
       export AMD_VULKAN_ICD="RADV"
-      export VK_ICD_FILENAMES="${pkgs.pkgsi686Linux.mesa_git.drivers}/share/vulkan/icd.d/radeon_icd.i686.json:${pkgs.mesa_git.drivers}/share/vulkan/icd.d/radeon_icd.x86_64.json"
-      export __EGL_VENDOR_LIBRARY_FILENAMES="${pkgs.pkgsi686Linux.mesa_git.drivers}/share/glvnd/egl_vendor.d/50_mesa.json:${pkgs.mesa_git.drivers}/share/glvnd/egl_vendor.d/50_mesa.json"
-      export LD_LIBRARY_PATH="${pkgs.pkgsi686Linux.mesa_git.drivers}/lib:${pkgs.mesa_git.drivers}/lib:$LD_LIBRARY_PATH"
+      export VK_ICD_FILENAMES="${pkgsi686Linux.mesa_git}/share/vulkan/icd.d/radeon_icd.i686.json:${mesa_git}/share/vulkan/icd.d/radeon_icd.x86_64.json"
+      export __EGL_VENDOR_LIBRARY_FILENAMES="${pkgsi686Linux.mesa_git}/share/glvnd/egl_vendor.d/50_mesa.json:${mesa_git}/share/glvnd/egl_vendor.d/50_mesa.json"
+      export LD_LIBRARY_PATH="${pkgsi686Linux.mesa_git}/lib:${mesa_git}/lib:$LD_LIBRARY_PATH"
       proton-env "$@"
     '')
   ];
diff --git a/nix/scripts.nix b/nix/scripts.nix
index a36d17a..e8c63f6 100644
--- a/nix/scripts.nix
+++ b/nix/scripts.nix
@@ -9,8 +9,8 @@ in {
       sha256 = "sha256-sXSuKusyG1L2Stuf9BL5ZqfzOIOdeAeE3RXcrXAsLdY=";
     };
   };
-  environment.systemPackages = [
-    (pkgs.writeShellScriptBin "bemenu-colored" ''
+  environment.systemPackages = with pkgs; [
+    (writeShellScriptBin "bemenu-colored" ''
       bemenu -C --single-instance -B 0 -M 0 --hp 6 \
       --fn "${loc.font.name} ${toString (loc.font.size - 1)}" -H ${toString ((loc.font.size - 1) * 2)} \
       --cf "#${colo.foreground}" --cb "#${colo.background}" \
diff --git a/nix/user.nix b/nix/user.nix
index fce8bfc..89b6fe1 100644
--- a/nix/user.nix
+++ b/nix/user.nix
@@ -64,15 +64,15 @@ in {
     (python3.withPackages (python-pkgs: [ python-pkgs.requests python-pkgs.beautifulsoup4 ]))
     htop
     neofetch
-    (pkgs.asNeeded "cmatrix" ["cmatrix"])
+    (asNeeded "cmatrix" ["cmatrix"])
     hdparm
     usbutils
     cryptsetup
-    (pkgs.asNeeded "nix-index" ["nix-channel-index" "nix-index" "nix-locate"])
+    (asNeeded "nix-index" ["nix-channel-index" "nix-index" "nix-locate"])
     imagemagick
-    (pkgs.asNeeded "optipng" ["optipng"])
-    (pkgs.asNeeded "dmtx-utils" ["dmtxquery" "dmtxread" "dmtxwrite"])
-    (pkgs.asNeeded "zbar" ["zbarcam" "zbarcam-gtk" "zbarcam-qt" "zbarimg"])
+    (asNeeded "optipng" ["optipng"])
+    (asNeeded "dmtx-utils" ["dmtxquery" "dmtxread" "dmtxwrite"])
+    (asNeeded "zbar" ["zbarcam" "zbarcam-gtk" "zbarcam-qt" "zbarimg"])
     perlPackages.ArchiveZip
     b3sum
     libfaketime
@@ -80,7 +80,7 @@ in {
     dos2unix
     socat
     curl
-    (pkgs.asNeeded "httrack" ["htsserver" "httrack" "proxytrack" "webhttrack"])
+    (asNeeded "httrack" ["htsserver" "httrack" "proxytrack" "webhttrack"])
     libuchardet
     (unzip.override { enableNLS = true; })
     rar