treesitter incremental selection, formatting, charlist updates

private_dot_config/kitty/kitty.conf

@@ -44,21 +44,21 @@ map ctrl+f5 detach_window tab-left
   bold_font 			auto
   italic_font 			auto
   bold_italic_font 		auto
-  modify_font cell_height 	+4px
+  modify_font cell_height 	+3px
   modify_font cell_width 	0px
 
 #  font_family 		    	SF Illegal Mono
-#  bold_font 			auto
+#  bold_font			auto
 #  italic_font 			auto
 #  bold_italic_font 		auto
 #  modify_font cell_height 	0px
 #  modify_font cell_width 	0px
 
 disable_ligatures cursor
-font_features Menligaturized-Italic -liga 
+font_features Menligaturized-Italic -liga
-font_features Menligaturized-BoldItalic -liga 
+font_features Menligaturized-BoldItalic -liga
-font_features Menligaturized-Bold -liga 
+font_features Menligaturized-Bold -liga
-font_features Menligaturized-Regular -liga 
+font_features Menligaturized-Regular -liga
 
 #font_family Cascadia Code
 #font_family Liga MesloLGS Nerd Font
@@ -72,7 +72,7 @@ font_features Menligaturized-Regular -liga
 #font_family MesloLGS NF
 		shell .
 		allow_remote_control yes
-		font_size 18
+		font_size 17
 #macos_thicken_font 1
 
 		text_composition_strategy 1.7 50

private_dot_config/nvim/init.lua

@@ -60,11 +60,11 @@ require("lazy").setup({
 		dependencies = { "nvim-treesitter/nvim-treesitter" },
 		config = function()
 			require("treesj").setup({--[[ your config ]]
-			})
+		})
-		end,
+	end,
-	},
+},
-	{ "williamboman/mason-lspconfig.nvim" },
+{ "williamboman/mason-lspconfig.nvim" },
-	{ "neovim/nvim-lspconfig" },
+{ "neovim/nvim-lspconfig" },
 })
 
 require("nvim-lastplace").setup({
@@ -194,7 +194,7 @@ auto_session.setup({
 	auto_session_enabled = true,
 	auto_save_enabled = true,
 	auto_restore_enabled = true,
-	auto_session_suppress_dirs = { "~/", "~/dev", "~/Downloads", "/"},
+	auto_session_suppress_dirs = { "~/", "~/dev", "~/Downloads", "/" },
 	auto_session_use_git_branch = nil,
 	cwd_change_handling = {
 		restore_upcoming_session = true, -- This is necessary!!
@@ -202,6 +202,22 @@ auto_session.setup({
 })
 auto_session_nvim_tree.setup(auto_session)
 
+require('nvim-treesitter.configs').setup {
+	ensure_installed = { 'bash', 'go', 'css', 'python', 'html', 'javascript', 'json', 'jsonc', 'lua', 'rust', 'typescript' },
+	highlight = {
+		enable = true,
+	},
+	incremental_selection = {
+		enable = true,
+		keymaps = {
+			init_selection = "<CR>", -- set to `false` to disable one of the mappings
+			node_incremental = "<TAB>",
+			scope_incremental = "<CR>",
+			node_decremental = "<S-TAB>",
+		},
+	},
+}
+
 vim.cmd([[highlight IndentBlanklineIndent1 guifg=#443838 gui=nocombine]])
 
 vim.opt.tabstop = 4
@@ -209,8 +225,14 @@ vim.opt.softtabstop = 4
 vim.opt.shiftwidth = 4
 vim.opt.list = true
 vim.opt.listchars:append("lead:⋅")
-vim.opt.listchars:append("tab:⎯⎯▷")
+-- vim.opt.listchars:append("tab:▷⎯⎯")
+-- vim.opt.listchars:append("tab:▸⁃ ")
+-- vim.opt.listchars:append("tab:▸⁃⁃")
+vim.opt.listchars:append("tab:→  ")
+vim.opt.listchars:append("multispace:  ⋅ ⋅ ⋅ ⋅ ⋅ ⋅")
+vim.opt.listchars:append("leadmultispace:⋅ ⋅ ")
 vim.opt.listchars:append("trail:␣")
+
 require("indent_blankline").setup({
 	space_char_blankline = " ",
 	char_highlight_list = {
@@ -221,21 +243,20 @@ require("indent_blankline").setup({
 	},
 })
 
-
 function _G.set_terminal_keymaps()
-  local opts = {buffer = 0}
+	local opts = { buffer = 0 }
---  vim.keymap.set('t', '<esc>', [[<C-\><C-n>]], opts)
+	--  vim.keymap.set('t', '<esc>', [[<C-\><C-n>]], opts)
---  vim.keymap.set('t', 'jk', [[<C-\><C-n>]], opts)
+	--  vim.keymap.set('t', 'jk', [[<C-\><C-n>]], opts)
-  vim.keymap.set('t', '<C-h>', [[<Cmd>wincmd h<CR>]], opts)
+	vim.keymap.set("t", "<C-h>", [[<Cmd>wincmd h<CR>]], opts)
-  vim.keymap.set('t', '<C-j>', [[<Cmd>wincmd j<CR>]], opts)
+	vim.keymap.set("t", "<C-j>", [[<Cmd>wincmd j<CR>]], opts)
-  vim.keymap.set('t', '<C-up>', [[<Cmd>wincmd k<CR>]], opts)
+	vim.keymap.set("t", "<C-up>", [[<Cmd>wincmd k<CR>]], opts)
-  vim.keymap.set('t', '<C-k>', [[<Cmd>wincmd k<CR>]], opts)
+	vim.keymap.set("t", "<C-k>", [[<Cmd>wincmd k<CR>]], opts)
-  vim.keymap.set('t', '<C-l>', [[<Cmd>wincmd l<CR>]], opts)
+	vim.keymap.set("t", "<C-l>", [[<Cmd>wincmd l<CR>]], opts)
-  vim.keymap.set('t', '<C-w>', [[<C-\><C-n><C-w>]], opts)
+	vim.keymap.set("t", "<C-w>", [[<C-\><C-n><C-w>]], opts)
 end
 
 -- if you only want these mappings for toggle term use term://*toggleterm#* instead
-vim.cmd('autocmd! TermOpen term://* lua set_terminal_keymaps()')
+vim.cmd("autocmd! TermOpen term://* lua set_terminal_keymaps()")
 
 vim.keymap.set("n", "<leader>c", require("osc52").copy_operator, { expr = true })
 vim.keymap.set("n", "<leader>cc", "<leader>c_", { remap = true })