From d46929c1f3e75bcd00fb9bbce30ff8ed60fb804c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Pankowski?= Date: Sat, 4 Nov 2023 09:59:18 +0100 Subject: [PATCH] treesitter templ, tab 8, M- harpoon, indent-blankline new version --- nvim/.config/nvim/after/plugin/treesitter.lua | 11 +++++++++++ nvim/.config/nvim/lua/lupan/options.lua | 2 +- nvim/.config/nvim/lua/lupan/remap.lua | 2 +- nvim/.config/nvim/lua/plugins/appearance.lua | 5 +++-- nvim/.config/nvim/lua/plugins/init.lua | 1 + 5 files changed, 17 insertions(+), 4 deletions(-) diff --git a/nvim/.config/nvim/after/plugin/treesitter.lua b/nvim/.config/nvim/after/plugin/treesitter.lua index dbab0e9..536be29 100644 --- a/nvim/.config/nvim/after/plugin/treesitter.lua +++ b/nvim/.config/nvim/after/plugin/treesitter.lua @@ -63,6 +63,17 @@ require('nvim-treesitter.configs').setup { }, } +local treesitter_parser_config = require "nvim-treesitter.parsers".get_parser_configs() +treesitter_parser_config.templ = { + install_info = { + url = "https://github.com/vrischmann/tree-sitter-templ.git", + files = { "src/parser.c", "src/scanner.c" }, + branch = "master", + }, +} + +vim.treesitter.language.register('templ', 'templ') + org.setup({ org_agenda_files = { '~/org/*.org' }, org_default_notes_file = '~/org/capture.org', diff --git a/nvim/.config/nvim/lua/lupan/options.lua b/nvim/.config/nvim/lua/lupan/options.lua index 171c3b0..e1994dc 100644 --- a/nvim/.config/nvim/lua/lupan/options.lua +++ b/nvim/.config/nvim/lua/lupan/options.lua @@ -35,7 +35,7 @@ vim.o.termguicolors = true vim.o.scrolloff = 8 -vim.o.tabstop = 4 +vim.o.tabstop = 8 vim.o.softtabstop = 4 vim.o.shiftwidth = 4 vim.o.expandtab = true diff --git a/nvim/.config/nvim/lua/lupan/remap.lua b/nvim/.config/nvim/lua/lupan/remap.lua index d1ebff9..3b43385 100644 --- a/nvim/.config/nvim/lua/lupan/remap.lua +++ b/nvim/.config/nvim/lua/lupan/remap.lua @@ -148,7 +148,7 @@ key('n', 'hk', function() end, { desc = '[H]arpoon prev (k)' }) for i = 1, 9, 1 do - key('n', 'h' .. i, function() + key('n', '', function() require("harpoon.ui").nav_file(i) end, { desc = '[H]arpoon nav_file [' .. i .. ']' }) end diff --git a/nvim/.config/nvim/lua/plugins/appearance.lua b/nvim/.config/nvim/lua/plugins/appearance.lua index e58f39c..55c8a6e 100644 --- a/nvim/.config/nvim/lua/plugins/appearance.lua +++ b/nvim/.config/nvim/lua/plugins/appearance.lua @@ -28,9 +28,10 @@ return { { -- Indentation guides (see `:help indent_blankline.txt`) 'lukas-reineke/indent-blankline.nvim', + main = "ibl", opts = { - char = '┊', - show_trailing_blankline_indent = false, + -- char = '┊', + -- show_trailing_blankline_indent = false, }, }, diff --git a/nvim/.config/nvim/lua/plugins/init.lua b/nvim/.config/nvim/lua/plugins/init.lua index 94fde54..157d673 100644 --- a/nvim/.config/nvim/lua/plugins/init.lua +++ b/nvim/.config/nvim/lua/plugins/init.lua @@ -16,6 +16,7 @@ return { dependencies = { 'nvim-treesitter/nvim-treesitter-textobjects', 'nvim-orgmode/orgmode', -- as configured together + 'vrischmann/tree-sitter-templ', }, build = ':TSUpdate'