From 0483f192f8fbaf9fa764f52aa9e2724aab035e97 Mon Sep 17 00:00:00 2001
From: Marko Korhonen <marko@korhonen.cc>
Date: Wed, 4 Aug 2021 11:42:37 +0300
Subject: [PATCH] Remove fzf-native for now, add telescope keybinds

---
 home/.config/nvim/lua/keybinds.lua             |  6 +++---
 home/.config/nvim/lua/pluginconf/telescope.lua | 12 +-----------
 home/.config/nvim/lua/pluginmanager.lua        | 17 +++++++++++++----
 3 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/home/.config/nvim/lua/keybinds.lua b/home/.config/nvim/lua/keybinds.lua
index 2ee1163..dc058db 100644
--- a/home/.config/nvim/lua/keybinds.lua
+++ b/home/.config/nvim/lua/keybinds.lua
@@ -7,9 +7,9 @@ end
 -- Open/close nerdtree
 map('', '<C-t>', '<cmd>NERDTreeToggle<CR>')
 
--- FZF
-map('n', '<C-f>', '<cmd>Telescope find_files<CR>')
-map('n', '<C-g>', '<cmd>Rg<CR>')
+-- Telescope
+map('n', '<C-f>', '<cmd>Telescope find_files find_command=fd,-Ht,f<CR>')
+map('n', '<C-g>', '<cmd>Telescope live_grep<CR>')
 
 -- Completion
 -- Navigate completions with tab and shift tab
diff --git a/home/.config/nvim/lua/pluginconf/telescope.lua b/home/.config/nvim/lua/pluginconf/telescope.lua
index 434819c..e931d68 100644
--- a/home/.config/nvim/lua/pluginconf/telescope.lua
+++ b/home/.config/nvim/lua/pluginconf/telescope.lua
@@ -32,15 +32,5 @@ require('telescope').setup {
         -- Developer configurations: Not meant for general override
         buffer_previewer_maker = require'telescope.previewers'.buffer_previewer_maker
     },
-    pickers = {find_files = {find_command = {"fd", "-Ht", "f"}}},
-    extensions = {
-        fzf = {
-            fuzzy = true,
-            override_generic_sorter = false,
-            override_file_sorter = true,
-            case_mode = "smart_case"
-        }
-    }
+    pickers = {find_files = {find_command = {"fd", "-Ht", "f"}}}
 }
-
-require('telescope').load_extension('fzf');
diff --git a/home/.config/nvim/lua/pluginmanager.lua b/home/.config/nvim/lua/pluginmanager.lua
index ad450b4..1739d2f 100644
--- a/home/.config/nvim/lua/pluginmanager.lua
+++ b/home/.config/nvim/lua/pluginmanager.lua
@@ -28,6 +28,7 @@ require('packer').startup(function()
     -- Tree explorer
     use 'scrooloose/nerdtree'
 
+    -- Telescope
     use {
         'nvim-telescope/telescope.nvim',
         requires = {{'nvim-lua/popup.nvim'}, {'nvim-lua/plenary.nvim'}}
@@ -39,14 +40,22 @@ require('packer').startup(function()
     -- Configs for built-in LSP
     use 'neovim/nvim-lspconfig'
 
-	-- Install LSP executables
-	use 'kabouzeid/nvim-lspinstall'
+    -- Install LSP executables
+    use 'kabouzeid/nvim-lspinstall'
 
     -- Completion framework
     use 'nvim-lua/completion-nvim'
 
-    -- Treesitter syntax highlight
-    use {'nvim-treesitter/nvim-treesitter', branch = '0.5-compat', run = ':TSUpdate'}
+    -- treesitter syntax highlight
+    use {
+        'nvim-treesitter/nvim-treesitter',
+        branch = '0.5-compat',
+        run = ':TSUpdate'
+    }
+
+	-- Syntax highlighting for languages
+	-- that are not supported by treesitter
+	use 'sheerun/vim-polyglot'
 
     -- Formatter plugin
     use 'sbdchd/neoformat'