diff --git a/roles/neovim/files/lua/autocommands.lua b/roles/neovim/files/lua/autocommands.lua
index f1933d7..4526c51 100644
--- a/roles/neovim/files/lua/autocommands.lua
+++ b/roles/neovim/files/lua/autocommands.lua
@@ -40,7 +40,7 @@ vim.api.nvim_create_autocmd("FileType", {
   group = group
 })
 vim.api.nvim_create_autocmd("FileType", {
-  pattern = { "html", "htmldjango", "lilypond", "python", "tex", "plaintex", "yaml" },
+  pattern = { "lilypond", },
   command = "setlocal foldmethod=indent",
   group = group
 })
@@ -56,7 +56,7 @@ vim.api.nvim_create_autocmd("BufEnter", {
 })
 vim.api.nvim_create_autocmd("BufEnter", {
   pattern = "*.sh",
-  command = "setlocal shiftwidth=2 tabstop=2 softtabstop=2 foldlevel=0 foldmethod=marker",
+  command = "setlocal shiftwidth=2 tabstop=2 softtabstop=2",
   group = group
 })
 vim.api.nvim_create_autocmd("FileType", {
diff --git a/roles/neovim/files/lua/plugin_options.lua b/roles/neovim/files/lua/plugin_options.lua
index 5dc29f7..35cd65d 100644
--- a/roles/neovim/files/lua/plugin_options.lua
+++ b/roles/neovim/files/lua/plugin_options.lua
@@ -1,6 +1,41 @@
 -- LSP Servers
 require('lsp.lua')
 
+-- Treesitter
+require'nvim-treesitter.configs'.setup {
+  -- A list of parser names, or "all"
+  ensure_installed = { "latex", "lua" },
+
+  -- Install parsers synchronously (only applied to `ensure_installed`)
+  sync_install = false,
+
+  -- Automatically install missing parsers when entering buffer
+  auto_install = true,
+
+  highlight = {
+    -- `false` will disable the whole extension
+    enable = true,
+
+    -- NOTE: these are the names of the parsers and not the filetype. (for example if you want to
+    -- disable highlighting for the `tex` filetype, you need to include `latex` in this list as this is
+    -- the name of the parser)
+    -- list of language that will be disabled
+    disable = { "latex" },
+
+    -- Setting this to true will run `:h syntax` and tree-sitter at the same time.
+    -- Set this to `true` if you depend on 'syntax' being enabled (like for indentation).
+    -- Using this option may slow down your editor, and you may see some duplicate highlights.
+    -- Instead of true it can also be a list of languages
+    additional_vim_regex_highlighting = false,
+  },
+
+  indent = {
+    enable = true,
+  },
+}
+vim.opt.foldmethod = 'expr'
+vim.opt.foldexpr = 'nvim_treesitter#foldexpr()'
+
 -- NERDTree
 vim.g.NERDTreeIgnore = { '^__pycache__$', '\\.pyc', '\\~$' }
 vim.keymap.set('n', '<leader>ne', '<cmd>NERDTree<CR>', { remap = true })