diff options
| author | Alan Pearce | 2019-10-23 12:00:38 +0200 |
|---|---|---|
| committer | Alan Pearce | 2019-10-23 12:00:38 +0200 |
| commit | df7a564fcbb2f30385319e5ea17cad0b2046937a (patch) | |
| tree | bce86c9188ae2388e5108f174f9b92ca9db41f55 | |
| parent | a551b1a4227de9d0ebfea70d65614d0c63d092e9 (diff) | |
| parent | ddfcc76a810998203532731c05789cec81ca4fd0 (diff) | |
| download | nixfiles-df7a564fcbb2f30385319e5ea17cad0b2046937a.tar.lz nixfiles-df7a564fcbb2f30385319e5ea17cad0b2046937a.tar.zst nixfiles-df7a564fcbb2f30385319e5ea17cad0b2046937a.zip | |
Merge remote-tracking branch 'origin/master'
| -rw-r--r-- | user/settings/base.nix | 1 | ||||
| -rw-r--r-- | user/settings/development/base.nix | 7 |
2 files changed, 6 insertions, 2 deletions
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; }; + }) + ]; } |