better list concatenation + renamed vars on overlay

overlay.nix

@@ -1,10 +1,10 @@
 { pkgs }:
-_self: super: {
-  gnome = super.gnome.overrideScope (
-    _gFinal: gPrev: {
-      nautilus = gPrev.nautilus.overrideAttrs (nsuper: {
+_final: prev: {
+  gnome = prev.gnome.overrideScope (
+    _final: prev: {
+      nautilus = prev.nautilus.overrideAttrs (old: {
         buildInputs =
-          nsuper.buildInputs
+          old.buildInputs
           ++ builtins.attrValues {
             inherit (pkgs.gst_all_1)
               gst-plugins-good
@@ -14,23 +14,20 @@ _self: super: {
       });
     }
   );
-  lutris = super.lutris.override {
+  lutris = prev.lutris.override {
     extraPkgs =
       pkgs:
-      let
-        corePackages = builtins.attrValues {
-          inherit (pkgs) pango winetricks;
-        };
-        winePackages = [
-          pkgs.wine64Packages.stable
-          pkgs.wineWowPackages.stable
-        ];
-      in
-      corePackages ++ winePackages;
+      builtins.attrValues {
+        inherit (pkgs) pango winetricks;
+      }
+      ++ (with pkgs; [
+        wine64Packages.stable
+        wineWowPackages.stable
+      ]);
   };
-  handbrake = super.handbrake.override { useGtk = true; };
-  discord-ptb = super.discord.override { withVencord = true; };
-  ripgrep = super.ripgrep.override { withPCRE2 = true; };
-  papirus-icon-theme = super.papirus-icon-theme.override { color = "yellow"; };
-  blender = super.blender.override { cudaSupport = true; };
+  handbrake = prev.handbrake.override { useGtk = true; };
+  discord-ptb = prev.discord.override { withVencord = true; };
+  ripgrep = prev.ripgrep.override { withPCRE2 = true; };
+  papirus-icon-theme = prev.papirus-icon-theme.override { color = "yellow"; };
+  blender = prev.blender.override { cudaSupport = true; };
 }