diff --git a/misc/nix.nix b/misc/nix.nix
index be6d2f2..0a5a629 100644
--- a/misc/nix.nix
+++ b/misc/nix.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+args @ { pkgs, ... }:
 {
   nix.settings.experimental-features = [ "nix-command" "flakes" ];
 
@@ -6,6 +6,6 @@
     "freeimage-unstable-2021-11-01"
   ];
 
-  nixpkgs.overlays = import ../pkgs pkgs;
+  nixpkgs.overlays = import ../pkgs args;
   nixpkgs.config.allowUnfree = true;
 }
diff --git a/misc/system.nix b/misc/system.nix
index d154f9b..2bf7243 100644
--- a/misc/system.nix
+++ b/misc/system.nix
@@ -42,5 +42,6 @@
     };
   };
 
+  environment.localBinInPath = true;
   environment.systemPackages = [ pkgs.ntfs3g ];
 }
diff --git a/pkgs/default.nix b/pkgs/default.nix
index db1194d..4577614 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -1,15 +1,16 @@
-pkgs: [
+{ pkgs, ... }: with pkgs; [
   (final: prev: {
-    winvista-cursors = pkgs.callPackage ./winvista-cursors.nix {};
-    win7-cursors = pkgs.callPackage ./win7-cursors.nix {};
-    winxp-cursors = pkgs.callPackage ./winxp-cursors.nix {};
-    winxp-icons = pkgs.callPackage ./winxp-icons.nix {};
-    oxylite-icon-theme = pkgs.callPackage ./oxylite-icon-theme.nix {};
-    e17gtk-revolved = pkgs.callPackage ./e17gtk-revolved.nix {};
-    darkcold-gtk-theme = pkgs.callPackage ./darkcold-gtk-theme.nix {};
-    arc-mono-gtk-theme = pkgs.callPackage ./arc-mono-gtk-theme.nix {};
-    vim-darcula-theme = pkgs.callPackage ./vim-darcula-theme.nix {};
-    sddm-i3-theme = pkgs.callPackage ./sddm-i3-theme.nix {};
+    winvista-cursors = callPackage ./winvista-cursors.nix {};
+    win7-cursors = callPackage ./win7-cursors.nix {};
+    winxp-cursors = callPackage ./winxp-cursors.nix {};
+    winxp-icons = callPackage ./winxp-icons.nix {};
+    oxylite-icon-theme = callPackage ./oxylite-icon-theme.nix {};
+    e17gtk-revolved = callPackage ./e17gtk-revolved.nix {};
+    darkcold-gtk-theme = callPackage ./darkcold-gtk-theme.nix {};
+    arc-mono-gtk-theme = callPackage ./arc-mono-gtk-theme.nix {};
+    vim-darcula-theme = callPackage ./vim-darcula-theme.nix {};
+    sddm-i3-theme = callPackage ./sddm-i3-theme.nix {};
+    ericw-tools-latest = callPackage ./ericw-tools-latest.nix {};
     i3status = prev.i3status.overrideAttrs (_: { patches = [ ../files/i3status.patch ]; });
   })
 ]
diff --git a/pkgs/ericw-tools-latest.nix b/pkgs/ericw-tools-latest.nix
new file mode 100644
index 0000000..7e58d36
--- /dev/null
+++ b/pkgs/ericw-tools-latest.nix
@@ -0,0 +1,44 @@
+{
+  lib,
+  stdenv,
+  fetchzip,
+  autoPatchelfHook,
+  qt5,
+  tbb,
+  ...
+}:
+stdenv.mkDerivation rec {
+  pname = "ericw-tools-latest";
+  version = "2.0.0-alpha8";
+
+  src = fetchzip {
+    url = "https://github.com/ericwa/ericw-tools/releases/download/2.0.0-alpha8/ericw-tools-2.0.0-alpha8-Linux.zip";
+    hash = "sha256-F1DyyWNeWAiVEk8Bv1ZFs1TuYyfkwCc5jd+ulA+qRhA=";
+    stripRoot = false;
+  };
+  
+  nativeBuildInputs = [
+    qt5.wrapQtAppsHook
+    autoPatchelfHook
+  ];
+
+  buildInputs = [
+    qt5.qtbase
+    stdenv.cc.cc
+    tbb
+  ];
+
+  installPhase = ''
+    runHook preInstall
+
+    for lib in libembree3.so.3 libtbb.so.12; do
+      install -m755 -D $lib $out/lib/$lib
+    done
+
+    for tool in bspinfo lightpreview qbsp vis maputil light bsputil; do
+      install -m755 -D $tool $out/bin/$tool
+    done
+
+    runHook postInstall
+  '';
+}
diff --git a/programs/default.nix b/programs/default.nix
index 8c516d8..2060fb7 100644
--- a/programs/default.nix
+++ b/programs/default.nix
@@ -43,7 +43,9 @@
       xarchiver
       gvfs
       yad
-      pcmanfm
+      xfce.thunar
+      xfce.thunar-volman
+      xfce.thunar-archive-plugin
 
       pavucontrol
       pamixer
@@ -54,14 +56,18 @@
       gamemode
       ezquake
       vkquake
-      ericw-tools
+      ericw-tools-latest
+      embree # for ericw-tools
+      tbb    # for ericw-tools
       trenchbroom
       r2modman
+      godot_4
 
       libreoffice-qt
       gimp
       sqlitebrowser
       feh
+      vlc 
 
       wineWowPackages.stable
       winetricks
@@ -70,6 +76,8 @@
       ccls
       clang-tools
       tcl
+      valgrind
+      linuxKernel.packages.linux_6_6.perf
 
       gpu-screen-recorder # todo: config this shit so it works
       gpu-screen-recorder-gtk
diff --git a/programs/i3.nix b/programs/i3.nix
index 643a5df..2e773f9 100644
--- a/programs/i3.nix
+++ b/programs/i3.nix
@@ -69,7 +69,7 @@ in {
           { command = "discord &"; notification = false; }
           { command = "element-desktop &"; notification = false; }
 
-          # { command = "xrandr --output DP-3 --mode 1920x1080 --rate 239.76 --primary --output HDMI-3 --mode 1920x1080 --rate 74.97 --right-of DP-3 &"; notification = false; }
+          { command = "xrandr --output DP-3 --mode 1920x1080 --rate 239.76 --primary --output HDMI-3 --mode 1920x1080 --rate 74.97 --right-of DP-3 &"; notification = false; }
         ];
 
         modes = let