diff --git a/modules/base/profiles.nix b/modules/base/profiles.nix index 6e53694..a061856 100644 --- a/modules/base/profiles.nix +++ b/modules/base/profiles.nix @@ -12,6 +12,7 @@ in { # Universal - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - { programs = { + btop = enabled; curl = enabled; fish = enabled; jq = enabled; diff --git a/snowflake/modules/home/programs/tui/btop/default.nix b/modules/base/programs/btop.nix similarity index 58% rename from snowflake/modules/home/programs/tui/btop/default.nix rename to modules/base/programs/btop.nix index e4ded59..8e49fa0 100644 --- a/snowflake/modules/home/programs/tui/btop/default.nix +++ b/modules/base/programs/btop.nix @@ -1,6 +1,7 @@ { - lib, config, + lib, + pkgs, ... }: let cfg = config.marleyos.programs.btop; @@ -8,13 +9,8 @@ in { options.marleyos.programs.btop.enable = lib.mkEnableOption "btop"; config = lib.mkIf cfg.enable { - programs.btop = { - enable = true; - - settings = { - truecolor = true; - vim_keys = true; - }; - }; + environment.systemPackages = with pkgs; [ + btop + ]; }; } diff --git a/modules/base/programs/default.nix b/modules/base/programs/default.nix index 619cf59..bf59198 100644 --- a/modules/base/programs/default.nix +++ b/modules/base/programs/default.nix @@ -1,5 +1,6 @@ { imports = [ + ./btop.nix ./curl.nix ./fish.nix ./jq.nix diff --git a/modules/home/profiles.nix b/modules/home/profiles.nix index d10e6a9..5744658 100644 --- a/modules/home/profiles.nix +++ b/modules/home/profiles.nix @@ -14,6 +14,7 @@ in { programs = { agenix = enabled; bat = enabled; + btop = enabled; curl = enabled; eza = enabled; figlet = enabled; diff --git a/modules/home/programs/btop.nix b/modules/home/programs/btop.nix new file mode 100644 index 0000000..ead53a5 --- /dev/null +++ b/modules/home/programs/btop.nix @@ -0,0 +1,25 @@ +{ + marleylib, + lib, + config, + osConfig, + ... +}: let + inherit (marleylib.module) mkEnableOption'; + + cfg = config.marleyos.programs.btop; + osCfg = osConfig.marleyos.programs.btop; +in { + options.marleyos.programs.btop.enable = mkEnableOption' "btop" osCfg.enable; + + config = lib.mkIf cfg.enable { + programs.btop = { + enable = true; + + settings = { + truecolor = true; + vim_keys = true; + }; + }; + }; +} diff --git a/modules/home/programs/default.nix b/modules/home/programs/default.nix index 772078d..d32d4cb 100644 --- a/modules/home/programs/default.nix +++ b/modules/home/programs/default.nix @@ -3,6 +3,7 @@ ./agenix.nix ./amfora ./bat.nix + ./btop.nix ./cheat.nix ./curl.nix ./eza.nix