From b1e7be48b37adc932bac365d0ae10bdb6b0d9f9d Mon Sep 17 00:00:00 2001
From: Leyla Becker <git@jan-leila.com>
Date: Sun, 1 Jun 2025 14:27:50 -0500
Subject: [PATCH] moved packages to common-modules

---
 modules/common-modules/pkgs/default.nix       | 19 ++++++++++++++++---
 .../pkgs}/prostudiomasters.nix                |  0
 .../pkgs}/webtoon-dl.nix                      |  0
 modules/nixos-modules/default.nix             |  1 -
 modules/nixos-modules/packages/default.nix    | 17 -----------------
 5 files changed, 16 insertions(+), 21 deletions(-)
 rename modules/{nixos-modules/packages => common-modules/pkgs}/prostudiomasters.nix (100%)
 rename modules/{nixos-modules/packages => common-modules/pkgs}/webtoon-dl.nix (100%)
 delete mode 100644 modules/nixos-modules/packages/default.nix

diff --git a/modules/common-modules/pkgs/default.nix b/modules/common-modules/pkgs/default.nix
index 3e4456b..208ee24 100644
--- a/modules/common-modules/pkgs/default.nix
+++ b/modules/common-modules/pkgs/default.nix
@@ -1,4 +1,17 @@
-# this folder is for custom derivations
-{...}: {
-  # package = pkgs.callPackage ./package.nix {};
+{pkgs, ...}: {
+  nixpkgs.overlays = [
+    (final: prev: {
+      webtoon-dl =
+        pkgs.callPackage
+        ./webtoon-dl.nix
+        {};
+    })
+    # TODO: this package always needs to be called with the --in-process-gpu flag for some reason, can we automate that?
+    (final: prev: {
+      prostudiomasters =
+        pkgs.callPackage
+        ./prostudiomasters.nix
+        {};
+    })
+  ];
 }
diff --git a/modules/nixos-modules/packages/prostudiomasters.nix b/modules/common-modules/pkgs/prostudiomasters.nix
similarity index 100%
rename from modules/nixos-modules/packages/prostudiomasters.nix
rename to modules/common-modules/pkgs/prostudiomasters.nix
diff --git a/modules/nixos-modules/packages/webtoon-dl.nix b/modules/common-modules/pkgs/webtoon-dl.nix
similarity index 100%
rename from modules/nixos-modules/packages/webtoon-dl.nix
rename to modules/common-modules/pkgs/webtoon-dl.nix
diff --git a/modules/nixos-modules/default.nix b/modules/nixos-modules/default.nix
index d668a74..8cdeae9 100644
--- a/modules/nixos-modules/default.nix
+++ b/modules/nixos-modules/default.nix
@@ -15,7 +15,6 @@
     ./ai.nix
     ./tailscale.nix
     ./server
-    ./packages
   ];
 
   nixpkgs.config.permittedInsecurePackages = [
diff --git a/modules/nixos-modules/packages/default.nix b/modules/nixos-modules/packages/default.nix
deleted file mode 100644
index 208ee24..0000000
--- a/modules/nixos-modules/packages/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{pkgs, ...}: {
-  nixpkgs.overlays = [
-    (final: prev: {
-      webtoon-dl =
-        pkgs.callPackage
-        ./webtoon-dl.nix
-        {};
-    })
-    # TODO: this package always needs to be called with the --in-process-gpu flag for some reason, can we automate that?
-    (final: prev: {
-      prostudiomasters =
-        pkgs.callPackage
-        ./prostudiomasters.nix
-        {};
-    })
-  ];
-}