diff --git a/modules/home/profiles.nix b/modules/home/profiles.nix index 1ee659b..691b8cf 100644 --- a/modules/home/profiles.nix +++ b/modules/home/profiles.nix @@ -22,6 +22,7 @@ in { httpie = enabled; hyfetch = enabled; journalctl = enabled; + jq = enabled; nh = enabled; }; } diff --git a/modules/home/programs/default.nix b/modules/home/programs/default.nix index e55fa1f..839df62 100644 --- a/modules/home/programs/default.nix +++ b/modules/home/programs/default.nix @@ -16,6 +16,7 @@ ./httpie.nix ./hyfetch ./journalctl.nix + ./jq.nix ./nemo.nix ./nh.nix ./waybar.nix diff --git a/modules/home/programs/jq.nix b/modules/home/programs/jq.nix new file mode 100644 index 0000000..2a1182b --- /dev/null +++ b/modules/home/programs/jq.nix @@ -0,0 +1,20 @@ +{ + marleylib, + config, + osConfig, + lib, + ... +}: let + inherit (marleylib.module) mkEnableOption'; + + cfg = config.marleyos.programs.jq; + osCfg = osConfig.marleyos.programs.jq; +in { + options.marleyos.programs.jq.enable = mkEnableOption' "jq" osCfg.enable; + + config = lib.mkIf cfg.enable { + programs.jq = { + enable = true; + }; + }; +} diff --git a/modules/nixos/profiles.nix b/modules/nixos/profiles.nix index 2a0d97a..f6fd6dc 100644 --- a/modules/nixos/profiles.nix +++ b/modules/nixos/profiles.nix @@ -14,6 +14,7 @@ in { programs = { curl = enabled; fish = enabled; + jq = enabled; nh = enabled; }; diff --git a/modules/nixos/programs/default.nix b/modules/nixos/programs/default.nix index 4a9a25c..9516007 100644 --- a/modules/nixos/programs/default.nix +++ b/modules/nixos/programs/default.nix @@ -2,6 +2,7 @@ imports = [ ./curl.nix ./fish.nix + ./jq.nix ./nh.nix ./waybar.nix ]; diff --git a/snowflake/modules/home/programs/cli/jq/default.nix b/modules/nixos/programs/jq.nix similarity index 72% rename from snowflake/modules/home/programs/cli/jq/default.nix rename to modules/nixos/programs/jq.nix index 2657fcd..03cbfe4 100644 --- a/snowflake/modules/home/programs/cli/jq/default.nix +++ b/modules/nixos/programs/jq.nix @@ -1,6 +1,7 @@ { lib, config, + pkgs, ... }: let cfg = config.marleyos.programs.jq; @@ -8,8 +9,8 @@ in { options.marleyos.programs.jq.enable = lib.mkEnableOption "jq"; config = lib.mkIf cfg.enable { - programs.jq = { - enable = true; - }; + environment.systemPackages = with pkgs; [ + jq + ]; }; }