[Overlays+Packages] Move unstable + nur overlays into package/unstable.nix

overlays.nix

@@ -2,15 +2,6 @@
 with lib;
 let
   cfg = config.aviallon.overlays;
-  unstable = import (fetchGit {
-    url = "https://github.com/NixOS/nixpkgs.git";
-    rev = "c573e3eaa8717fbabab3f9a58bfed637fb441eac";
-    ref = "nixos-unstable";
-  }) {
-    config = config.nixpkgs.config // { allowUnfree = true; } ;
-    overlays = config.nixpkgs.overlays;
-  };
-  nur = import (builtins.fetchTarball "https://github.com/nix-community/NUR/archive/master.tar.gz") { inherit pkgs; };
 in
 {
   options.aviallon.overlays = {
@@ -38,10 +29,6 @@ in
 
 
     nixpkgs.overlays = []
-      ++ [(self: super: {
-        inherit unstable;
-        inherit nur;
-      })]
       ++ optional cfg.traceCallPackage (self: super: {
         callPackage = path: overrides:
           let

packages.nix

@@ -10,6 +10,7 @@ in
   imports = [
     ./programs
     ./overlays.nix
+    ./packages/unstable.nix
     (mkRenamedOptionModule [ "aviallon" "programs" "compileFlags" ] [ "aviallon" "optimizations" "extraCompileFlags" ])
   ];
 
@@ -52,7 +53,6 @@ in
       rsync
       par2cmdline # .par2 archive verification
       python3
-      veracrypt
       parallel
       coreutils-full
       nmap
@@ -83,7 +83,6 @@ in
     };
 
     aviallon.programs.allowUnfreeList = [
-      "veracrypt"
     ];
 
     programs.ccache.enable = true;

packages/unstable.nix

@@ -0,0 +1,28 @@
+{ config, pkgs, lib, ... }:
+with lib;
+let
+  cfg = config.aviallon.overlays;
+  hardwareCfg = config.aviallon.hardware;
+  unstable = import (fetchGit {
+    url = "https://github.com/NixOS/nixpkgs.git";
+    ref = "nixos-unstable";
+  }) {
+    config = config.nixpkgs.config // { allowUnfree = true; } ;
+    overlays = config.nixpkgs.overlays;
+  };
+  nur = import (fetchGit {
+    url = "https://github.com/nix-community/NUR.git";
+    ref = "master";
+  }) {
+    inherit pkgs;
+  };
+in {
+  config = {
+    nixpkgs.overlays = mkBefore ([]
+      ++ [(final: prev: {
+        inherit nur;
+        inherit unstable;
+      })]
+    );
+  };
+}