diff --git a/nvim/init.vim b/nvim/init.vim
index 67ece20..6c47b76 100644
--- a/nvim/init.vim
+++ b/nvim/init.vim
@@ -27,15 +27,36 @@ if has('syntax')
   syntax on
 endif
 
+" Set leader key
+let mapleader = " "
+
 " Plugins
 call plug#begin('~/.vim/plugged')
 
 Plug 'itchyny/lightline.vim'
 Plug 'scrooloose/nerdtree', { 'on':  'NERDTreeToggle' }
-Plug 'Valloric/YouCompleteMe'
-Plug 'iamcco/markdown-preview.nvim', { 'do': { -> mkdp#util#install() }, 'for': ['markdown', 'vim-plug']}
+" Plug 'Valloric/YouCompleteMe'
+" Plug 'iamcco/markdown-preview.nvim', { 'do': { -> mkdp#util#install() }, 'for': ['markdown', 'vim-plug']}
 Plug 'https://github.com/ap/vim-css-color.git'
 
+" Collection of common configurations for the Nvim LSP client
+" Plug 'neovim/nvim-lspconfig'
+
+" Extensions to built-in LSP, for example, providing type inlay hints
+" Plug 'nvim-lua/lsp_extensions.nvim'
+
+" Autocompletion framework for built-in LSP
+" Plug 'hrsh7th/nvim-compe'
+
+" Popup telescope
+" Plug 'nvim-lua/popup.nvim'
+" Plug 'nvim-lua/plenary.nvim'
+" Plug 'nvim-telescope/telescope.nvim'
+
+" Plug 'joshdick/onedark.vim'
+
+" Plug 'tpope/vim-commentary'
+
 call plug#end()
 
 "------------------------------------------------------------
@@ -173,11 +194,27 @@ map Y y$
 nnoremap <C-L> :nohl<CR><C-L>
 
 " Shortcuts for Ycm
-nnoremap <C-F> :YcmCompleter Format<Cr>
-nnoremap <C-J> :YcmCompleter GoTo<Cr>
+"nnoremap <C-F> :YcmCompleter Format<Cr>
+"nnoremap <C-J> :YcmCompleter GoTo<Cr>
+
 nnoremap <C-N> :NERDTreeToggle<Cr>
+nnoremap <leader>n :NERDTreeToggle<Cr>
+
 "------------------------------------------------------------
 
 " use Mouse clipboard instead of vims internal one
 " use unnamedplus for Keyboard clipboard
 set clipboard=unnamed
+
+
+" Find files using Telescope command-line sugar.
+" nnoremap <leader>ff <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>
+
+" !!! Uncomment the following line to load lsp functionality
+" Remember to also uncomment the corresponding plugins at the top of this
+" file.
+" Maybe use doom emacs instead
+" :lua require('lsp')