diff --git a/configurations/nixos/horizon/configuration.nix b/configurations/nixos/horizon/configuration.nix index 99e3268..7e2ab8a 100644 --- a/configurations/nixos/horizon/configuration.nix +++ b/configurations/nixos/horizon/configuration.nix @@ -48,14 +48,9 @@ }; }; - environment.systemPackages = [ - (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? - (pkgs.callPackage - ./prostudiomasters.nix - {}) + environment.systemPackages = with pkgs; [ + webtoon-dl + prostudiomasters ]; programs = { diff --git a/modules/nixos-modules/default.nix b/modules/nixos-modules/default.nix index 8cdeae9..d668a74 100644 --- a/modules/nixos-modules/default.nix +++ b/modules/nixos-modules/default.nix @@ -15,6 +15,7 @@ ./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 new file mode 100644 index 0000000..208ee24 --- /dev/null +++ b/modules/nixos-modules/packages/default.nix @@ -0,0 +1,17 @@ +{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/configurations/nixos/horizon/prostudiomasters.nix b/modules/nixos-modules/packages/prostudiomasters.nix similarity index 100% rename from configurations/nixos/horizon/prostudiomasters.nix rename to modules/nixos-modules/packages/prostudiomasters.nix diff --git a/configurations/nixos/horizon/webtoon-dl.nix b/modules/nixos-modules/packages/webtoon-dl.nix similarity index 100% rename from configurations/nixos/horizon/webtoon-dl.nix rename to modules/nixos-modules/packages/webtoon-dl.nix