From 37a6a56f601a4468bceabf5066da2ce63b2b813b Mon Sep 17 00:00:00 2001 From: winston Date: Sat, 15 Apr 2023 04:30:15 +0200 Subject: [PATCH] fix(neovim): update for 0.9.0 --- home/apps/neovim/lazy-lock.json | 26 ++++++++++---------- home/apps/neovim/lua/config/options.lua | 2 ++ home/apps/neovim/lua/plugins/alpha.lua | 1 - home/apps/neovim/lua/plugins/tree-sitter.lua | 15 ----------- 4 files changed, 15 insertions(+), 29 deletions(-) diff --git a/home/apps/neovim/lazy-lock.json b/home/apps/neovim/lazy-lock.json index 894a9ef..66665c7 100644 --- a/home/apps/neovim/lazy-lock.json +++ b/home/apps/neovim/lazy-lock.json @@ -3,10 +3,10 @@ "asyncrun.vim": { "branch": "master", "commit": "7191d0c30dd105e5d7f897b9a6ee19cabe734466" }, "asynctasks.vim": { "branch": "master", "commit": "784a4b1f75a913cc6c43dd6c4dbe69d648dbbfa5" }, "auto-dark-mode.nvim": { "branch": "master", "commit": "a02ff9ee4630dd8e81dc097b486b7c7f468b9db7" }, - "bufferline.nvim": { "branch": "main", "commit": "ef4fdc5cea3473801dce89b5fdfe633380c80c65" }, - "catppuccin": { "branch": "main", "commit": "5e31d3ce29aa17b7a047b1a0e6b9ce9d6702c511" }, + "bufferline.nvim": { "branch": "main", "commit": "4df8c8ae3a81fa40ed0d36b819fa1afe3bf0f167" }, + "catppuccin": { "branch": "main", "commit": "415b4b8c81c6552a00e79badf2e60e53e3a96bd0" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, - "cmp-cmdline": { "branch": "main", "commit": "8fcc934a52af96120fe26358985c10c035984b53" }, + "cmp-cmdline": { "branch": "main", "commit": "af88e700417c6449719fc77f6f3745f88e42d5da" }, "cmp-git": { "branch": "main", "commit": "a798a25b21e7204597f56029af2e8a17d65e2518" }, "cmp-nvim-lsp": { "branch": "main", "commit": "0e6b2ed705ddcff9738ec4ea838141654f12eeef" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, @@ -16,9 +16,9 @@ "dressing.nvim": { "branch": "master", "commit": "0e3e1eba147fee6e638ac1ac28f0495bcde17319" }, "editorconfig.nvim": { "branch": "master", "commit": "5b9e303e1d6f7abfe616ce4cc8d3fffc554790bf" }, "fidget.nvim": { "branch": "main", "commit": "0ba1e16d07627532b6cae915cc992ecac249fb97" }, - "friendly-snippets": { "branch": "main", "commit": "8d91ba2dc2421a54981115f61b914974f938fa77" }, + "friendly-snippets": { "branch": "main", "commit": "781af8c404ce351e999b5102b9724ee847f3ad18" }, "gitsigns.nvim": { "branch": "main", "commit": "372d5cb485f2062ac74abc5b33054abac21d8b58" }, - "go.nvim": { "branch": "master", "commit": "d7530aea0f1086d10e9267287966702616c366af" }, + "go.nvim": { "branch": "master", "commit": "fcc88590e0ad9d4f967ce61e14f2f979acb63b77" }, "guihua.lua": { "branch": "master", "commit": "d331b1526a87edbe13679298c3547d49f8a14ffc" }, "headlines.nvim": { "branch": "master", "commit": "ddef41b2664f0ce25fe76520d708e2dc9dfebd70" }, "indent-blankline.nvim": { "branch": "master", "commit": "018bd04d80c9a73d399c1061fa0c3b14a7614399" }, @@ -29,8 +29,8 @@ "ltex-extra.nvim": { "branch": "master", "commit": "1d2f288ceedc70d5a9c00f55c0d0cc788b5164f2" }, "lualine.nvim": { "branch": "master", "commit": "84ffb80e452d95e2c46fa29a98ea11a240f7843e" }, "markdown-preview.nvim": { "branch": "master", "commit": "02cc3874738bc0f86e4b91f09b8a0ac88aef8e96" }, - "neogit": { "branch": "master", "commit": "039ff3212ec43cc4d3332956dfb54e263c8d5033" }, - "neorg": { "branch": "main", "commit": "32c03d5a320235469050757ec890d8eb11c3135c" }, + "neogit": { "branch": "master", "commit": "69a6ca7c41b023ebf9cad70778e227b3209b40c4" }, + "neorg": { "branch": "main", "commit": "b725a58f25525efc1c39a13a09e6cec0c1c0ba4d" }, "null-ls.nvim": { "branch": "main", "commit": "f8ffcd7cb8fb3325c711d459152ef132b5b65aed" }, "nvim-autopairs": { "branch": "master", "commit": "7470af886ffb3df32800e5ef9c072a6cd825770d" }, "nvim-cmp": { "branch": "main", "commit": "777450fd0ae289463a14481673e26246b5e38bf2" }, @@ -38,14 +38,14 @@ "nvim-dap": { "branch": "master", "commit": "debd7c2f80eaf20c5f5df25db8d8c1b9b18f4421" }, "nvim-dap-ui": { "branch": "master", "commit": "286f682f366fbc652b38dff893569374e9433dd3" }, "nvim-dap-virtual-text": { "branch": "master", "commit": "9dc45a6eb33871f4c5cb2ba08fa307467657471e" }, - "nvim-lspconfig": { "branch": "master", "commit": "6fe69025b8825029ea9bf291ab3b1750f9bcb39e" }, + "nvim-lspconfig": { "branch": "master", "commit": "e52efca5d4f5536533d447ec0d97e4d525b37ace" }, "nvim-navic": { "branch": "master", "commit": "27124a773d362628b114cd12016e743dab4ccf3e" }, "nvim-spectre": { "branch": "master", "commit": "6e5ce371f93625c7dc43f5e2647d3647f2ea15e2" }, "nvim-surround": { "branch": "main", "commit": "e6047128e57c1aff1566fb9f627521d2887fc77a" }, "nvim-tree.lua": { "branch": "master", "commit": "b601b5aa25627f68d3d73ba9269b49e4f04ce126" }, - "nvim-treesitter": { "branch": "master", "commit": "18f9e1a47fc25272836a84aa8adb03925c73b33d" }, - "nvim-ts-autotag": { "branch": "main", "commit": "0716740e006c26bf233fe63203be29a135fe1f57" }, - "nvim-ts-rainbow2": { "branch": "master", "commit": "2c82e0965be2baf67fa2d3d48f3747437fde7204" }, + "nvim-treesitter": { "branch": "master", "commit": "f7e8b7420ccf8bc61534ea6155db03d62c7ff571" }, + "nvim-ts-autotag": { "branch": "main", "commit": "cac97f3b47bcb927db6d1d784c0c323056506ef3" }, + "nvim-ts-rainbow2": { "branch": "master", "commit": "7f814b9d6e4ef6f1f5b09526ba16b75125173480" }, "nvim-web-devicons": { "branch": "master", "commit": "4ec26d67d419c12a4abaea02f1b6c57b40c08d7e" }, "octo.nvim": { "branch": "master", "commit": "f37efab489a99b4a104e5ee18c73453d5e828b62" }, "playground": { "branch": "master", "commit": "934cb4c4adc2e7f4f351846a63c9532018c996ed" }, @@ -54,7 +54,7 @@ "py_lsp.nvim": { "branch": "main", "commit": "5b2bd6433a2dbab76d54d58ccc1d1e89b220091c" }, "rust-tools.nvim": { "branch": "master", "commit": "71d2cf67b5ed120a0e31b2c8adb210dd2834242f" }, "schemastore.nvim": { "branch": "main", "commit": "a592fbe98959d13014b022ec1b1418498309019c" }, - "stabilize.nvim": { "branch": "master", "commit": "34069870a8e72632c5447188e638e1c6bfebc353" }, + "stabilize.nvim": { "branch": "master", "commit": "eeb1873daffaba67246188a5668b366e45ed1de1" }, "telescope-asynctasks.nvim": { "branch": "main", "commit": "065300fb0a8ba6a1c81991da1873c73e136dcdc0" }, "telescope-file-browser.nvim": { "branch": "master", "commit": "e0fcb12702ad0d2873544a31730f9aaef04fd032" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "580b6c48651cabb63455e97d7e131ed557b8c7e2" }, @@ -67,7 +67,7 @@ "vim-dadbod": { "branch": "master", "commit": "3f57c0cd41523423fd781422dfc833820095a3e8" }, "vim-dadbod-completion": { "branch": "master", "commit": "e71eb6140556c5ced80de6299a1fdfe22bd3c1b1" }, "vim-dadbod-ui": { "branch": "master", "commit": "986324fa6372170ec47b28a5558ae7f7185e1d71" }, - "vim-fugitive": { "branch": "master", "commit": "ef99f1d90cdb33a52931aed5868785b51fb9411d" }, + "vim-fugitive": { "branch": "master", "commit": "e6651a79facf5cc2b7c554fdc19eb8a9fe89602c" }, "vim-gnupg": { "branch": "main", "commit": "f9b608f29003dfde6450931dc0f495a912973a88" }, "vim-helm": { "branch": "master", "commit": "c2e7b85711d410e1d73e64eb5df7b70b1c4c10eb" }, "vim-just": { "branch": "master", "commit": "2cf3acc4a7c0f9d2adc2b2fd3400557ab7d4e5b4" }, diff --git a/home/apps/neovim/lua/config/options.lua b/home/apps/neovim/lua/config/options.lua index 7c1e168..61d58b1 100644 --- a/home/apps/neovim/lua/config/options.lua +++ b/home/apps/neovim/lua/config/options.lua @@ -30,7 +30,9 @@ vim.o.shiftwidth = 2 vim.o.tabstop = 2 vim.o.softtabstop = 0 vim.o.expandtab = true +-- always show 1 column of sign column (gitsigns, etc.) vim.o.signcolumn = "yes:1" +-- hide search notices, intro vim.opt.shortmess:append("sI") -- double box drawing characters for splits vim.opt.fillchars:append({ diff --git a/home/apps/neovim/lua/plugins/alpha.lua b/home/apps/neovim/lua/plugins/alpha.lua index 14315d4..12c344f 100644 --- a/home/apps/neovim/lua/plugins/alpha.lua +++ b/home/apps/neovim/lua/plugins/alpha.lua @@ -29,7 +29,6 @@ return { .. require("lazy").stats().count .. " plugins" dashboard.config.opts.noautocmd = true - vim.cmd([[autocmd User AlphaReady echo 'ready']]) alpha.setup(dashboard.config) end, }, diff --git a/home/apps/neovim/lua/plugins/tree-sitter.lua b/home/apps/neovim/lua/plugins/tree-sitter.lua index 4793b9f..8d427aa 100644 --- a/home/apps/neovim/lua/plugins/tree-sitter.lua +++ b/home/apps/neovim/lua/plugins/tree-sitter.lua @@ -6,21 +6,6 @@ return { end, config = function() local treesitter = require("nvim-treesitter.configs") - local parsers = require("nvim-treesitter.parsers") - - local parser_config = parsers.get_parser_configs() - parser_config.gotmpl = { - install_info = { - url = "https://github.com/ngalaiko/tree-sitter-go-template", - files = { "src/parser.c" }, - }, - filetype = "gotmpl", - used_by = { "gohtmltmpl", "gotexttmpl", "gotmpl", "yaml", "helm" }, - } - - local ft_to_parser = parsers.filetype_to_parsername - ft_to_parser.helm = "gotmpl" - treesitter.setup({ auto_install = true, ignore_install = {