diff --git a/common/default.nix b/common/default.nix
index a4464a4..4c2e6a3 100644
--- a/common/default.nix
+++ b/common/default.nix
@@ -13,7 +13,6 @@
     ./vars
 
     ./modules
-    ./pkgs
 
     nur.nixosModules.nur
     home-manager.nixosModules.home-manager
@@ -100,7 +99,6 @@
 
         ./home
         ./home/trash-d
-        ./pkgs
       ];
 
       home.packages =
diff --git a/common/home/packages.nix b/common/home/packages.nix
index fcf2fa2..a72afdc 100644
--- a/common/home/packages.nix
+++ b/common/home/packages.nix
@@ -1,10 +1,10 @@
 {
-  config,
   pkgs,
+  self,
   ...
 }: {
   home.packages =
-    (with config.customPkgs; [
+    (with self.packages.${pkgs.system}; [
       pokemon-colorscripts
       repl
     ])
diff --git a/common/pkgs/default.nix b/common/pkgs/default.nix
deleted file mode 100644
index 77d5d74..0000000
--- a/common/pkgs/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  lib,
-  pkgs,
-  ...
-} @ inputs: let
-  inherit (lib) concatMapAttrs filterAttrs mkOption pathExists types;
-
-  mkPackage = name: v: {
-    ${name} = pkgs.callPackage ./${name} inputs;
-  };
-
-  rmNotPackage = name: value:
-    value
-    == "directory"
-    && pathExists ./${name}/default.nix;
-
-  packages = filterAttrs rmNotPackage (builtins.readDir ./.);
-
-  pkgSet = concatMapAttrs mkPackage packages;
-in {
-  options.customPkgs = mkOption {
-    type = types.attrs;
-  };
-
-  config.customPkgs = pkgSet;
-}
diff --git a/devices/servivi/modules/minecraft.nix b/devices/servivi/modules/minecraft.nix
index 8adef46..892beb6 100644
--- a/devices/servivi/modules/minecraft.nix
+++ b/devices/servivi/modules/minecraft.nix
@@ -2,6 +2,7 @@
   config,
   nms,
   pkgs,
+  self,
   ...
 }: let
   inherit (config.vars) mainUser;
@@ -9,7 +10,7 @@ in {
   imports = [nms.nixosModules.default];
 
   environment.systemPackages = [
-    config.customPkgs.curseforge-server-downloader
+    self.packages.${pkgs.system}.curseforge-server-downloader
   ];
 
   systemd.services.mc-steampunk.path = with pkgs; [curl];
diff --git a/devices/wim/modules/security.nix b/devices/wim/modules/security.nix
index 154532f..e808d6f 100644
--- a/devices/wim/modules/security.nix
+++ b/devices/wim/modules/security.nix
@@ -1,18 +1,19 @@
 {
-  config,
   lib,
+  pkgs,
+  self,
   ...
 }: let
   inherit (lib) mkDefault mkBefore;
-  inherit (config.customPkgs) pam-fprint-grosshack;
+  inherit (self.packages.${pkgs.system}) pam-fprint-grosshack;
 
   pam_fprintd_grosshackSo = "${pam-fprint-grosshack}/lib/security/pam_fprintd_grosshack.so";
 
   # https://wiki.archlinux.org/title/Fprint#Login_configuration
   grosshackConf = ''
     # pam-fprint-grosshack
-    auth		sufficient  	${pam_fprintd_grosshackSo} timeout=99
-    auth		sufficient  	pam_unix.so try_first_pass nullok
+    auth  sufficient  ${pam_fprintd_grosshackSo} timeout=99
+    auth  sufficient  pam_unix.so try_first_pass nullok
   '';
 in {
   services.fprintd.enable = true;
diff --git a/flake.in.nix b/flake.in.nix
index 6b86ba8..0d8ff69 100644
--- a/flake.in.nix
+++ b/flake.in.nix
@@ -95,6 +95,10 @@
 
     nixOnDroidConfigurations.default = mkNixOnDroid [./devices/android];
 
+    packages =
+      perSystem (system: pkgs:
+        import ./pkgs ({inherit self system pkgs;} // inputs));
+
     devShells = perSystem (_: pkgs: {
       default = pkgs.mkShell {
         packages = with pkgs; [
diff --git a/modules/ags/default.nix b/modules/ags/default.nix
index 29d1daa..b6126c4 100644
--- a/modules/ags/default.nix
+++ b/modules/ags/default.nix
@@ -5,6 +5,7 @@
   gtk-session-lock,
   lib,
   pkgs,
+  self,
   ...
 }: let
   inherit (lib) boolToString;
@@ -101,7 +102,7 @@ in {
           // (import ./icons.nix {inherit pkgs agsConfigDir;});
 
         packages =
-          [config.customPkgs.coloryou]
+          [self.packages.${pkgs.system}.coloryou]
           ++ (with pkgs; [
             # ags
             dart-sass
diff --git a/common/pkgs/coloryou/LICENSE b/pkgs/coloryou/LICENSE
similarity index 100%
rename from common/pkgs/coloryou/LICENSE
rename to pkgs/coloryou/LICENSE
diff --git a/common/pkgs/coloryou/coloryou.py b/pkgs/coloryou/coloryou.py
similarity index 100%
rename from common/pkgs/coloryou/coloryou.py
rename to pkgs/coloryou/coloryou.py
diff --git a/common/pkgs/coloryou/default.nix b/pkgs/coloryou/default.nix
similarity index 100%
rename from common/pkgs/coloryou/default.nix
rename to pkgs/coloryou/default.nix
diff --git a/common/pkgs/coloryou/requirements.txt b/pkgs/coloryou/requirements.txt
similarity index 100%
rename from common/pkgs/coloryou/requirements.txt
rename to pkgs/coloryou/requirements.txt
diff --git a/common/pkgs/coloryou/setup.py b/pkgs/coloryou/setup.py
similarity index 100%
rename from common/pkgs/coloryou/setup.py
rename to pkgs/coloryou/setup.py
diff --git a/common/pkgs/coloryou/shell.nix b/pkgs/coloryou/shell.nix
similarity index 100%
rename from common/pkgs/coloryou/shell.nix
rename to pkgs/coloryou/shell.nix
diff --git a/common/pkgs/curseforge-server-downloader/default.nix b/pkgs/curseforge-server-downloader/default.nix
similarity index 100%
rename from common/pkgs/curseforge-server-downloader/default.nix
rename to pkgs/curseforge-server-downloader/default.nix
diff --git a/pkgs/default.nix b/pkgs/default.nix
new file mode 100644
index 0000000..dce7813
--- /dev/null
+++ b/pkgs/default.nix
@@ -0,0 +1,23 @@
+{
+  pkgs,
+  curseforge-server-downloader-src,
+  pam-fprint-grosshack-src,
+  pokemon-colorscripts-src,
+  ...
+}: {
+  coloryou = pkgs.callPackage ./coloryou {};
+
+  curseforge-server-downloader = pkgs.callPackage ./curseforge-server-downloader {
+    inherit curseforge-server-downloader-src;
+  };
+
+  pam-fprint-grosshack = pkgs.callPackage ./pam-fprint-grosshack {
+    inherit pam-fprint-grosshack-src;
+  };
+
+  pokemon-colorscripts = pkgs.callPackage ./pokemon-colorscripts {
+    inherit pokemon-colorscripts-src;
+  };
+
+  repl = pkgs.callPackage ./repl {};
+}
diff --git a/common/pkgs/pam-fprint-grosshack/default.nix b/pkgs/pam-fprint-grosshack/default.nix
similarity index 100%
rename from common/pkgs/pam-fprint-grosshack/default.nix
rename to pkgs/pam-fprint-grosshack/default.nix
diff --git a/common/pkgs/pokemon-colorscripts/default.nix b/pkgs/pokemon-colorscripts/default.nix
similarity index 100%
rename from common/pkgs/pokemon-colorscripts/default.nix
rename to pkgs/pokemon-colorscripts/default.nix
diff --git a/common/pkgs/repl/default.nix b/pkgs/repl/default.nix
similarity index 96%
rename from common/pkgs/repl/default.nix
rename to pkgs/repl/default.nix
index 38c3b90..d9a4667 100644
--- a/common/pkgs/repl/default.nix
+++ b/pkgs/repl/default.nix
@@ -17,7 +17,7 @@ in
       ;;
       *)
         if [ -z "$1" ]; then
-          nix repl --arg flakePath $(${coreutils}/bin/readlink -f "/etc/nixos") --file ${repl}
+          nix repl --arg flakePath $(${coreutils}/bin/readlink -f "$FLAKE") --file ${repl}
         else
           nix repl --arg flakePath $(${coreutils}/bin/readlink -f $1 | ${gnused}/bin/sed 's|/flake.nix||') --file ${repl}
         fi
diff --git a/common/pkgs/repl/repl.nix b/pkgs/repl/repl.nix
similarity index 100%
rename from common/pkgs/repl/repl.nix
rename to pkgs/repl/repl.nix