From ffe8d4aa9ade4cc09afc7782a089436a016b97e9 Mon Sep 17 00:00:00 2001
From: Danilo Reyes <CaptainJawZ@protonmail.com>
Date: Fri, 6 Dec 2024 18:40:59 -0600
Subject: [PATCH] better list concatenation + renamed vars on overlay

---
 gnome.nix   | 45 +++++++++++++++++++++------------------------
 overlay.nix | 39 ++++++++++++++++++---------------------
 2 files changed, 39 insertions(+), 45 deletions(-)

diff --git a/gnome.nix b/gnome.nix
index c153ef3..1beee71 100644
--- a/gnome.nix
+++ b/gnome.nix
@@ -28,28 +28,25 @@
     style = "adwaita";
   };
   users.users.jawz.packages =
-    let
-      packages = builtins.attrValues {
-        inherit (pkgs)
-          adw-gtk3 # theme legacy applications
-          gnome-tweaks # tweaks for the gnome desktop environment
-          papirus-icon-theme # icon theme
-          libgda # for pano shell extension
-          ;
-      };
-      extensions = builtins.attrValues {
-        inherit (pkgs.gnomeExtensions)
-          appindicator # applets for open applications
-          reading-strip # like putting a finger on every line I read
-          tactile # window manager
-          freon # hardware temperature monitor
-          gamemode-indicator-in-system-settings # I guess I'm a gamer now?
-          burn-my-windows # special effects for when closing windows
-          ;
-      };
-      otherPackages = [
-        config.nur.repos.zzzsy.gnome-shell-extension-pano
-      ];
-    in
-    packages ++ extensions ++ otherPackages;
+    builtins.attrValues {
+      inherit (pkgs)
+        adw-gtk3 # theme legacy applications
+        gnome-tweaks # tweaks for the gnome desktop environment
+        papirus-icon-theme # icon theme
+        libgda # for pano shell extension
+        ;
+    }
+    ++ builtins.attrValues {
+      inherit (pkgs.gnomeExtensions)
+        appindicator # applets for open applications
+        reading-strip # like putting a finger on every line I read
+        tactile # window manager
+        freon # hardware temperature monitor
+        gamemode-indicator-in-system-settings # I guess I'm a gamer now?
+        burn-my-windows # special effects for when closing windows
+        ;
+    }
+    ++ [
+      (pkgs.callPackage ./pkgs/pano/default.nix { })
+    ];
 }
diff --git a/overlay.nix b/overlay.nix
index c2b6c18..5cec845 100644
--- a/overlay.nix
+++ b/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; };
 }