update telescope and treesitter for nvim v0.12

roles/nvim/files/lazy-lock.json

@@ -1,5 +1,5 @@
 {
-  "LuaSnip": { "branch": "master", "commit": "5a1e39223db9a0498024a77b8441169d260c8c25" },
+  "LuaSnip": { "branch": "master", "commit": "642b0c595e11608b4c18219e93b88d7637af27bc" },
   "alpha-nvim": { "branch": "main", "commit": "a9d8fb72213c8b461e791409e7feabb74eb6ce73" },
   "auto-session": { "branch": "main", "commit": "62437532b38495551410b3f377bcf4aaac574ebe" },
   "bufdelete.nvim": { "branch": "master", "commit": "f6bcea78afb3060b198125256f897040538bcb81" },
@@ -12,28 +12,29 @@
   "dressing.nvim": { "branch": "master", "commit": "2d7c2db2507fa3c4956142ee607431ddb2828639" },
   "flutter-tools.nvim": { "branch": "main", "commit": "677cc07c16e8b89999108d2ebeefcfc5f539b73c" },
   "friendly-snippets": { "branch": "main", "commit": "6cd7280adead7f586db6fccbd15d2cac7e2188b9" },
+  "lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" },
   "lazydev.nvim": { "branch": "main", "commit": "ff2cbcba459b637ec3fd165a2be59b7bbaeedf0d" },
   "lazygit.nvim": { "branch": "main", "commit": "a04ad0dbc725134edbee3a5eea29290976695357" },
   "lspkind.nvim": { "branch": "master", "commit": "c7274c48137396526b59d86232eabcdc7fed8a32" },
-  "lualine.nvim": { "branch": "master", "commit": "47f91c416daef12db467145e16bed5bbfe00add8" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "a676ab7282da8d651e175118bcf54483ca11e46d" },
+  "lualine.nvim": { "branch": "master", "commit": "8811f3f3f4dc09d740c67e9ce399e7a541e2e5b2" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "63a3c6a80538de1003373a619e29aeda27809ad3" },
   "mason-tool-installer.nvim": { "branch": "main", "commit": "443f1ef8b5e6bf47045cb2217b6f748a223cf7dc" },
-  "mason.nvim": { "branch": "main", "commit": "44d1e90e1f66e077268191e3ee9d2ac97cc18e65" },
-  "monokai-nightasty.nvim": { "branch": "main", "commit": "8be5e1c6e1d59873505e81b161e923264dfa5c1a" },
-  "none-ls-extras.nvim": { "branch": "main", "commit": "c6fa39ac52814182c05552cb5d3750cae23ff0f0" },
-  "none-ls.nvim": { "branch": "main", "commit": "c9317c2a8629d4e39e7cf47be74cb67f3ab37cda" },
+  "mason.nvim": { "branch": "main", "commit": "b03fb0f20bc1d43daf558cda981a2be22e73ac42" },
+  "monokai-nightasty.nvim": { "branch": "main", "commit": "1e9b92006782a1217d0a7a871b871768f1cbf5ed" },
+  "none-ls-extras.nvim": { "branch": "main", "commit": "14fa31ce8c0268a3b2c9cc14979ecf771982d433" },
+  "none-ls.nvim": { "branch": "main", "commit": "7f9301e416533b5d74e2fb3b1ce5059eeaed748b" },
   "nvim-autopairs": { "branch": "master", "commit": "59bce2eef357189c3305e25bc6dd2d138c1683f5" },
-  "nvim-cmp": { "branch": "main", "commit": "da88697d7f45d16852c6b2769dc52387d1ddc45f" },
+  "nvim-cmp": { "branch": "main", "commit": "a1d504892f2bc56c2e79b65c6faded2fd21f3eca" },
   "nvim-lsp-file-operations": { "branch": "master", "commit": "b9c795d3973e8eec22706af14959bc60c579e771" },
-  "nvim-lspconfig": { "branch": "master", "commit": "1d13d2b0df9a0a02904c76d7ad6810f71d404406" },
+  "nvim-lspconfig": { "branch": "master", "commit": "fb5fa30626ae10f7f79f740059d3769993936ecb" },
   "nvim-surround": { "branch": "main", "commit": "61319d4bd1c5e336e197defa15bd104c51f0fb29" },
-  "nvim-tree.lua": { "branch": "master", "commit": "b3772adec8db61ba9098c5624a0823a77be3a23d" },
-  "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
+  "nvim-tree.lua": { "branch": "master", "commit": "509962f21ab7289d8dcd28568af539be39a8c01e" },
+  "nvim-treesitter": { "branch": "main", "commit": "4916d6592ede8c07973490d9322f187e07dfefac" },
   "nvim-ts-autotag": { "branch": "main", "commit": "8e1c0a389f20bf7f5b0dd0e00306c1247bda2595" },
-  "nvim-web-devicons": { "branch": "master", "commit": "d7462543c9e366c0d196c7f67a945eaaf5d99414" },
+  "nvim-web-devicons": { "branch": "master", "commit": "95b7a002d5dba1a42eb58f5fac5c565a485eefd0" },
   "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
   "telescope-fzf-native.nvim": { "branch": "main", "commit": "6fea601bd2b694c6f2ae08a6c6fab14930c60e2c" },
