From 3b1d57701890521ea859c0a3e46bace5a7c22d7b Mon Sep 17 00:00:00 2001 From: smayzy Date: Tue, 8 Jul 2025 23:16:58 +0200 Subject: [PATCH] move basic cli pkgs that doesn't need extra config to a module --- hosts/common/common.nix | 7 ------- modules/nix/base-cli/default.nix | 1 + modules/nix/base-cli/pkgs.nix | 23 +++++++++++++++++++++++ modules/nix/groups/base.nix | 2 +- 4 files changed, 25 insertions(+), 8 deletions(-) create mode 100644 modules/nix/base-cli/pkgs.nix diff --git a/hosts/common/common.nix b/hosts/common/common.nix index a3cb712..5949dd6 100644 --- a/hosts/common/common.nix +++ b/hosts/common/common.nix @@ -16,24 +16,17 @@ environment.systemPackages = with pkgs; [ home-manager - wget kitty - tldr fastfetch - tree font-awesome - dig - btop thunderbird lf - file qalculate-qt baobab arduino-ide piper element-desktop calibre - vlc loupe gimp3 mullvad-vpn diff --git a/modules/nix/base-cli/default.nix b/modules/nix/base-cli/default.nix index 3137654..4e1726a 100644 --- a/modules/nix/base-cli/default.nix +++ b/modules/nix/base-cli/default.nix @@ -4,5 +4,6 @@ ./nh.nix ./nvf.nix ./fzf.nix + ./pkgs.nix ]; } diff --git a/modules/nix/base-cli/pkgs.nix b/modules/nix/base-cli/pkgs.nix new file mode 100644 index 0000000..42ba3ee --- /dev/null +++ b/modules/nix/base-cli/pkgs.nix @@ -0,0 +1,23 @@ +{ config, lib, pkgs, ...}: +let + inherit (lib) mkIf mkOption types; +in +{ + options.smayzy.base-cli-pkgs.enable = mkOption { + type = types.bool; + default = false; + description = "install base cli pkgs that doesn't need extra config"; + }; + + config = mkIf config.smayzy.base-cli-pkgs.enable { + environment.systemPackages = with pkgs; [ + wget + tldr + tree + dig + btop + file + vim + ]; + }; +} diff --git a/modules/nix/groups/base.nix b/modules/nix/groups/base.nix index a7888c9..0a662c4 100644 --- a/modules/nix/groups/base.nix +++ b/modules/nix/groups/base.nix @@ -15,7 +15,7 @@ in nh.enable = true; fzf.enable = true; zsh.enable = true; - + base-cli-pkgs.enable = true; }; }; }