From b7bc5157f5ed85fcc029ad5ebea680aac5724612 Mon Sep 17 00:00:00 2001
From: Sean Buckley <sean.bck@gmail.com>
Date: Fri, 8 Oct 2021 23:20:14 -0400
Subject: [PATCH] move packages to separate file

---
 flake.nix        | 20 +-------------------
 pkgs/default.nix | 25 +++++++++++++++++++++++++
 2 files changed, 26 insertions(+), 19 deletions(-)
 create mode 100644 pkgs/default.nix

diff --git a/flake.nix b/flake.nix
index cddf306..219845e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -4,25 +4,7 @@
 
   outputs = { self, nixpkgs, impermanence, ... }:
     let
-      mypkgs = pkgs:
-        {
-          commander-x16 = pkgs.callPackage ./pkgs/commander-x16 { };
-          gef = pkgs.callPackage ./pkgs/gef { };
-          stretchy-spaces = pkgs.callPackage ./pkgs/stretchy-spaces { };
-          webshells = pkgs.callPackage ./pkgs/webshells { };
-          weevely = pkgs.callPackage ./pkgs/weevely { };
-        }
-        //
-        {
-          security-toolbox = pkgs.callPackage ./pkgs/security-toolbox {
-            pkgs = pkgs // self.packages.${pkgs.system};
-          };
-        }
-        // (if pkgs.system != "x86_64-linux" then { } else
-        {
-          binaryninja = pkgs.callPackage ./pkgs/binary-ninja-personal { };
-          packettracer = pkgs.callPackage ./pkgs/packettracer { };
-        });
+      mypkgs = import ./pkgs self;
     in
     {
       nixosModules =
diff --git a/pkgs/default.nix b/pkgs/default.nix
new file mode 100644
index 0000000..39a81f1
--- /dev/null
+++ b/pkgs/default.nix
@@ -0,0 +1,25 @@
+self:
+pkgs:
+
+let
+
+  allArchs =
+    {
+      commander-x16 = pkgs.callPackage ./commander-x16 { };
+      gef = pkgs.callPackage ./gef { };
+      stretchy-spaces = pkgs.callPackage ./stretchy-spaces { };
+      webshells = pkgs.callPackage ./webshells { };
+      weevely = pkgs.callPackage ./weevely { };
+      security-toolbox = pkgs.callPackage ./security-toolbox {
+        pkgs = pkgs // self.packages.${pkgs.system};
+      };
+    };
+
+  x64Lin =
+    {
+      binaryninja = pkgs.callPackage ./binary-ninja-personal { };
+      packettracer = pkgs.callPackage ./packettracer { };
+    };
+
+in
+allArchs // (if pkgs.system != "x86_64-linux" then { } else x64Lin)