From 3c33d3d1f0413263e6af807cb262ad4487f7b086 Mon Sep 17 00:00:00 2001
From: Tony Blyler <tony@citizenmint.com>
Date: Mon, 22 Aug 2022 21:37:55 -0400
Subject: [PATCH] Fix phpdoc treesitter being broken on MacOS arm64 and add
poetry path to PATH
---
chezmoi/dot_zshenv | 4 ++++
.../nvim/lua/plugins/config/treesitter.lua | 18 ++++++++++++++++--
2 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/chezmoi/dot_zshenv b/chezmoi/dot_zshenv
index 02d07aa..7544105 100644
--- a/chezmoi/dot_zshenv
+++ b/chezmoi/dot_zshenv
@@ -31,6 +31,10 @@ if [ -d "${HOME}/.local/bin" ]; then
export PATH="${HOME}/.local/bin:$PATH"
fi
+if [ -d "${HOME}/.poetry/bin" ]; then
+ export PATH="${HOME}/.poetry/bin:$PATH"
+fi
+
. "$HOME/.cargo/env" 2>/dev/null
if command -v go &> /dev/null; then
diff --git a/chezmoi/private_dot_config/nvim/lua/plugins/config/treesitter.lua b/chezmoi/private_dot_config/nvim/lua/plugins/config/treesitter.lua
index 2b7c89b..2f18b0e 100644
--- a/chezmoi/private_dot_config/nvim/lua/plugins/config/treesitter.lua
+++ b/chezmoi/private_dot_config/nvim/lua/plugins/config/treesitter.lua
@@ -1,14 +1,28 @@
require'nvim-treesitter.configs'.setup {
ensure_installed = "all", -- one of "all", "maintained" (parsers with maintainers), or a list of languages
sync_install = false, -- install languages synchronously (only applied to `ensure_installed`)
- ignore_install = {}, -- List of parsers to ignore installing
+ ignore_install = {"phpdoc", "tree-sitter-phpdoc"}, -- List of parsers to ignore installing
+ autopairs = {
+ enable = true,
+ },
highlight = {
enable = true, -- false will disable the whole extension
- disable = {}, -- list of language that will be disabled
+ disable = {"phpdoc", "tree-sitter-phpdoc"}, -- list of language that will be disabled
-- 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,
},
+ rainbow = {
+ enable = true,
+ extended_mode = true,
+ },
+ indent = {
+ enable = true,
+ },
+ context_commentstring = {
+ enable = true,
+ enable_autocmd = true,
+ },
}