diff --git a/nvim/init.lua b/nvim/init.lua index 8a6834f..1cdaddd 100644 --- a/nvim/init.lua +++ b/nvim/init.lua @@ -3,6 +3,7 @@ require('autopairs_config') require('settings') require('lsp_config') require('telescope_config') +require('treesitter_config') require('lualine_config') require('mappings') require('trim_config') @@ -30,3 +31,5 @@ vim.api.nvim_create_autocmd("FileType", { pattern = "vimwiki", command = [[setlo vim.api.nvim_create_autocmd("FileType", { pattern = "vimwiki", command = [[setlocal filetype=markdown]] }) vim.api.nvim_create_autocmd("FileType", { pattern = "javascript", command = [[setlocal shiftwidth=2 softtabstop=2 expandtab]] }) vim.api.nvim_create_autocmd("FileType", { pattern = "vue", command = [[setlocal shiftwidth=2 softtabstop=2 expandtab]] }) +local shada_group = vim.api.nvim_create_augroup("SHADA", { clear = true }) +vim.api.nvim_create_autocmd("CursorHold,TextYankPost,FocusGained,FocusLost", {command = "if exists(':rshada') | rshada | wshada | endif", group = shada_group}) diff --git a/nvim/lua/nvim_tree_config.lua b/nvim/lua/nvim_tree_config.lua index 28963fc..ca45a7a 100644 --- a/nvim/lua/nvim_tree_config.lua +++ b/nvim/lua/nvim_tree_config.lua @@ -3,7 +3,7 @@ if not hastree then return end -require("nvim-tree").setup({ +tree.setup({ sort_by = "case_sensitive", sync_root_with_cwd = true, update_focused_file = {