From 0d9df06bcea29b1fe0deb6a261ba791ee10e4a3c Mon Sep 17 00:00:00 2001 From: Noah Masur <7386960+nmasur@users.noreply.github.com> Date: Mon, 10 Apr 2023 15:35:06 -0400 Subject: [PATCH] switch from telescope-project.nvim to project.nvim --- modules/common/neovim/config/telescope.lua | 4 ++-- modules/common/neovim/config/telescope.nix | 5 +++-- modules/common/neovim/config/tree.nix | 4 +++- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/modules/common/neovim/config/telescope.lua b/modules/common/neovim/config/telescope.lua index 7cf47ef..b6f4c59 100644 --- a/modules/common/neovim/config/telescope.lua +++ b/modules/common/neovim/config/telescope.lua @@ -45,7 +45,7 @@ end) vim.keymap.set("n", "fz", require("telescope").extensions.zoxide.list) -- Project -require("telescope").load_extension("project") +require("telescope").load_extension("projects") vim.keymap.set("n", "", function() local opts = require("telescope.themes").get_ivy({ layout_config = { @@ -54,7 +54,7 @@ vim.keymap.set("n", "", function() }, }, }) - require("telescope").extensions.project.project(opts) + require("telescope").extensions.projects.projects(opts) end) -- File browser diff --git a/modules/common/neovim/config/telescope.nix b/modules/common/neovim/config/telescope.nix index e4ffacf..1bd5b5c 100644 --- a/modules/common/neovim/config/telescope.nix +++ b/modules/common/neovim/config/telescope.nix @@ -2,7 +2,7 @@ plugins = [ pkgs.vimPlugins.telescope-nvim - pkgs.vimPlugins.telescope-project-nvim + pkgs.vimPlugins.project-nvim pkgs.vimPlugins.telescope-fzy-native-nvim pkgs.vimPlugins.telescope-file-browser-nvim pkgs.vimPlugins.telescope-zoxide @@ -25,10 +25,11 @@ extensions = { fzy_native = { }; zoxide = { }; - project = { base_dirs = [ "~/dev" ]; }; }; }; + setup.project_nvim = { }; + lua = builtins.readFile ./telescope.lua; } diff --git a/modules/common/neovim/config/tree.nix b/modules/common/neovim/config/tree.nix index bffa3b4..69f9aff 100644 --- a/modules/common/neovim/config/tree.nix +++ b/modules/common/neovim/config/tree.nix @@ -12,9 +12,11 @@ setup.nvim-tree = { disable_netrw = true; hijack_netrw = true; + sync_root_with_cwd = true; + respect_buf_cwd = true; update_focused_file = { enable = true; - update_cwd = true; + update_root = true; ignore_list = { }; }; diagnostics = {