diff --git a/nvim/lua/config/floaterm.lua b/nvim/lua/config/floaterm.lua
index bca27c4..97091b8 100644
--- a/nvim/lua/config/floaterm.lua
+++ b/nvim/lua/config/floaterm.lua
@@ -1,8 +1,7 @@
 local g = vim.g
 
-g.floaterm_width = 0.98
-g.floaterm_height = 0.90
-g.floaterm_position = 'bottom'
+g.floaterm_width = 0.9
+g.floaterm_height = 0.9
 g.floaterm_autoclose = 1
 g.floaterm_opener = 'edit'
 g.floaterm_borderchars = '─│─│╭╮╯╰'
diff --git a/nvim/lua/config/telescope.lua b/nvim/lua/config/telescope.lua
new file mode 100644
index 0000000..904e817
--- /dev/null
+++ b/nvim/lua/config/telescope.lua
@@ -0,0 +1,23 @@
+require('telescope').setup({
+  defaults = {
+    layout_strategy = 'horizontal',
+    layout_config = {
+      preview_width = 0.5,
+      prompt_position = 'bottom',
+      width = 0.9,
+      height = 0.9,
+    },
+  },
+  extensions = {
+    fzf = {
+      fuzzy = true, -- false will only do exact matching
+      override_generic_sorter = true, -- override the generic sorter
+      override_file_sorter = true, -- override the file sorter
+      case_mode = 'smart_case', -- or "ignore_case" or "respect_case"
+    },
+  },
+})
+
+-- To get fzf loaded and working with telescope, you need to call
+-- load_extension, somewhere after setup function:
+require('telescope').load_extension('fzf')
diff --git a/nvim/lua/mappings.lua b/nvim/lua/mappings.lua
index b773ab4..1678c39 100644
--- a/nvim/lua/mappings.lua
+++ b/nvim/lua/mappings.lua
@@ -61,16 +61,16 @@ map('n', '<right>', '<cmd>bn<cr>')
 map('n', '<leader>\\', '<C-w>v<C-w>l')
 map('n', '<leader>-', '<C-w>s<C-w>j')
 
--- fzf-lua
-map('n', '<leader>,', '<cmd>lua require("fzf-lua").files()<cr>')
-map('n', '<leader>.', '<cmd>lua require("fzf-lua").buffers()<cr>')
-map('n', '<leader>/', '<cmd>lua require("fzf-lua").search_history()<cr>')
-map('n', '<leader>;', '<cmd>lua require("fzf-lua").command_history()<cr>')
-map('n', '<leader>`', '<cmd>lua require("fzf-lua").files({ cwd = "~/" })<cr>')
-map('n', '<leader>a', '<cmd>lua require("fzf-lua").live_grep()<cr>')
-map('n', '<leader>b', '<cmd>lua require("fzf-lua").git_branches()<cr>')
-map('n', '<leader>c', '<cmd>lua require("fzf-lua").git_bcommits()<cr>')
-map('n', '<leader>]', '<cmd>lua require("fzf-lua").lines()<cr>')
+-- Telescope
+map('n', '<leader>\'', '<cmd>Telescope git_files<cr>')
+map('n', '<leader>,', '<cmd>Telescope find_files<cr>')
+map('n', '<leader>.', '<cmd>Telescope buffers<cr>')
+map('n', '<leader>/', '<cmd>Telescope search_history<cr>')
+map('n', '<leader>;', '<cmd>Telescope command_history<cr>')
+map('n', '<leader>a', '<cmd>Telescope live_grep<cr>')
+map('n', '<leader>b', '<cmd>Telescope git_branches<cr>')
+map('n', '<leader>c', '<cmd>Telescope git_bcommits<cr>')
+map('n', '<leader>]', '<cmd>Telescope current_buffer_fuzzy_find<cr>')
 
 -- lsp and diagnostics
 map('n', 'gd', '<cmd>lua vim.lsp.buf.definition()<cr>')
diff --git a/nvim/lua/plugins.lua b/nvim/lua/plugins.lua
index 8cb3b49..ac52651 100644
--- a/nvim/lua/plugins.lua
+++ b/nvim/lua/plugins.lua
@@ -26,21 +26,21 @@ require('lazy').setup({
   -- The colorscheme of choice
   { 'ellisonleao/gruvbox.nvim', priority = 1000 },
 
-  -- TODO: telescope vs. fzf integration
-  -- modern neovim with treesitter, lsp, null-ls and cmp
+  -- modern neovim with treesitter, lsp, null-ls, cmp and vsnip
   -- remember to install all those tools since we do not use mason
   -- see ../../install/3_vimux.sh
+  { 'hrsh7th/vim-vsnip', init = get_config('vsnip') },
+  { 'jose-elias-alvarez/null-ls.nvim', init = get_config('null-ls'), dependencies = { 'nvim-lua/plenary.nvim' } },
   { 'neovim/nvim-lspconfig', init = get_config('lspconfig') },
   {
-    'nvim-treesitter/nvim-treesitter',
-    init = get_config('treesitter'),
-    build = ':TSUpdate',
-  },
-  {
-    'jose-elias-alvarez/null-ls.nvim',
-    init = get_config('null-ls'),
-    dependencies = { 'nvim-lua/plenary.nvim' },
+    'nvim-telescope/telescope.nvim',
+    tag = '0.1.1',
+    init = get_config('telescope'),
+    dependencies = { 'nvim-lua/plenary.nvim' }
   },
+  { 'nvim-telescope/telescope-fzf-native.nvim', build = 'make' },
+  { 'nvim-treesitter/nvim-treesitter', init = get_config('treesitter'), build = ':TSUpdate' },
+  { 'rafamadriz/friendly-snippets', dependencies = { 'hrsh7th/vim-vsnip' } },
   {
     'hrsh7th/nvim-cmp',
     init = get_config('cmp'),
@@ -51,14 +51,10 @@ require('lazy').setup({
       'hrsh7th/cmp-calc',
       'hrsh7th/cmp-nvim-lsp',
       'hrsh7th/cmp-path',
-      'hrsh7th/cmp-vsnip', -- see snippet engine of choice below
+      'hrsh7th/cmp-vsnip',
     },
   },
 
-  -- snippet engine of choice
-  { 'hrsh7th/vim-vsnip', init = get_config('vsnip') },
-  { 'rafamadriz/friendly-snippets', dependencies = { 'hrsh7th/vim-vsnip' } },
-
   -- editing enhancements
   { 'AndrewRadev/splitjoin.vim' },
   { 'echasnovski/mini.ai', version = '*' },
@@ -71,7 +67,6 @@ require('lazy').setup({
   -- git and other external tools integration
   { 'christoomey/vim-tmux-navigator'},
   { 'editorconfig/editorconfig-vim' },
-  { 'ibhagwan/fzf-lua', dependencies = { 'kyazdani42/nvim-web-devicons' }, init = get_config('fzf') },
   { 'lewis6991/gitsigns.nvim', config = true },
   { 'voldikss/vim-floaterm', init = get_config('floaterm') },
   { 'wincent/terminus' },