diff --git a/modules/base/profiles.nix b/modules/base/profiles.nix index 06f6f80..058a541 100644 --- a/modules/base/profiles.nix +++ b/modules/base/profiles.nix @@ -18,6 +18,7 @@ in { less = enabled; neovim = enabled; nix-output-monitor = enabled; + ripgrep = enabled; }; } # diff --git a/modules/base/programs/default.nix b/modules/base/programs/default.nix index a083a24..9af6fab 100644 --- a/modules/base/programs/default.nix +++ b/modules/base/programs/default.nix @@ -6,5 +6,6 @@ ./less.nix ./neovim.nix ./nix-output-monitor.nix + ./ripgrep.nix ]; } diff --git a/snowflake/modules/home/programs/cli/ripgrep/default.nix b/modules/base/programs/ripgrep.nix similarity index 72% rename from snowflake/modules/home/programs/cli/ripgrep/default.nix rename to modules/base/programs/ripgrep.nix index 9cfdaf4..fb35207 100644 --- a/snowflake/modules/home/programs/cli/ripgrep/default.nix +++ b/modules/base/programs/ripgrep.nix @@ -1,6 +1,7 @@ { - lib, config, + lib, + pkgs, ... }: let cfg = config.marleyos.programs.ripgrep; @@ -8,6 +9,8 @@ in { options.marleyos.programs.ripgrep.enable = lib.mkEnableOption "ripgrep"; config = lib.mkIf cfg.enable { - programs.ripgrep.enable = true; + environment.systemPackages = with pkgs; [ + ripgrep + ]; }; } diff --git a/modules/home/profiles.nix b/modules/home/profiles.nix index 3a493ae..b43dcfc 100644 --- a/modules/home/profiles.nix +++ b/modules/home/profiles.nix @@ -27,6 +27,7 @@ in { less = enabled; man = enabled; nh = enabled; + ripgrep = enabled; }; } # diff --git a/modules/home/programs/default.nix b/modules/home/programs/default.nix index 4c7d9cd..39f87e3 100644 --- a/modules/home/programs/default.nix +++ b/modules/home/programs/default.nix @@ -24,6 +24,7 @@ ./neo.nix ./neovim.nix ./nh.nix + ./ripgrep.nix ./waybar.nix # TODO: uncomment when swaylock is figured out diff --git a/modules/home/programs/ripgrep.nix b/modules/home/programs/ripgrep.nix new file mode 100644 index 0000000..21d70b7 --- /dev/null +++ b/modules/home/programs/ripgrep.nix @@ -0,0 +1,19 @@ +{ + marleylib, + config, + osConfig, + lib, + ... +}: let + inherit (marleylib.module) mkEnableOption'; + + cfg = config.marleyos.programs.ripgrep; + osCfg = osConfig.marleyos.programs.ripgrep; +in { + options.marleyos.programs.ripgrep.enable = + mkEnableOption' "ripgrep" osCfg.enable; + + config = lib.mkIf cfg.enable { + programs.ripgrep.enable = true; + }; +}