From 6a1aed221016e80f51582a5350779d67ecbe34f3 Mon Sep 17 00:00:00 2001
From: Fernando Schauenburg <dev@schauenburg.me>
Date: Fri, 11 Aug 2023 04:03:43 +0200
Subject: [PATCH] vim/telecope: fix file_browser loading and initialization

---
 config/nvim/lua/fschauen/keymap.lua           |   5 +-
 .../nvim/lua/fschauen/plugins/telescope.lua   | 127 +++++++++---------
 2 files changed, 70 insertions(+), 62 deletions(-)

diff --git a/config/nvim/lua/fschauen/keymap.lua b/config/nvim/lua/fschauen/keymap.lua
index 45f050e..734992a 100644
--- a/config/nvim/lua/fschauen/keymap.lua
+++ b/config/nvim/lua/fschauen/keymap.lua
@@ -92,10 +92,13 @@ local keymap = {
     { '<leader>do', diagnostic.open_float },
     { '<leader>dh', diagnostic.hide },
 
+  telescope_file_browser = {
+    { '<leader>fB', '<cmd>Telescope file_browser<cr>' , desc = ' file [B]rowser' },
+  },
+
   telescope = {
     { '<leader>fa',  pickers.autocommands           ('  Autocommands'         ), desc = ' [a]utocommands'            },
     { '<leader>fb',  pickers.buffers                ('  Buffers'              ), desc = ' [b]uffers'                 },
-    { '<leader>fB', '<cmd>Telescope file_browser<cr>'                           , desc = ' file [B]rowser'            },
     { '<leader>fc',  pickers.colorscheme            ('  Colorschemes'         ), desc = ' [c]olorschemes'            },
     { '<leader>fdd', pickers.diagnostics            ('󰀪  Document Diagnostics' ), desc = ' [d]iagnostics [d]ocument'  },
     { '<leader>fdw', pickers.diagnostics            ('󰀪  Workspace Diagnostics'), desc = ' [d]iagnostics [w]orkspace' },
diff --git a/config/nvim/lua/fschauen/plugins/telescope.lua b/config/nvim/lua/fschauen/plugins/telescope.lua
index e3deef0..4a52cf6 100644
--- a/config/nvim/lua/fschauen/plugins/telescope.lua
+++ b/config/nvim/lua/fschauen/plugins/telescope.lua
@@ -14,77 +14,82 @@ local mappings = {
 }
 
 return {
-  'nvim-telescope/telescope.nvim',
-
-  dependencies = {
-    'nvim-telescope/telescope-file-browser.nvim',
-    {
+  {
+    'nvim-telescope/telescope.nvim',
+    dependencies = {
       'nvim-telescope/telescope-fzf-native.nvim',
       build = 'cmake -S. -Bbuild -DCMAKE_BUILD_TYPE=Release ' ..
               '&& cmake --build build --config Release ' ..
-              '&& cmake --install build --prefix build'
+              '&& cmake --install build --prefix build',
     },
-  },
-  lazy = true,
-  cmd = 'Telescope',
-  keys = require('fschauen.keymap').telescope,
-  opts  = {
-    defaults = {
-      mappings = {
-        i = mappings,
-        n = mappings,
-      },
-
-      prompt_prefix = '   ',     -- Alternatives:   ❯
-      selection_caret = ' ',     -- Alternatives:   ➔  
-
-      multi_icon = '󰄬 ',          -- Alternatives: 󰄬    
-      scroll_strategy = 'limit',  -- Don't wrap around in results.
-
-      dynamic_preview_title = true,
-
-      layout_strategy = 'flex',
-      layout_config = {
-        width      = 0.9,
-        height     = 0.9,
-        flex       = { flip_columns   = 130 },
-        horizontal = { preview_width  = 0.5, preview_cutoff = 130 },
-        vertical   = { preview_height = 0.5 },
-      },
-      cycle_layout_list = { 'horizontal', 'vertical' },
-    },
-    pickers = {
-      buffers = {
+    cmd = 'Telescope',
+    keys = require('fschauen.keymap').telescope,
+    opts  = {
+      defaults = {
         mappings = {
-          n = {
-            x = actions.delete_buffer,
+          i = mappings,
+          n = mappings,
+        },
+
+        prompt_prefix = '   ',     -- Alternatives:   ❯
+        selection_caret = ' ',     -- Alternatives:   ➔  
+
+        multi_icon = '󰄬 ',          -- Alternatives: 󰄬    
+        scroll_strategy = 'limit',  -- Don't wrap around in results.
+
+        dynamic_preview_title = true,
+
+        layout_strategy = 'flex',
+        layout_config = {
+          width      = 0.9,
+          height     = 0.9,
+          flex       = { flip_columns   = 130 },
+          horizontal = { preview_width  = 0.5, preview_cutoff = 130 },
+          vertical   = { preview_height = 0.5 },
+        },
+        cycle_layout_list = { 'horizontal', 'vertical' },
+      },
+      pickers = {
+        buffers = {
+          mappings = {
+            n = {
+              x = actions.delete_buffer,
+            },
           },
         },
+        colorscheme = {
+          theme = 'dropdown',
+        },
+        spell_suggest = {
+          theme = 'cursor',
+        },
       },
-      colorscheme = {
-        theme = 'dropdown',
-      },
-      spell_suggest = {
-        theme = 'cursor',
-      },
-    },
-    extensions = {
-      file_browser = {
-        theme = 'ivy'
+      extensions = {
+        file_browser = {
+          theme = 'ivy'
+        },
       },
     },
+    config = function(_, opts)
+      require('telescope').setup(opts)
+      require('telescope').load_extension 'fzf'
+      vim.api.nvim_create_autocmd('User', {
+        desc = 'Enable line number in Telescope previewers.',
+        group = vim.api.nvim_create_augroup('fschauen.telescope', { clear = true } ),
+        pattern = 'TelescopePreviewerLoaded',
+        command = 'setlocal number'
+      })
+    end
+  },
+  {
+    'nvim-telescope/telescope-file-browser.nvim',
+    dependencies = {
+      'nvim-telescope/telescope.nvim',
+    },
+    keys = require('fschauen.keymap').telescope_file_browser,
+    config = function()
+      require('telescope').load_extension 'file_browser'
+    end,
   },
-  config = function(_, opts)
-    require('telescope').setup(opts)
-    require('telescope').load_extension 'fzf'
-    require('telescope').load_extension 'file_browser'
-
-    vim.api.nvim_create_autocmd('User', {
-      desc = 'Enable line number in Telescope previewers.',
-      group = vim.api.nvim_create_augroup('fschauen.telescope', { clear = true } ),
-      pattern = 'TelescopePreviewerLoaded',
-      command = 'setlocal number'
-    })
-  end
 }