-  "telescope.nvim": { "branch": "0.1.x", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" },
+  "telescope.nvim": { "branch": "master", "commit": "7ef4d6dccb78ee71e552bbd866176762ad328afa" },
   "vim-floaterm": { "branch": "master", "commit": "0ab5eb8135dc884bc543a819ac7033c15e72a76b" },
   "which-key.nvim": { "branch": "main", "commit": "3aab2147e74890957785941f0c1ad87d0a44c15a" }
 }

roles/nvim/files/lua/config/core/options.lua

@@ -1,5 +1,7 @@
 local opt = vim.opt
 
+vim.filetype.add({ extension = { mdx = 'mdx' } })
+
 -- numbers
 opt.relativenumber = true
 opt.number = true

roles/nvim/files/lua/config/lazy.lua

@@ -1,4 +1,4 @@
-local lazypath = vim.fn.stdpath('data') .. 'lazy/lazy.nvim'
+local lazypath = vim.fn.stdpath('data') .. '/lazy/lazy.nvim'
 
 -- bootstrap lazy
 if not (vim.uv or vim.loop).fs_stat(lazypath) then

roles/nvim/files/lua/config/plugins/lsp/lspconfig.lua

@@ -85,7 +85,16 @@ return {
 		-- Explicitly enable all mason-managed servers.
 		-- This is belt-and-suspenders alongside mason-lspconfig's automatic_enable,
 		-- ensuring servers start regardless of mason-lspconfig version.
-		vim.lsp.enable({ 'lua_ls', 'html', 'cssls', 'bashls', 'ts_ls', 'eslint', 'tailwindcss' })
+		vim.lsp.enable({ 'lua_ls', 'html', 'cssls', 'bashls', 'ts_ls', 'eslint', 'tailwindcss', 'mdx_analyzer' })
+
+		-- mdx_analyzer: needs typescript SDK path to find tsserverlibrary.js
+		vim.lsp.config('mdx_analyzer', {
+			init_options = {
+				typescript = {
+					tsdk = vim.fn.stdpath('data') .. '/mason/packages/typescript-language-server/node_modules/typescript/lib',
+				},
+			},
+		})
 
 		-- hyprls: not managed by mason, enable manually
 		vim.lsp.config('hyprls', {

roles/nvim/files/lua/config/plugins/telescope.lua

@@ -1,6 +1,5 @@
 return {
-	'nvim-telescope/telescope.nvim',
-	branch = '0.1.x',
+	'nvim-telescope/telescope.nvim', -- 0.1.x dropped; master has nvim 0.12 compat (ft_to_lang removal)
 	dependencies = {
 		'nvim-lua/plenary.nvim',
 		{ "nvim-telescope/telescope-fzf-native.nvim", build = "make" },

roles/nvim/files/lua/config/plugins/treesitter.lua

@@ -1,23 +1,18 @@
 return {
 	"nvim-treesitter/nvim-treesitter",
+	branch = "main", -- master is frozen; main required for nvim 0.12+
 	event = { "BufReadPre", "BufNewFile" },
 	build = ":TSUpdate",
 	dependencies = {
 		"windwp/nvim-ts-autotag",
 	},
 	config = function()
-		local treesitter = require('nvim-treesitter.configs')
-
-		treesitter.setup({
+		require('nvim-treesitter').setup({
 			auto_install = true,
-			sync_install = false,
-			highlight = {
-				enable = true,
-				additional_vim_regex_highlighting = false,
-			},
+			prefer_git = true, -- tarball downloads fail for some parsers on 0.12
+			highlight = { enable = true },
 			indent = { enable = true },
-			autotag = { enable = true },
-			ensure_installed = {
+			install = {
 				'json',
 				'javascript',
 				'typescript',
@@ -35,17 +30,10 @@ return {
 				'python',
 				'gitignore',
 				'c',
-			},
-			ignore_install = {},
-			incremental_selection = {
-				enable = true,
-				keymaps = {
-					init_selection = '<C-Space>',
-					node_incremental = '<C-Space>',
-					scope_incremental = false,
-					node_decremental = '<bs>',
-				},
+				'mdx',
 			},
 		})
+
+		require('nvim-ts-autotag').setup()
 	end,
 }

roles/zsh/files/.zshenv

@@ -0,0 +1 @@
+export PATH="/home/johannes/.local/bin:$PATH"

roles/zsh/files/aliases.zsh

@@ -20,3 +20,5 @@ rm() {
 }
 
 alias lg='lazygit'
+
+alias tt='taskwarrior-tui'

roles/zsh/tasks/main.yaml

@@ -12,15 +12,16 @@
   args:
     creates: "{{ home_dir }}/.oh-my-zsh"
 
-- name: Check for custom zshrc
-  stat:
-    path: "{{ role_path }}/files/.zshrc"
-  register: custom_zshrc
+- name: Symlink .zshenv
+  file:
+    src: "{{ role_path }}/files/.zshenv"
+    dest: "{{ home_dir }}/.zshenv"
+    state: link
+    force: yes
 
-- name: Symlink custom zshrc
+- name: Symlink .zshrc
   file:
     src: "{{ role_path }}/files/.zshrc"
     dest: "{{ home_dir }}/.zshrc"
     state: link
     force: yes
-  when: custom_zshrc.stat.exists