summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--flake.nix4
-rw-r--r--lua/config/plugins/fuzzy.lua100
-rw-r--r--lua/config/plugins/init.lua2
-rw-r--r--lua/config/plugins/telescope.lua47
4 files changed, 104 insertions, 49 deletions
diff --git a/flake.nix b/flake.nix
index 7d4a3e4..dedd3f1 100644
--- a/flake.nix
+++ b/flake.nix
@@ -125,6 +125,8 @@
# this includes LSPs
lspsAndRuntimeDeps = {
general = with pkgs; {
+ fzf = [ fzf ];
+
treesitter = [
gcc
tree-sitter
@@ -197,7 +199,7 @@
flit-nvim
];
- telescope = [
+ fuzzy = [
telescope-nvim
fzf-lua
];
diff --git a/lua/config/plugins/fuzzy.lua b/lua/config/plugins/fuzzy.lua
new file mode 100644
index 0000000..fb3cd60
--- /dev/null
+++ b/lua/config/plugins/fuzzy.lua
@@ -0,0 +1,100 @@
+return {
+ -- NOTE: I left Telescope for compatibility purposes, in case if I need it one day
+ -- Everything is built on top of `fzf-lua` now
+ {
+ "telescope.nvim",
+ cmd = "Telescope",
+ after = function(_)
+ require("telescope").setup({})
+ require("telescope").load_extension("notify")
+ end,
+ },
+
+ {
+ "fzf-lua",
+ event = "DeferredUIEnter",
+ after = function(_)
+ require("fzf-lua").setup()
+ end,
+
+ keys = {
+ -- General
+ {
+ "<leader><leader>",
+ function()
+ require("fzf-lua").files()
+ end,
+ mode = { "n" },
+ desc = "Search Files",
+ },
+ {
+ "<leader><localleader>",
+ function()
+ require("fzf-lua").buffers()
+ end,
+ mode = { "n" },
+ desc = "Search Buffers",
+ },
+ {
+ "<leader>/",
+ function()
+ require("fzf-lua").live_grep()
+ end,
+ mode = { "n" },
+ desc = "Search Grep",
+ },
+ {
+ "<leader>:",
+ function()
+ require("fzf-lua").command_history()
+ end,
+ mode = { "n" },
+ desc = "Command History",
+ },
+
+ -- Search
+ {
+ "<leader>sR",
+ function()
+ require("fzf-lua").resume()
+ end,
+ mode = { "n" },
+ desc = "[R]esume [S]earch",
+ },
+ {
+ "<leader>sb",
+ function()
+ require("fzf-lua").buffers()
+ end,
+ mode = { "n" },
+ desc = "[S]earch [B]uffers",
+ },
+ {
+ "<leader>sf",
+ function()
+ require("fzf-lua").files()
+ end,
+ mode = { "n" },
+ desc = "[S]earch [F]iles",
+ },
+ {
+ "<leader>sg",
+ function()
+ require("fzf-lua").live_grep()
+ end,
+ mode = { "n" },
+ desc = "[S]earch [G]rep",
+ },
+
+ -- Code
+ {
+ "<leader>ca",
+ function()
+ require("fzf-lua").lsp_code_actions()
+ end,
+ mode = { "n" },
+ desc = "[C]ode [A]ctions",
+ },
+ },
+ },
+}
diff --git a/lua/config/plugins/init.lua b/lua/config/plugins/init.lua
index 4eb8b69..1ec4b50 100644
--- a/lua/config/plugins/init.lua
+++ b/lua/config/plugins/init.lua
@@ -50,7 +50,7 @@ require("lze").load({
{ import = "config.plugins.ui" },
{ import = "config.plugins.leap" },
- { import = "config.plugins.telescope" },
+ { import = "config.plugins.fuzzy" },
{ import = "config.plugins.treesitter" },
{ import = "config.plugins.mini" },
{ import = "config.plugins.completion" },
diff --git a/lua/config/plugins/telescope.lua b/lua/config/plugins/telescope.lua
deleted file mode 100644
index 05f6d59..0000000
--- a/lua/config/plugins/telescope.lua
+++ /dev/null
@@ -1,47 +0,0 @@
-return {
- {
- "telescope.nvim",
- cmd = "Telescope",
- keys = {
- {
- "<leader><leader>",
- function()
- require("telescope.builtin").find_files()
- end,
- mode = { "n" },
- desc = "Search Files",
- },
- {
- "<leader>sf",
- function()
- require("telescope.builtin").find_files()
- end,
- mode = { "n" },
- desc = "[S]earch [F]iles",
- },
- },
- after = function(_)
- require("telescope").setup({})
- require("telescope").load_extension("notify")
- end,
- },
-
- {
- "fzf-lua",
- event = "DeferredUIEnter",
- after = function(_)
- require("fzf-lua").setup()
- end,
-
- keys = {
- {
- "<leader>ca",
- function()
- require("fzf-lua").lsp_code_actions()
- end,
- mode = { "n" },
- desc = "[C]ode [A]ctions",
- },
- },
- },
-}