From 3edb113742ea3e555695c5b88eeef2572021d2a8 Mon Sep 17 00:00:00 2001
From: Josh Rahm <rahm@google.com>
Date: Wed, 25 Jan 2023 23:09:54 +0000
Subject: Add treesitter-textobjects

---
 init.vim | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

(limited to 'init.vim')

diff --git a/init.vim b/init.vim
index dc1b613..d1d8709 100644
--- a/init.vim
+++ b/init.vim
@@ -34,12 +34,14 @@ Plug 'hrsh7th/vim-vsnip'
 Plug 'kyazdani42/nvim-web-devicons'
 Plug 'neovim/nvim-lspconfig'
 Plug 'nvim-treesitter/nvim-treesitter', {'do': ':TSUpdate'}
+Plug 'nvim-treesitter/playground'
 Plug 'onsails/lspkind.nvim'
 Plug 'nvim-tree/nvim-tree.lua'
 Plug 'vim-airline/vim-airline'
 
 Plug 'nvim-lua/plenary.nvim'
 Plug 'nvim-telescope/telescope.nvim'
+Plug 'nvim-treesitter/nvim-treesitter-textobjects'
 
 Plug 'tpope/vim-surround'
 Plug 'lukas-reineke/indent-blankline.nvim'
@@ -73,13 +75,26 @@ noremap Y y$
 noremap ú <cmd>FormatCode<cr>
 noremap <leader>p <plug>(SynStack)
 noremap <leader>ff <cmd>Telescope find_files<cr>
+
 inoremap <C-+> <Plug>(vsnip-expand)
 
+" When navigating to the beginning of a line, I want to always reset the screen
+" to the leftmost position.
+noremap ^ ^zH
+
 
 augroup InitVim
   au!
   autocmd BufRead *.java,*.c,*.cpp,*.cxx TSBufEnable highlight
+
+  " Automatically start insert mode when opening a new terminal. 
   autocmd TermOpen * startinsert
+
+  " When entering a terminal, automatically start "insert" and feed the escape
+  " key. This ensures the ZSH line-reader is in "normal" mode. I have
+  " integration with zsh to navigate vim panes from the zsh line editor. 
+  autocmd BufEnter term://* startinsert | call feedkeys("\x1b")
+
   autocmd TextYankPost *
         \ lua require'vim.highlight'.on_yank(
         \   { higroup = "IncSearch", timeout = 100 });
@@ -139,6 +154,7 @@ lua << EOF
   -- Diagnostics
   require("diagnostics")
   require("nvim-tree").setup()
+  require("treesitter-textobjects-setup")
 
   require('telescope').setup({
     defaults = {
-- 
cgit