3 files changed, 38 insertions, 17 deletions
diff --git a/nvim/.config/nvim/init.vim b/nvim/.config/nvim/init.vim
index 1e6a3b1..503aec1 100644
--- a/nvim/.config/nvim/init.vim
+++ b/nvim/.config/nvim/init.vim
@@ -70,3 +70,4 @@ source ~/.config/nvim/vimwiki.vim
 
 lua require('lsp-config')
 lua require('completion')
+lua require('treesitter')
diff --git a/nvim/.config/nvim/lua/treesitter.lua b/nvim/.config/nvim/lua/treesitter.lua
new file mode 100644
index 0000000..be70d3b
--- /dev/null
+++ b/nvim/.config/nvim/lua/treesitter.lua
@@ -0,0 +1,23 @@
+require'nvim-treesitter.configs'.setup {
+  highlight = {
+    enable = true,
+    disable = {},
+  },
+  indent = {
+    enable = true,
+    disable = {},
+  },
+  ensure_installed = {
+    "javascript",
+    "typescript",
+    "tsx",
+    "python",
+    "json",
+    "yaml",
+    "html",
+    "scss"
+  },
+}
+
+local parser_config = require "nvim-treesitter.parsers".get_parser_configs()
+parser_config.tsx.used_by = { "javascript", "typescript.tsx" }
diff --git a/nvim/.config/nvim/vim-plug/plugins.vim b/nvim/.config/nvim/vim-plug/plugins.vim
index caf9f50..60c9f98 100644
--- a/nvim/.config/nvim/vim-plug/plugins.vim
+++ b/nvim/.config/nvim/vim-plug/plugins.vim
@@ -1,31 +1,28 @@
 call plug#begin('~/.config/nvim/autoload/plugged')
-    Plug 'mhinz/vim-startify'
     Plug 'vimwiki/vimwiki'
-    Plug 'tonchis/vim-to-github'
+    Plug 'mhinz/vim-startify'
     " Dark-powered file explorer
     Plug 'shougo/defx.nvim',
     Plug 'kristijanhusak/defx-icons'
     Plug 'kristijanhusak/defx-git'
     Plug 't9md/vim-choosewin'
-    " Tmux navigator
-    Plug 'christoomey/vim-tmux-navigator'
-    " Color scheme
-    Plug 'morhetz/gruvbox'
-    " Editorconfig
-    Plug 'editorconfig/editorconfig-vim'
-    " Languages
-    Plug 'pangloss/vim-javascript'
-    Plug 'leafgarland/typescript-vim' "typescript syntax
-    Plug 'peitalin/vim-jsx-typescript' "react jsx typescript syntax
-    Plug 'ap/vim-css-color'
-    " Git gutter
-    Plug 'airblade/vim-gitgutter'
-     " Matching brackets
-    Plug 'Raimondi/delimitMate'
     " Built-in LSP
     Plug 'neovim/nvim-lspconfig'
     Plug 'hrsh7th/nvim-compe'
+    " Treesitter
+    Plug 'nvim-treesitter/nvim-treesitter', {'do': ':TSUpdate'}
+    Plug 'nvim-treesitter/playground'
+    " Color scheme
+    Plug 'rktjmp/lush.nvim'
+    Plug 'ellisonleao/gruvbox.nvim'
     " Telescope
     Plug 'nvim-lua/plenary.nvim'
     Plug 'nvim-telescope/telescope.nvim'
+    " Misc
+    Plug 'christoomey/vim-tmux-navigator'
+    Plug 'editorconfig/editorconfig-vim'
+    Plug 'ap/vim-css-color'
+    Plug 'airblade/vim-gitgutter'
+    Plug 'Raimondi/delimitMate'
+    Plug 'tonchis/vim-to-github'
 call plug#end()