diff --git a/nix/default.nix b/nix/default.nix
index d463e271..29d31485 100644
--- a/nix/default.nix
+++ b/nix/default.nix
@@ -56,6 +56,7 @@
 
   adapters = flatten [
     stdenvAdapters.useMoldLinker
+    (lib.optional debug stdenvAdapters.keepDebugInfo)
   ];
 
   customStdenv = foldl' (acc: adapter: adapter acc) stdenv adapters;
@@ -147,9 +148,6 @@ in
         then "debugoptimized"
         else "release";
 
-      # we want as much debug info as possible
-      dontStrip = debug;
-
       mesonFlags = flatten [
         (mapAttrsToList mesonEnable {
           "xwayland" = enableXWayland;
diff --git a/nix/overlays.nix b/nix/overlays.nix
index b1eb66ad..a7106315 100644
--- a/nix/overlays.nix
+++ b/nix/overlays.nix
@@ -40,7 +40,13 @@ in {
         inherit date;
       };
       hyprland-unwrapped = final.hyprland.override {wrapRuntimeDeps = false;};
-      hyprland-debug = final.hyprland.override {debug = true;};
+
+      # Build major libs with debug to get as much info as possible in a stacktrace
+      hyprland-debug = final.hyprland.override {
+        aquamarine = final.aquamarine.override {debug = true;};
+        hyprutils = final.hyprutils.override {debug = true;};
+        debug = true;
+      };
       hyprland-legacy-renderer = final.hyprland.override {legacyRenderer = true;};
 
       # deprecated packages