From 36ca6d82e48abd96aca818a27f86de27068fca04 Mon Sep 17 00:00:00 2001
From: Antoine Viallon <antoine@lesviallon.fr>
Date: Fri, 24 Mar 2023 21:11:14 +0100
Subject: [PATCH] [Optimizations] Move optimizations into subfolder

---
 default.nix                                          | 2 +-
 optimizations/default.nix                            | 6 ++++++
 optimizations.nix => optimizations/optimizations.nix | 8 +++++++-
 3 files changed, 14 insertions(+), 2 deletions(-)
 create mode 100644 optimizations/default.nix
 rename optimizations.nix => optimizations/optimizations.nix (96%)

diff --git a/default.nix b/default.nix
index a93d773..173992b 100644
--- a/default.nix
+++ b/default.nix
@@ -15,7 +15,7 @@
     ./laptop.nix
     ./power.nix
     ./overlays.nix
-    ./optimizations.nix
+    ./optimizations
     ./non-persistence.nix
   ];
 }
diff --git a/optimizations/default.nix b/optimizations/default.nix
new file mode 100644
index 0000000..fb7a586
--- /dev/null
+++ b/optimizations/default.nix
@@ -0,0 +1,6 @@
+{ config, ... }:
+{
+  imports = [
+    ./optimizations.nix
+  ];
+}
diff --git a/optimizations.nix b/optimizations/optimizations.nix
similarity index 96%
rename from optimizations.nix
rename to optimizations/optimizations.nix
index c0635af..308ba41 100644
--- a/optimizations.nix
+++ b/optimizations/optimizations.nix
@@ -160,7 +160,7 @@ in
   };
 
   config = mkIf cfg.enable {
-    nixpkgs.overlays = mkBefore [
+    nixpkgs.overlays = mkAfter [
       (self: super: {
         fastStdenv = super.overrideCC super.gccStdenv (super.buildPackages.gcc_latest.overrideAttrs (old:
           let
@@ -194,6 +194,12 @@ in
           lto = true;
           extraCFlags = cfg.extraCompileFlags;
         } super.mesa;
+        optipngOptimized = optimizePkg {
+          level = "unsafe";
+          lto = true;
+          recursive = 1;
+          parallelize = generalCfg.cores;
+        } super.optipng;
       })
     ];
   };