From 7b4162333a7774d5b1fe0848995d8e316686ff64 Mon Sep 17 00:00:00 2001 From: Alan Pearce Date: Sun, 20 Aug 2023 18:06:44 +0200 Subject: base: use ripgrep module to supply custom package and arguments --- user/settings/base.nix | 8 +++++++- user/settings/development/base.nix | 5 ----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/user/settings/base.nix b/user/settings/base.nix index c3691c53..49ff04bf 100644 --- a/user/settings/base.nix +++ b/user/settings/base.nix @@ -52,12 +52,18 @@ }; }; programs.nix-index-database.comma.enable = true; + programs.ripgrep = { + enable = true; + package = pkgs.ripgrep.override { withPCRE2 = true; }; + arguments = [ + "--smart-case" + ]; + }; home.packages = with pkgs; [ pv fd sd - ripgrep knot-dns dateutils moreutils diff --git a/user/settings/development/base.nix b/user/settings/development/base.nix index ff59df87..f619324f 100644 --- a/user/settings/development/base.nix +++ b/user/settings/development/base.nix @@ -39,11 +39,6 @@ in docker-client ]; - nixpkgs.overlays = [ - (self: super: { - ripgrep = super.ripgrep.override { withPCRE2 = true; }; - }) - ]; home.sessionVariables = { FLY_NO_UPDATE_CHECK = "1"; LIMA_INSTANCE = "nixos"; -- cgit 1.4.1