From e462306e6ea88737b2424938d13b12de855b3c50 Mon Sep 17 00:00:00 2001
From: Antoine Viallon <antoine@lesviallon.fr>
Date: Fri, 25 Mar 2022 03:01:37 +0100
Subject: [PATCH] [Packages+Overlays] Move several package overrides in
 overlays Makes them available for everyone and everything. Add Veracrypt

Signed-off-by: Antoine Viallon <antoine@lesviallon.fr>
---
 desktop.nix  | 12 +++++-------
 overlays.nix | 23 ++++++++++++++++++++++-
 packages.nix | 25 +------------------------
 3 files changed, 28 insertions(+), 32 deletions(-)

diff --git a/desktop.nix b/desktop.nix
index 0d9f810..8921019 100644
--- a/desktop.nix
+++ b/desktop.nix
@@ -202,9 +202,7 @@ in {
       yakuake
       pinentry-qt
       plasma-pa
-      ( ark.override {
-        unfreeEnableUnrar = true;
-      } )
+      ark
       p7zip
       vlc
       skanlite
@@ -215,13 +213,13 @@ in {
       korganizer
     ];
 
-    services.packagekit.enable = true;
-    
     aviallon.programs.allowUnfreeList = [
-      "unrar"
-      "ark"
+      "spotify"
+      "spotify-unwrapped"
     ];
 
+    services.packagekit.enable = true;
+    
     networking.networkmanager = {
       packages = [
         pkgs.networkmanager-openvpn
diff --git a/overlays.nix b/overlays.nix
index 70729e6..73e1355 100644
--- a/overlays.nix
+++ b/overlays.nix
@@ -3,6 +3,13 @@ with lib;
 let
   cfg = config.aviallon.overlays;
   unstable = import (builtins.fetchTarball "https://github.com/NixOS/nixpkgs/archive/nixos-unstable.tar.gz") { config = config.nixpkgs.config; };
+  optimizeWithFlag = pkg: flag:
+    pkg.overrideAttrs (attrs: {
+      NIX_CFLAGS_COMPILE = (attrs.NIX_CFLAGS_COMPILE or "") + " ${flag}";
+      doCheck = false;
+    });
+  optimizeWithFlags = pkg: flags: pkgs.lib.foldl' (pkg: flag: optimizeWithFlag pkg flag) pkg flags;
+  optimizeForThisHost = pkg: optimizeWithFlags pkg (builtins.trace "${getName pkg}: ${toString config.aviallon.programs.compileFlags}" config.aviallon.programs.compileFlags);
 in
 {
   options.aviallon.overlays = {
@@ -25,12 +32,26 @@ in
     nixpkgs.overlays = [
       (self: super: {
           inherit unstable;
-       })
+      })
+      (self: super: {
+        opensshOptimized = optimizeForThisHost super.openssh;
+        rsyncOptimized = optimizeForThisHost super.rsync;
+        nano = optimizeForThisHost super.nano;
+        veracrypt = optimizeForThisHost pkgs.veracrypt;
+        steam = super.steam.override {
+          withJava = true;
+        };
+        ark = optimizeForThisHost (super.ark.override {
+          unfreeEnableUnrar = true;
+        });
+      })
     #  (self: super: {
     #    nur = import (builtins.fetchTarball "https://github.com/nix-community/NUR/archive/master.tar.gz") {
     #      inherit pkgs;
     #    };
     #  })
     ];
+
+    aviallon.programs.allowUnfreeList = [ "unrar" "ark" ];
   }; 
 }
diff --git a/packages.nix b/packages.nix
index 27f95e3..1ae2e8b 100644
--- a/packages.nix
+++ b/packages.nix
@@ -5,19 +5,13 @@ let
   desktopCfg = config.aviallon.desktop;
   generalCfg = config.aviallon.general;
 
-  optimizeWithFlag = pkg: flag:
-    pkg.overrideAttrs (attrs: {
-      NIX_CFLAGS_COMPILE = (attrs.NIX_CFLAGS_COMPILE or "") + " ${flag}";
-      doCheck = false;
-    });
-  optimizeWithFlags = pkg: flags: pkgs.lib.foldl' (pkg: flag: optimizeWithFlag pkg flag) pkg flags;
-  optimizeForThisHost = pkg: optimizeWithFlags pkg (builtins.trace "${toString config.aviallon.programs.compileFlags}" config.aviallon.programs.compileFlags);
 in
 {
   imports = [
     ./programs/nano.nix
     ./programs/git.nix
     ./programs/htop.nix
+    ./overlays.nix
   ];
 
   options.aviallon.programs = {
@@ -45,23 +39,6 @@ in
 
     programs.java.enable = true;
 
-    nixpkgs.config.packageOverrides = pkgs: {
-      nano = optimizeForThisHost pkgs.nano;
-      rsyncOptimized = optimizeForThisHost pkgs.rsync;
-
-      opensshOptimized = optimizeForThisHost pkgs.openssh;
-
-      steam = pkgs.steam.override {
-        withJava = true;
-      };
-
-      veracrypt = optimizeForThisHost pkgs.veracrypt;
-
-      nur = import (builtins.fetchTarball "https://github.com/nix-community/NUR/archive/master.tar.gz") {
-        inherit pkgs;
-      };
-    };
-
     nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) cfg.allowUnfreeList;
 
     environment.systemPackages = with pkgs; with libsForQt5; [