From ddfcc76a810998203532731c05789cec81ca4fd0 Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Tue, 22 Oct 2019 19:04:40 +0200
Subject: Move ripgrep to base, with PCRE2 in development/base

---
 user/settings/base.nix             | 1 +
 user/settings/development/base.nix | 7 +++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'user')

diff --git a/user/settings/base.nix b/user/settings/base.nix
index d39012de..7c187f7a 100644
--- a/user/settings/base.nix
+++ b/user/settings/base.nix
@@ -13,6 +13,7 @@
     sd
     entr
     file
+    ripgrep
     htop
     lsof
     iftop
diff --git a/user/settings/development/base.nix b/user/settings/development/base.nix
index c61e17d8..cd4f7220 100644
--- a/user/settings/development/base.nix
+++ b/user/settings/development/base.nix
@@ -12,8 +12,6 @@
     wrk
 
     ag
-    (ripgrep.override { withPCRE2 = true; })
-
     httpie
     jq
 
@@ -27,4 +25,9 @@
     ] else [
     ]
   );
+  nixpkgs.overlays = [
+    (self: super: {
+      ripgrep = super.ripgrep.override { withPCRE2 = true; };
+    })
+  ];
 }
-- 
cgit 1.4.1