diff --git a/.config/nvim/after/plugin/lspzero.lua b/.config/nvim/after/plugin/lspzero.lua
index f498aa4..6ec4d8e 100644
--- a/.config/nvim/after/plugin/lspzero.lua
+++ b/.config/nvim/after/plugin/lspzero.lua
@@ -7,7 +7,7 @@ lsp_zero.on_attach(function(client, bufnr)
 end)
 
 local lspconfig = require('lspconfig')
-lspconfig.tsserver.setup {}
+lspconfig["ts_ls"].setup({})
 lspconfig.gopls.setup({})
 lspconfig.pyright.setup({
     pythonPath= "/Users/daonb/Library/Caches/pypoetry/virtualenvs/vault-RT5-Ioyu-py3.10/bin/python"
diff --git a/.config/nvim/after/plugin/treesitter.lua b/.config/nvim/after/plugin/treesitter.lua
index ac6ef19..33c1f0e 100644
--- a/.config/nvim/after/plugin/treesitter.lua
+++ b/.config/nvim/after/plugin/treesitter.lua
@@ -1,3 +1,7 @@
+-- Global setting in init.lua
+vim.opt.foldmethod = "expr"
+vim.opt.foldexpr = "v:lua.vim.treesitter.foldexpr()"
+
 require 'nvim-treesitter.configs'.setup {
   -- A list of parser names, or "all" (the five listed parsers should always be installed)
   ensure_installed = { "c", "lua", "javascript", "typescript", "python", "vim", "vimdoc", "query" },
diff --git a/.config/nvim/lua/daonb/init.lua b/.config/nvim/lua/daonb/init.lua
index 12791fe..f756055 100644
--- a/.config/nvim/lua/daonb/init.lua
+++ b/.config/nvim/lua/daonb/init.lua
@@ -91,3 +91,4 @@ hi diffChange ctermfg=188 ctermbg=NONE cterm=bold guifg=#50FA7B guibg=#303030 gu
 hi diffRemoved ctermfg=88 ctermbg=NONE cterm=NONE guifg=#FA5057 guibg=#303030 gui=NONE
 ]]
 
+require('nvim-test').setup()
diff --git a/.config/nvim/lua/daonb/plugins.lua b/.config/nvim/lua/daonb/plugins.lua
index 3a4ba83..9b96312 100644
--- a/.config/nvim/lua/daonb/plugins.lua
+++ b/.config/nvim/lua/daonb/plugins.lua
@@ -59,10 +59,16 @@ return require('packer').startup(function(use)
   use 'mfussenegger/nvim-dap-python'
   use { "rcarriga/nvim-dap-ui", requires = {"mfussenegger/nvim-dap"} }
   use {'github/copilot.vim', branch = 'release' }
-  use({
+  use {
       "nvim-treesitter/nvim-treesitter-textobjects",
       after = "nvim-treesitter",
       requires = "nvim-treesitter/nvim-treesitter",
-  })
+  } 
   use 'nvim-treesitter/nvim-treesitter-context'
+  use {
+      'klen/nvim-test',
+      config = function()
+        require('nvim-test').setup()
+    end
+    }
 end)
diff --git a/.config/starship.toml b/.config/starship.toml
index be65bfc..7b24bb1 100644
--- a/.config/starship.toml
+++ b/.config/starship.toml
@@ -1,2 +1,4 @@
 [gcloud]
 disabled = true
+[aws]
+disabled = true
diff --git a/.zshrc b/.zshrc
index 3b26056..4b65963 100644
--- a/.zshrc
+++ b/.zshrc
@@ -6,6 +6,7 @@ export LANG=en_US.UTF-8
 export LANGUAGE=en_US.UTF-8
 export LC_ALL=en_US.UTF-8
 export GO11MODULE=on
+export PYENV_VIRTUALENV_DISABLE_PROMPT=1
 export PATH="$HOME/.local/bin:$HOME/go/bin:$HOME/node/bin:/usr/local/go/bin:/Library/TeX/texbin:/snap/bin:/sbin:$PATH"
 
 if [ -d "/usr/games" ]; then