From 7f3acddfee82b39c007df97822df884a303160ae Mon Sep 17 00:00:00 2001 From: Anthony Cicchetti Date: Fri, 12 Apr 2024 15:05:35 -0400 Subject: [PATCH] some telescope --- flake.lock | 40 +++++++++---------- nix/home-manager/flake.lock | 12 +++--- nix/home-manager/modules/packages/neovim.nix | 2 + .../modules/packages/neovim/telescope.lua | 4 +- 4 files changed, 31 insertions(+), 27 deletions(-) diff --git a/flake.lock b/flake.lock index def4c42..0a10987 100644 --- a/flake.lock +++ b/flake.lock @@ -11,11 +11,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1710475558, - "narHash": "sha256-egKrPCKjy/cE+NqCj4hg2fNX/NwLCf0bRDInraYXDgs=", + "lastModified": 1712055811, + "narHash": "sha256-7FcfMm5A/f02yyzuavJe06zLa9hcMHsagE28ADcmQvk=", "owner": "cachix", "repo": "cachix", - "rev": "661bbb7f8b55722a0406456b15267b5426a3bda6", + "rev": "02e38da89851ec7fec3356a5c04bc8349cae0e30", "type": "github" }, "original": { @@ -33,11 +33,11 @@ "pre-commit-hooks": "pre-commit-hooks_2" }, "locked": { - "lastModified": 1712724616, - "narHash": "sha256-qs9uEbrOpp6oXcDOp5cpilyU52t78ZpEPATtaHRVLIU=", + "lastModified": 1712925466, + "narHash": "sha256-MJ6VxGNu/ftbn8SErJjBz80FUNXkZfcObHg/JP7wwAc=", "owner": "cachix", "repo": "devenv", - "rev": "d1a11d14dbe96a03c7f9068e4d3af05f283734e0", + "rev": "1af93652caf48bfeef6ba7d1cf59fc66e506e5c2", "type": "github" }, "original": { @@ -316,11 +316,11 @@ "nixpkgs-regression": "nixpkgs-regression_2" }, "locked": { - "lastModified": 1710500156, - "narHash": "sha256-zvCqeUO2GLOm7jnU23G4EzTZR7eylcJN+HJ5svjmubI=", + "lastModified": 1712911606, + "narHash": "sha256-BGvBhepCufsjcUkXnEEXhEVjwdJAwPglCC2+bInc794=", "owner": "domenkozar", "repo": "nix", - "rev": "c5bbf14ecbd692eeabf4184cc8d50f79c2446549", + "rev": "b24a9318ea3f3600c1e24b4a00691ee912d4de12", "type": "github" }, "original": { @@ -412,11 +412,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1710236354, - "narHash": "sha256-vWrciFdq49vve43g4pbi7NjmL4cwG1ifXnQx+dU3T5E=", + "lastModified": 1710796454, + "narHash": "sha256-lQlICw60RhH8sHTDD/tJiiJrlAfNn8FDI9c+7G2F0SE=", "owner": "cachix", "repo": "devenv-nixpkgs", - "rev": "829e73affeadfb4198a7105cbe3a03153d13edc9", + "rev": "06fb0f1c643aee3ae6838dda3b37ef0abc3c763b", "type": "github" }, "original": { @@ -428,12 +428,12 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1712608508, - "narHash": "sha256-vMZ5603yU0wxgyQeHJryOI+O61yrX2AHwY6LOFyV1gM=", - "rev": "4cba8b53da471aea2ab2b0c1f30a81e7c451f4b6", - "revCount": 609462, + "lastModified": 1712791164, + "narHash": "sha256-3sbWO1mbpWsLepZGbWaMovSO7ndZeFqDSdX0hZ9nVyw=", + "rev": "1042fd8b148a9105f3c0aca3a6177fd1d9360ba5", + "revCount": 610435, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.609462%2Brev-4cba8b53da471aea2ab2b0c1f30a81e7c451f4b6/018ec465-ecc0-7383-ad59-bf84009e7b07/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.610435%2Brev-1042fd8b148a9105f3c0aca3a6177fd1d9360ba5/018ed02d-7ab0-7d1c-9ebe-c075011335be/source.tar.gz" }, "original": { "type": "tarball", @@ -506,11 +506,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1712055707, - "narHash": "sha256-4XLvuSIDZJGS17xEwSrNuJLL7UjDYKGJSbK1WWX2AK8=", + "lastModified": 1712897695, + "narHash": "sha256-nMirxrGteNAl9sWiOhoN5tIHyjBbVi5e2tgZUgZlK3Y=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "e35aed5fda3cc79f88ed7f1795021e559582093a", + "rev": "40e6053ecb65fcbf12863338a6dcefb3f55f1bf8", "type": "github" }, "original": { diff --git a/nix/home-manager/flake.lock b/nix/home-manager/flake.lock index 6c2ac06..c9939eb 100644 --- a/nix/home-manager/flake.lock +++ b/nix/home-manager/flake.lock @@ -44,11 +44,11 @@ ] }, "locked": { - "lastModified": 1712730572, - "narHash": "sha256-rAVvdP77rEmgobvSgybqPAcHefv5dCXPH/ge6Ds+JtU=", + "lastModified": 1712759992, + "narHash": "sha256-2APpO3ZW4idlgtlb8hB04u/rmIcKA8O7pYqxF66xbNY=", "owner": "nix-community", "repo": "home-manager", - "rev": "18f89ef74f0d48635488ccd6a5e30dc9d48a3a87", + "rev": "31357486b0ef6f4e161e002b6893eeb4fafc3ca9", "type": "github" }, "original": { @@ -187,11 +187,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1712751839, - "narHash": "sha256-ildzKRp35lZ+9M/Zn2nZ4/wpWFGawkeVluTqwtbCREs=", + "lastModified": 1712925868, + "narHash": "sha256-KMQqDZXbjPZBZ/kmBvOTbtWKq5m3D1AnFxu9ujv/Qgw=", "owner": "nixOS", "repo": "nixpkgs", - "rev": "9aa0ca552e5bd9f07357740c0f4710a4858234b3", + "rev": "8f1a3fbaa92f1d59b09f2d24af6a607b5a280071", "type": "github" }, "original": { diff --git a/nix/home-manager/modules/packages/neovim.nix b/nix/home-manager/modules/packages/neovim.nix index e8077ed..a4e9e2f 100644 --- a/nix/home-manager/modules/packages/neovim.nix +++ b/nix/home-manager/modules/packages/neovim.nix @@ -191,6 +191,8 @@ telescope-symbols-nvim nvim-web-devicons lsp-signature-nvim + nvim-rg + telescope-egrepify-nvim ]); mappings = { normal = { diff --git a/nix/home-manager/modules/packages/neovim/telescope.lua b/nix/home-manager/modules/packages/neovim/telescope.lua index 0653da3..e142b53 100644 --- a/nix/home-manager/modules/packages/neovim/telescope.lua +++ b/nix/home-manager/modules/packages/neovim/telescope.lua @@ -1,11 +1,13 @@ require("telescope").load_extension("zf-native") require("telescope").load_extension("projects") +require("telescope").load_extension("egrepify") local builtin = require("telescope.builtin") -- greps vim.keymap.set("n", "ff", builtin.find_files, { desc = "Find Files" }) -vim.keymap.set("n", "fg", builtin.live_grep, { desc = "Live Grep" }) +-- vim.keymap.set("n", "fg", builtin.live_grep, { desc = "Live Grep" }) +vim.keymap.set("n", "fg", require("telescope").extensions.egrepify.egrepify, { desc = "Live Grep" }) vim.keymap.set("n", "fb", builtin.buffers, { desc = "Buffers" }) -- register reading