This commit is contained in:
Asaki Yuki 2026-04-13 22:21:49 +07:00
parent 0538d591a3
commit f702ae8812
5 changed files with 9 additions and 35 deletions

View file

@ -1,23 +1,16 @@
{ {
config,
pkgs,
... ...
}: }:
{ {
programs = { programs = {
wget.enable = true;
tree.enable = true;
ffmpeg.enable = true; ffmpeg.enable = true;
nodejs.enable = true; nodejs.enable = true;
bun.enable = true; bun.enable = true;
brightnessctl.enable = true; brightnessctl.enable = true;
php.enable = true; php.enable = true;
ntfs3g.enable = true; ntfs3g.enable = true;
zip.enable = true;
unzip.enable = true;
python.enable = true; python.enable = true;
jdk.enable = true; jdk.enable = true;
nixfmt.enable = true;
winepackages.enable = true; winepackages.enable = true;
quickshell.enable = true; quickshell.enable = true;
papirus-icons.enable = true; papirus-icons.enable = true;

View file

@ -4,6 +4,7 @@
./programs.nix ./programs.nix
(libs.root "/modules/features/system/docker.nix") (libs.root "/modules/features/system/docker.nix")
(libs.root "/modules/features/system/packages.nix")
(libs.root "/home/asakiyuki/configuration.nix") (libs.root "/home/asakiyuki/configuration.nix")
(libs.root "/options/system/default.nix") (libs.root "/options/system/default.nix")

View file

@ -1,6 +1,5 @@
{ ... }: { ... }:
{ {
programs = { programs = {
}; };
} }

View file

@ -2,7 +2,6 @@
pkgs, pkgs,
lib, lib,
config, config,
rPackages,
... ...
}: }:
{ {
@ -12,21 +11,23 @@
git git
vim vim
btop btop
nixd wget
tree
nixd
nixfmt
zip
unzip
(lib.mkIf config.programs.wget.enable config.programs.wget.package)
(lib.mkIf config.programs.tree.enable config.programs.tree.package)
(lib.mkIf config.programs.ffmpeg.enable config.programs.ffmpeg.package) (lib.mkIf config.programs.ffmpeg.enable config.programs.ffmpeg.package)
(lib.mkIf config.programs.nodejs.enable config.programs.nodejs.package) (lib.mkIf config.programs.nodejs.enable config.programs.nodejs.package)
(lib.mkIf config.programs.bun.enable config.programs.bun.package) (lib.mkIf config.programs.bun.enable config.programs.bun.package)
(lib.mkIf config.programs.brightnessctl.enable config.programs.brightnessctl.package) (lib.mkIf config.programs.brightnessctl.enable config.programs.brightnessctl.package)
(lib.mkIf config.programs.php.enable config.programs.php.package) (lib.mkIf config.programs.php.enable config.programs.php.package)
(lib.mkIf config.programs.ntfs3g.enable config.programs.ntfs3g.package) (lib.mkIf config.programs.ntfs3g.enable config.programs.ntfs3g.package)
(lib.mkIf config.programs.zip.enable config.programs.zip.package)
(lib.mkIf config.programs.unzip.enable config.programs.unzip.package)
(lib.mkIf config.programs.python.enable config.programs.python.package) (lib.mkIf config.programs.python.enable config.programs.python.package)
(lib.mkIf config.programs.jdk.enable config.programs.jdk.package) (lib.mkIf config.programs.jdk.enable config.programs.jdk.package)
(lib.mkIf config.programs.nixfmt.enable config.programs.nixfmt.package)
(lib.mkIf config.programs.quickshell.enable config.programs.quickshell.package) (lib.mkIf config.programs.quickshell.enable config.programs.quickshell.package)
(lib.mkIf config.programs.papirus-icons.enable config.programs.papirus-icons.package) (lib.mkIf config.programs.papirus-icons.enable config.programs.papirus-icons.package)

View file

@ -21,14 +21,6 @@
}; };
options.programs = { options.programs = {
wget = {
enable = lib.mkEnableOption "wget";
package = lib.mkPackageOption pkgs "wget" { };
};
tree = {
enable = lib.mkEnableOption "tree";
package = lib.mkPackageOption pkgs "tree" { };
};
ffmpeg = { ffmpeg = {
enable = lib.mkEnableOption "ffmpeg"; enable = lib.mkEnableOption "ffmpeg";
package = lib.mkPackageOption pkgs "ffmpeg-full" { }; package = lib.mkPackageOption pkgs "ffmpeg-full" { };
@ -53,14 +45,6 @@
enable = lib.mkEnableOption "ntfs3g"; enable = lib.mkEnableOption "ntfs3g";
package = lib.mkPackageOption pkgs "ntfs3g" { }; package = lib.mkPackageOption pkgs "ntfs3g" { };
}; };
zip = {
enable = lib.mkEnableOption "zip";
package = lib.mkPackageOption pkgs "zip" { };
};
unzip = {
enable = lib.mkEnableOption "unzip";
package = lib.mkPackageOption pkgs "unzip" { };
};
python = { python = {
enable = lib.mkEnableOption "python"; enable = lib.mkEnableOption "python";
package = lib.mkPackageOption pkgs "python3" { }; package = lib.mkPackageOption pkgs "python3" { };
@ -69,10 +53,6 @@
enable = lib.mkEnableOption "jdk-25"; enable = lib.mkEnableOption "jdk-25";
package = lib.mkPackageOption pkgs "jdk25" { }; package = lib.mkPackageOption pkgs "jdk25" { };
}; };
nixfmt = {
enable = lib.mkEnableOption "nixfmt";
package = lib.mkPackageOption pkgs "nixfmt" { };
};
winepackages = { winepackages = {
enable = lib.mkEnableOption "Wine and Proton utilities"; enable = lib.mkEnableOption "Wine and Proton utilities";
packages = lib.mkOption { packages = lib.mkOption {