summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--hosts/thyme/packages.nix2
-rw-r--r--hosts/tomato/packages.nix2
-rw-r--r--modules/sets.nix16
3 files changed, 13 insertions, 7 deletions
diff --git a/hosts/thyme/packages.nix b/hosts/thyme/packages.nix
index 0386efa..9c9a0a1 100644
--- a/hosts/thyme/packages.nix
+++ b/hosts/thyme/packages.nix
@@ -7,13 +7,13 @@
cli.shell = true;
comm.im = true;
de.utils = true;
+ dl.tools.full = true;
gui.tools.full = true;
gui.theme = true;
gui.fonts = true;
image.utils = true;
image.tools = true;
mail.tools = true;
- manga.dl = true;
media.tools.full = true;
net.tools.full = true;
script.utils = true;
diff --git a/hosts/tomato/packages.nix b/hosts/tomato/packages.nix
index ffc6114..f3e215e 100644
--- a/hosts/tomato/packages.nix
+++ b/hosts/tomato/packages.nix
@@ -12,6 +12,7 @@ in
cli.shell = true;
comm.im = true;
de.utils = true;
+ dl.tools.full = true;
gui.tools.full = true;
gui.theme = true;
gui.fonts = true;
@@ -19,7 +20,6 @@ in
image.tools = true;
jp.study = true;
mail.tools = true;
- manga.dl = true;
media.tools.full = true;
net.tools.full = true;
script.utils = true;
diff --git a/modules/sets.nix b/modules/sets.nix
index 9048055..89d7203 100644
--- a/modules/sets.nix
+++ b/modules/sets.nix
@@ -25,6 +25,9 @@ in
cli.shell = lib.mkEnableOption "package set";
comm.im = lib.mkEnableOption "package set";
de.utils = lib.mkEnableOption "package set";
+ dl.tools.manga = lib.mkEnableOption "package set" // { default = cfg.dl.tools.full };
+ dl.tools.minimal = lib.mkEnableOption "package set" // { default = cfg.dl.tools.full };
+ dl.tools.full = lib.mkEnableOption "package set";
gui.tools.minimal = lib.mkEnableOption "package set" // { default = cfg.gui.tools.full; };
gui.tools.full = lib.mkEnableOption "package set";
gui.theme = lib.mkEnableOption "package set";
@@ -33,7 +36,6 @@ in
image.tools = lib.mkEnableOption "package set";
jp.study = lib.mkEnableOption "package set";
mail.tools = lib.mkEnableOption "package set";
- manga.dl = lib.mkEnableOption "package set";
media.tools.minimal = lib.mkEnableOption "package set" // { default = cfg.media.tools.full; };
media.tools.full = lib.mkEnableOption "package set";
net.tools.minimal = lib.mkEnableOption "package set" // { default = cfg.net.tools.full; };
@@ -70,6 +72,7 @@ in
wget
];
cli.tools.full = [
+ darkhttpd
git
lftp
gnumake
@@ -91,6 +94,13 @@ in
libnotify
pass
] ++ lib.optional cfg.de.useKeymapper keymapper;
+ dl.tools.manga = [
+ gallery-dl
+ img2pdf
+ ];
+ dl.tools.minimal = [
+ aria2
+ ];
gui.tools.minimal = [
autocutsel
rxvt-unicode
@@ -128,10 +138,6 @@ in
oauth2token
w3m
];
- manga.dl = [
- gallery-dl
- img2pdf
- ];
media.tools.minimal = [
mpv
yt-dlp