diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim
index e7f2b52..874f6ae 100644
--- a/.config/nvim/init.vim
+++ b/.config/nvim/init.vim
@@ -10,6 +10,9 @@ Plug 'ms-jpq/coq.thirdparty', {'branch': '3p'}
 
 Plug 'neovim/nvim-lspconfig'
 Plug 'williamboman/nvim-lsp-installer'
+Plug 'preservim/nerdtree'
+Plug 'Xuyuanp/nerdtree-git-plugin'
+Plug 'tikhomirov/vim-glsl'
 
 call plug#end()
 
@@ -23,9 +26,16 @@ local coq = require 'coq'
 
 lsp.clangd.setup{}
 lsp.cmake.setup{}
+lsp.pyright.setup{}
 
 lsp.clangd.setup{coq.lsp_ensure_capabilities{}}
 lsp.cmake.setup{coq.lsp_ensure_capabilities{}}
+lsp.pyright.setup{coq.lsp_ensure_capabilities{}}
+
+vim.keymap.set('n', '<space>e', vim.diagnostic.open_float)
+vim.keymap.set('n', '[d', vim.diagnostic.goto_prev)
+vim.keymap.set('n', ']d', vim.diagnostic.goto_next)
+vim.keymap.set('n', '<space>q', vim.diagnostic.setloclist)
 EOF
 
 " ----[Look and Feel]----
@@ -58,6 +68,14 @@ set guicursor=i:block
 autocmd FileType yaml setlocal ts=2 sts=2 sw=2 expandtab
 autocmd FileType yml setlocal ts=2 sts=2 sw=2 expandtab
 autocmd FileType meson setlocal ts=4 sts=4 sw=4 expandtab
+autocmd FileType xacro setlocal ts=2 sts=2 sw=2 expandtab
+autocmd FileType xml setlocal ts=2 sts=2 sw=2 expandtab
+autocmd FileType urdf setlocal ts=2 sts=2 sw=2 expandtab
+autocmd FileType idl setlocal ts=2 sts=2 sw=2 expandtab
+autocmd! BufNewFile,BufRead *.vs,*.fs,*.glvs,*.glfs,*.glsl set ft=glsl
+
+" ----[NERDTree]----
+nnoremap <tab> :NERDTreeToggle<cr>
 
 " ----[Macros]----
 " Find and replace macro
@@ -84,3 +102,5 @@ autocmd BufWritePost *Xresources,*Xdefaults !xrdb %
 
 " Reload sxhkd when config is edited
 autocmd BufWritePost sxhkdrc :silent !pkill sxhkd; sxhkd &
+
+autocmd BufNewFile,BufRead *.compute   set syntax=hlsl