diff --git a/.config/nvim/after/plugin/lspconfig.rc.vim b/.config/nvim/after/plugin/lspconfig.rc.vim
index 4945b5b..a487e0f 100644
--- a/.config/nvim/after/plugin/lspconfig.rc.vim
+++ b/.config/nvim/after/plugin/lspconfig.rc.vim
@@ -37,6 +37,7 @@ local on_attach = function(client, bufnr)
   vim.api.nvim_buf_set_keymap(bufnr, 'n', '<leader>rn', '<cmd>lua vim.lsp.buf.rename()<CR>', opts)
   vim.api.nvim_buf_set_keymap(bufnr, 'n', '<leader>ca', '<cmd>lua vim.lsp.buf.code_action()<CR>', opts)
   vim.api.nvim_buf_set_keymap(bufnr, 'n', 'gr', '<cmd>lua vim.lsp.buf.references()<CR>', opts)
+  vim.api.nvim_buf_set_keymap(bufnr, 'n', '<F6>', '<cmd>ClangdSwitchSourceHeader<cr>', opts)
 
   -- signature.on_attach({
   --       bind = true,
@@ -106,7 +107,14 @@ nvim_lsp.groovyls.setup (
 --   )
 -- )
 
-clangd_extensions.setup()
+clangd_extensions.setup({
+  server = {
+    on_attach = on_attach,
+  },
+  inlay_hints = {
+    max_len_align = true,
+  }
+})
 -- nvim_lsp.clangd.setup(
 --   coq.lsp_ensure_capabilities({
 --     root_dir = nvim_lsp.util.root_pattern("compile_commands.json"),
diff --git a/.config/nvim/after/plugin/nvim-tree.rc.vim b/.config/nvim/after/plugin/nvim-tree.rc.vim
index e3251f8..df8eb8f 100644
--- a/.config/nvim/after/plugin/nvim-tree.rc.vim
+++ b/.config/nvim/after/plugin/nvim-tree.rc.vim
@@ -1,4 +1,3 @@
-let g:nvim_tree_indent_markers = 1 "0 by default, this option shows indent markers when folders are open
 let g:nvim_tree_git_hl = 1 "0 by default, will enable file highlight for git attributes (can be used without the icons).
 let g:nvim_tree_highlight_opened_files = 1 "0 by default, will enable folder and file icon highlight for opened files/directories.
 let g:nvim_tree_root_folder_modifier = ':~' "This is the default. See :help filename-modifiers for more options
@@ -137,5 +136,10 @@ require'nvim-tree'.setup {
       global = true,
     },
   },
+  renderer = {
+    indent_markers = {
+      enable = 1 -- this option shows indent markers when folders are open
+    }
+  },
 }
 EOF
diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim
index 4fe2e69..dc56c20 100644
--- a/.config/nvim/init.vim
+++ b/.config/nvim/init.vim
@@ -56,7 +56,7 @@ Plug 'quangnguyen30192/cmp-nvim-ultisnips'
 " Files switch, jump and grep-like tools {{{
 Plug 'kyazdani42/nvim-web-devicons' " for file icons
 Plug 'kyazdani42/nvim-tree.lua'
-Plug 'derekwyatt/vim-fswitch'
+"Plug 'derekwyatt/vim-fswitch'
 "Plug 'junegunn/fzf' | Plug 'junegunn/fzf.vim'
 Plug 'nvim-lua/popup.nvim'
 Plug 'nvim-lua/plenary.nvim'
@@ -93,7 +93,6 @@ Plug 'junegunn/goyo.vim'
 Plug 'lukas-reineke/virt-column.nvim'
 "Plug 'glacambre/firenvim'
 "Plug 'JMcKiern/vim-shoot'
-Plug 'mrjones2014/legendary.nvim'
 Plug 'protex/better-digraphs.nvim'
 " }}}