diff --git a/home/editors/default.nix b/home/editors/default.nix index 6b10877..2056944 100644 --- a/home/editors/default.nix +++ b/home/editors/default.nix @@ -5,10 +5,7 @@ home.packages = with pkgs; [ fzf ripgrep ]; - home.sessionVariables = with pkgs; { - EDITOR = "nvim"; - FZF_DEFAULT_COMMAND = "${ripgrep}/bin/rg --files --hidden"; - }; + home.sessionVariables.EDITOR = "nvim"; home.file.".editorconfig".text = '' [*] diff --git a/home/editors/neovim/default.nix b/home/editors/neovim/default.nix index e962a2e..30aca90 100644 --- a/home/editors/neovim/default.nix +++ b/home/editors/neovim/default.nix @@ -17,7 +17,7 @@ in { nvcode-color-schemes-vim editorconfig-nvim direnv-vim - fzf-vim + telescope-nvim lualine-nvim nvim-tree-lua toggleterm-nvim diff --git a/home/editors/neovim/init.lua b/home/editors/neovim/init.lua index 7a53291..39cd129 100644 --- a/home/editors/neovim/init.lua +++ b/home/editors/neovim/init.lua @@ -33,7 +33,9 @@ vim.g.closetag_regions = { local map = vim.api.nvim_set_keymap -map("", ";", ":Files", {}) +map("n", ";", ":lua require('telescope.builtin').find_files()", { noremap = true }) +map("n", ",", ":lua require('telescope.builtin').live_grep()", { noremap = true }) + require("nvim-tree").setup {} map("n", "", ":lua require('nvim-tree').toggle()", { noremap = true })