[nvim] telescope

.config/nvim/init.vim

@@ -232,7 +232,13 @@ let g:netrw_banner=0 " disable the banner
 let g:netrw_liststyle=3 " tree view
 let $FZF_DEFAULT_COMMAND = "fd -t f"
 " map <C-o> :Clap files<CR>
-map <leader><leader> :FZF<CR>
+" map <leader><leader> :FZF<CR>
+" Find files using Telescope command-line sugar.
+nnoremap <leader>ff <cmd>Telescope find_files<cr>
+nnoremap <leader><leader> <cmd>Telescope find_files<cr>
+nnoremap <leader>fg <cmd>Telescope live_grep<cr>
+nnoremap <leader>fb <cmd>Telescope buffers<cr>
+nnoremap <leader>fh <cmd>Telescope help_tags<cr>
 
 " neogit
 map <leader>n :Neogit<CR>
@@ -294,6 +300,7 @@ source ~/.config/nvim/treesitter.vim
 source ~/.config/nvim/lsp.vim
 source ~/.config/nvim/diffview.vim
 source ~/.config/nvim/neogit.vim
+source ~/.config/nvim/telescope.vim
 
 lua require('gitsigns').setup({ current_line_blame = true })
 

.config/nvim/packer.vim

@@ -5,47 +5,74 @@ augroup end
 
 lua << EOF
 
-return require('packer').startup(function()
-  -- git
-  use { 'TimUntersberger/neogit', requires = 'nvim-lua/plenary.nvim' }
-  use { 'lewis6991/gitsigns.nvim', requires = 'nvim-lua/plenary.nvim' }
-  use { 'sindrets/diffview.nvim', requires = 'nvim-lua/plenary.nvim' }
+return require('packer').startup { 
+  function()
+    use 'lewis6991/impatient.nvim'
+    use 'nathom/filetype.nvim'
 
-  -- lsp
-  use 'neovim/nvim-lspconfig'
-  use 'ray-x/lsp_signature.nvim'
-  use 'L3MON4D3/LuaSnip' 
-  use 'nvim-lua/lsp-status.nvim'
-  use 'jose-elias-alvarez/null-ls.nvim'
-  use 'williamboman/nvim-lsp-installer'
-  use 'hrsh7th/nvim-cmp'
-  use { 'saadparwaiz1/cmp_luasnip' }
-  use { 'hrsh7th/cmp-nvim-lsp' }
-  use { 'tami5/lspsaga.nvim', requires = 'neovim/nvim-lspconfig' }
+    -- git
+    use { 'TimUntersberger/neogit', requires = 'nvim-lua/plenary.nvim' }
+    use { 'lewis6991/gitsigns.nvim', requires = 'nvim-lua/plenary.nvim' }
+    use { 'sindrets/diffview.nvim', requires = 'nvim-lua/plenary.nvim' }
 
-  -- Treesitter
-  use { 'nvim-treesitter/nvim-treesitter', run = ':TSUpdate' }
-  use { 'nvim-treesitter/playground', requires = 'nvim-treesitter/nvim-treesitter' }
+    -- lsp
+    use 'neovim/nvim-lspconfig'
+    use 'ray-x/lsp_signature.nvim'
+    use 'L3MON4D3/LuaSnip' 
+    use 'nvim-lua/lsp-status.nvim'
+    use 'jose-elias-alvarez/null-ls.nvim'
+    use 'williamboman/nvim-lsp-installer'
+    use 'hrsh7th/nvim-cmp'
+    use { 'saadparwaiz1/cmp_luasnip' }
+    use { 'hrsh7th/cmp-nvim-lsp' }
+    use { 'tami5/lspsaga.nvim', requires = 'neovim/nvim-lspconfig' }
 
-  -- Interface
-  use 'liuchengxu/space-vim-theme'
-  use 'liuchengxu/eleline.vim'
+    -- Treesitter
+    use { 'nvim-treesitter/nvim-treesitter', run = ':TSUpdate' }
+    use { 'nvim-treesitter/playground', requires = 'nvim-treesitter/nvim-treesitter' }
+    use 'JoosepAlviste/nvim-ts-context-commentstring'
 
-  -- Misc
-  use {
-      "luukvbaal/stabilize.nvim",
-      config = function() require("stabilize").setup() end
+    -- Interface
+    use 'liuchengxu/space-vim-theme'
+    use 'liuchengxu/eleline.vim'
+    use 'folke/tokyonight.nvim'
+    use 'NLKNguyen/papercolor-theme'
+    use {
+      'nvim-telescope/telescope.nvim',
+      requires = { {'nvim-lua/plenary.nvim'} }
+    }
+    use {'nvim-telescope/telescope-fzf-native.nvim', run = 'make' }
+    use {'nvim-telescope/telescope-ui-select.nvim'}
+
+    -- Misc
+    use {
+        "luukvbaal/stabilize.nvim",
+        config = function() require("stabilize").setup() end
+    }
+    use {
+      'numToStr/Comment.nvim',
+      config = function()
+          require('Comment').setup()
+      end
+    }
+    use 'Raimondi/delimitMate'
+    use 'tpope/vim-repeat'
+    use 'tpope/vim-surround'
+    use {
+      "max397574/better-escape.nvim",
+      config = function()
+        require("better_escape").setup { 
+          mapping = {"jj"},
+          timeoiut = vim.o.timeoutlen,
+          clear_empty_lines = false,
+          keys = "<ESC>",
+        }
+      end,
+    }
+  end,
+  config = {
+    compile_path = vim.fn.stdpath "config" .. "/lua/packer_compiled.lua"
   }
-  use {
-    'numToStr/Comment.nvim',
-    config = function()
-        require('Comment').setup()
-    end
-  }
-  use 'Raimondi/delimitMate'
-  use 'tpope/vim-repeat'
-  use 'tpope/vim-surround'
-
-end)
+}
 
 EOF

.config/nvim/telescope.vim

@@ -0,0 +1,20 @@
+lua << EOF
+require('telescope').setup {
+  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"
+                                       -- the default case_mode is "smart_case"
+    },
+    ["ui-select"] = {
+      require("telescope.themes").get_dropdown {
+      }
+    }
+  }
+}
+
+require('telescope').load_extension('fzf')
+require('telescope').load_extension("ui-select")
+EOF

.config/nvim/treesitter.vim

@@ -2,7 +2,10 @@ try
   lua <<EOF
   require'nvim-treesitter.configs'.setup {
     -- Modules and its options go here
-    highlight = { enable = true },
+    highlight = { 
+      enable = true,
+      additional_vim_regex_highlighting = false,
+    },
     incremental_selection = { enable = true },
     textobjects = {
       select = {

.vim/default.vim

@@ -219,8 +219,8 @@ endif
         cnoremap <C-e> <End>
         cnoremap <C-d> <Delete>
         " jj | escaping
-        inoremap jj <Esc>
-        cnoremap jj <C-c>
+        " inoremap jj <Esc>
+        " cnoremap jj <C-c>
         " Quit visual mode
         vnoremap v <Esc>
         " Move to the start of line