From c1f7b8ebe7b0081ca7e22b07c1cc626ba5bc3ab1 Mon Sep 17 00:00:00 2001 From: Hoang Nguyen Date: Sat, 2 Mar 2024 00:00:00 +0700 Subject: [PATCH] Prepend ts_parsers_path to vim.opt.rtp instead of append This puts the bundled parsers of neovim package in Nixpkgs behind the compiled ones from nvim-treesitter, hence eliminate the errors when opening vimdoc, vim, help or lua files. Ref: https://github.com/NixOS/nixpkgs/issues/282927 --- README.md | 2 ++ filetype.lua | 1 + lazy-lock.json | 34 +++++++++++----------- lua/user/plugins/editor/init.lua | 2 +- lua/user/plugins/lsp/lspconfig/servers.lua | 2 -- 5 files changed, 21 insertions(+), 20 deletions(-) diff --git a/README.md b/README.md index 0ee44cc..206c6f2 100644 --- a/README.md +++ b/README.md @@ -49,10 +49,12 @@ This Neovim config used to live within [my dotfiles](/FollieHiyuki/dotfiles-ansi - [hover.nvim](https://github.com/lewis6991/hover.nvim) - [otter.nvim](https://github.com/jmbuhr/otter.nvim) - [nvim-rulebook](https://github.com/chrisgrieser/nvim-rulebook) +- [lazy-nix-helper.nvim](https://github.com/b-src/lazy-nix-helper.nvim) (to turn this repo into a proper Nix Flake) ### Logic - Smooth colorschemes changing (dynamic highlight groups registration via event hooks) +- `vim.loop` -> `vim.uv` in Neovim 0.10.0 - [Neorocks](https://github.com/nvim-neorocks) looks cool :) ## FAQ diff --git a/filetype.lua b/filetype.lua index c7eb9e9..fbec480 100644 --- a/filetype.lua +++ b/filetype.lua @@ -27,6 +27,7 @@ vim.filetype.add { mmd = 'mermaid', ncl = 'nickel', nu = 'nu', + purs = 'purescript', rasi = 'rasi', rasinc = 'rasi', res = 'rescript', diff --git a/lazy-lock.json b/lazy-lock.json index 5d130d0..7ce187d 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,28 +1,28 @@ { "LuaSnip": { "branch": "master", "commit": "f3b3d3446bcbfa62d638b1903ff00a78b2b730a1" }, - "SchemaStore.nvim": { "branch": "main", "commit": "a93078f016d3216f4ab4e4c65306b65212314d8d" }, - "aerial.nvim": { "branch": "master", "commit": "3748e87a316a68754341cdffcef44fee61dee51c" }, + "SchemaStore.nvim": { "branch": "main", "commit": "ebe6fe2e78c19a0cf6e82752ab6f3ac55c35ef99" }, + "aerial.nvim": { "branch": "master", "commit": "8da95fd05b343cc967db519d773288bede39f3dc" }, "alpha-nvim": { "branch": "main", "commit": "41283fb402713fc8b327e60907f74e46166f4cfd" }, "better-escape.nvim": { "branch": "master", "commit": "7e86edafb8c7e73699e0320f225464a298b96d12" }, "carbon-now.nvim": { "branch": "main", "commit": "16e843489ba00493466170919abfe144fc9aa158" }, - "ccc.nvim": { "branch": "main", "commit": "0ca30a4fd8429bffb6394f4ee27166fb4ff29fbf" }, + "ccc.nvim": { "branch": "main", "commit": "c8cfd0a307c166d0defe6dde0c9f69cb9ea55a27" }, "cmp-async-path": { "branch": "main", "commit": "6eeaf0f3968ea1e6f135a5ee5aa01828f66611a5" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-dap": { "branch": "master", "commit": "ea92773e84c0ad3288c3bc5e452ac91559669087" }, "cmp-fish": { "branch": "main", "commit": "8ae7bfb1b3251d433c4adf4e64396ef929fbd91f" }, "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, - "conform.nvim": { "branch": "master", "commit": "192a6d2ddace343f1840a8f72efe2315bd392243" }, + "conform.nvim": { "branch": "master", "commit": "f882877f03ebd46067c6a5493d259c4b9a9280f0" }, "dial.nvim": { "branch": "master", "commit": "27eb570085db2ef44bff4f620d3806039184651c" }, "diffview.nvim": { "branch": "main", "commit": "3dc498c9777fe79156f3d32dddd483b8b3dbd95f" }, "dressing.nvim": { "branch": "master", "commit": "6f212262061a2120e42da0d1e87326e8a41c0478" }, - "emmylua-nvim": { "branch": "master", "commit": "0709bd0acbb0191f4fa6e6566c6fd0869be09707" }, + "emmylua-nvim": { "branch": "master", "commit": "60f301b41df9744543f1d6d9895915d8ddcc868f" }, "flash.nvim": { "branch": "main", "commit": "48817af25f51c0590653bbc290866e4890fe1cbe" }, "flatten.nvim": { "branch": "main", "commit": "92c59ae6200e6b04aff167577ebb8a9035a6d2b3" }, "friendly-snippets": { "branch": "main", "commit": "dcd4a586439a1c81357d5b9d26319ae218cc9479" }, "git-conflict.nvim": { "branch": "main", "commit": "4c8e252b87d54d944c1e56bfb477f78b6fdaf661" }, "gitsigns.nvim": { "branch": "main", "commit": "2c2463dbd82eddd7dbab881c3a62cfbfbe3c67ae" }, - "headlines.nvim": { "branch": "master", "commit": "d39c4e6ed8963717bc9b2dc39fada8fe1039e9bf" }, + "headlines.nvim": { "branch": "master", "commit": "618ef1b2502c565c82254ef7d5b04402194d9ce3" }, "heirline.nvim": { "branch": "master", "commit": "03cff30d7e7d3ba6fdc00925f015822f79cef908" }, "inc-rename.nvim": { "branch": "main", "commit": "6f9b5f9cb237e12935144cdc535322b8c93c1b25" }, "indent-blankline.nvim": { "branch": "master", "commit": "821a7acd88587d966f7e464b0b3031dfe7f5680c" }, @@ -39,17 +39,17 @@ "mini.pairs": { "branch": "main", "commit": "04f58f2545ed80ac3b52dd4826e93f33e15b2af6" }, "mini.surround": { "branch": "main", "commit": "a1b590cc3b676512de507328d6bbab5e43794720" }, "neo-tree.nvim": { "branch": "main", "commit": "459c60317cc1d251f6eb3b6f010d015d5d24b806" }, - "neoconf.nvim": { "branch": "main", "commit": "faab415b0ba57f0a15a82210f346f662e6551e1a" }, + "neoconf.nvim": { "branch": "main", "commit": "2feab3abaa2c00dc21f490619f5c0f4ccf0ba495" }, "neogen": { "branch": "main", "commit": "70127baaff25611deaf1a29d801fc054ad9d2dc1" }, "neogit": { "branch": "master", "commit": "0d0879b0045fb213c328126969a3317c0963d34a" }, "neotest": { "branch": "master", "commit": "4440cc2227894c2ae9b0673a30e6cc6f1836e8c2" }, "neotest-go": { "branch": "main", "commit": "6a2f996d89fe4631942e035b1c114544ee045043" }, "neotest-jest": { "branch": "main", "commit": "959d45b133de938c79e3f064db188680eaf69055" }, "neotest-python": { "branch": "master", "commit": "2e83d2bc00acbcc1fd529dbf0a0e677cabfe6b50" }, - "neotest-vitest": { "branch": "main", "commit": "c0ea475596483eb02fa8e92c6be65c0536d55630" }, + "neotest-vitest": { "branch": "main", "commit": "ae774282a592b872e84ffdcc5b4d11fc991eca7b" }, "neotest-zig": { "branch": "main", "commit": "742f97f971a39d44b4832b432083608834a0e59c" }, "noice.nvim": { "branch": "main", "commit": "bf67d70bd7265d075191e7812d8eb42b9791f737" }, - "nui.nvim": { "branch": "main", "commit": "c3c7fd618dcb5a89e443a2e1033e7d11fdb0596b" }, + "nui.nvim": { "branch": "main", "commit": "b81333d12f824dbed5eb231c8a4409a290fdd848" }, "nvim-cmp": { "branch": "main", "commit": "04e0ca376d6abdbfc8b52180f8ea236cbfddf782" }, "nvim-cokeline": { "branch": "main", "commit": "7310f192af74c6912ca7a40ae1b16253aa95e50e" }, "nvim-coverage": { "branch": "main", "commit": "cf4b5c61dfac977026a51a2bcad9173c272986ce" }, @@ -57,27 +57,27 @@ "nvim-dap-repl-highlights": { "branch": "master", "commit": "902d533b2682c26d6be4f8a4d1dfd895cbba4840" }, "nvim-dap-ui": { "branch": "master", "commit": "9720eb5fa2f41988e8770f973cd11b76dd568a5d" }, "nvim-dap-virtual-text": { "branch": "master", "commit": "d4542ac257d3c7ee4131350db6179ae6340ce40b" }, - "nvim-lint": { "branch": "master", "commit": "85fe14d080d902dcc566461f0205495d0c153372" }, - "nvim-lspconfig": { "branch": "master", "commit": "b1a11b042d015df5b8f7f33aa026e501b639c649" }, + "nvim-lint": { "branch": "master", "commit": "e824adb9bc01647f71e55457353a68f0f37f9931" }, + "nvim-lspconfig": { "branch": "master", "commit": "9553725789be682ecd945a527ec552e489ea8534" }, "nvim-notify": { "branch": "master", "commit": "5371f4bfc1f6d3adf4fe9d62cd3a9d44356bfd15" }, "nvim-scrollbar": { "branch": "main", "commit": "35f99d559041c7c0eff3a41f9093581ceea534e8" }, "nvim-spectre": { "branch": "master", "commit": "3712ff0cdf4f9f877d9ca708d835a877d9a0abaf" }, - "nvim-treesitter": { "branch": "master", "commit": "db12bd416e2764420047e4a5d6b96fe44e4377d5" }, + "nvim-treesitter": { "branch": "master", "commit": "a47540fd737eb5c03ee21ee69eb8134ce5568fb6" }, "nvim-treesitter-context": { "branch": "master", "commit": "b8d1ffe58a88e0356da56b167373e89c4579ce15" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "7f00d94543f1fd37cab2afa2e9a6cd54e1c6b9ef" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "95933e762e28f9d38b572d65e7e4da9d2f4d90cb" }, "nvim-ts-autotag": { "branch": "main", "commit": "531f48334c422222aebc888fd36e7d109cb354cd" }, "nvim-ts-context-commentstring": { "branch": "main", "commit": "7ab799a9792f7cf3883cf28c6a00ad431f3d382a" }, - "nvim-web-devicons": { "branch": "master", "commit": "0bb67ef952ea3eb7b1bac9c011281471d99a27bc" }, + "nvim-web-devicons": { "branch": "master", "commit": "4adea17610d140a99c313e3f79a9dc01825d59ae" }, "nvim-window-picker": { "branch": "main", "commit": "41cfaa428577c53552200a404ae9b3a0b5719706" }, "oil.nvim": { "branch": "master", "commit": "132b4ea0740c417b9d717411cab4cf187e1fd095" }, - "orgmode": { "branch": "master", "commit": "845be5c60a00b6695a75d9d31f3809088cccafad" }, + "orgmode": { "branch": "master", "commit": "9ec93bf826e2808532f075a15544a5dd855c2332" }, "overseer.nvim": { "branch": "master", "commit": "4855aefcf335bbac71eea9c6a888958fb1ed1e1a" }, "pantran.nvim": { "branch": "main", "commit": "461799624948bfb66f73b20b6fffa7e4c8ca6d08" }, "parinfer-rust": { "branch": "master", "commit": "0e4d52e712641ad351a1bfe6cee3d34d63ed087b" }, "persistence.nvim": { "branch": "main", "commit": "4982499c1636eac254b72923ab826ee7827b3084" }, "plenary.nvim": { "branch": "master", "commit": "4f71c0c4a196ceb656c824a70792f3df3ce6bb6d" }, "project.nvim": { "branch": "main", "commit": "8c6bad7d22eef1b71144b401c9f74ed01526a4fb" }, - "rainbow-delimiters.nvim": { "branch": "master", "commit": "64b7006a36cec099da7eaeb056c4a27dd5d73342" }, + "rainbow-delimiters.nvim": { "branch": "master", "commit": "cfc3f53cfa0fbabd95bd33747288aea24fe45211" }, "rest.nvim": { "branch": "main", "commit": "c27a0bcb84ab5534d89065d638119ed2dbbae189" }, "scope.nvim": { "branch": "main", "commit": "cd27af77ad61a7199af5c28d27013fb956eb0e3e" }, "sniprun": { "branch": "master", "commit": "0079f9c4675a6825f84e108bbff866f67dd8762f" }, @@ -87,7 +87,7 @@ "telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" }, "telescope-symbols.nvim": { "branch": "master", "commit": "a6d0127a53d39b9fc2af75bd169d288166118aec" }, "telescope-tabs": { "branch": "master", "commit": "0a678eefcb71ebe5cb0876aa71dd2e2583d27fd3" }, - "telescope.nvim": { "branch": "master", "commit": "2e1e382df42467029b493c143c2e727028140214" }, + "telescope.nvim": { "branch": "master", "commit": "aa83606299c5beeaf80e656efbf07bde258db7be" }, "todo-comments.nvim": { "branch": "main", "commit": "833d8dd8b07eeda37a09e99460f72a02616935cb" }, "toggleterm.nvim": { "branch": "main", "commit": "193786e0371e3286d3bc9aa0079da1cd41beaa62" }, "treesj": { "branch": "main", "commit": "60e27280030f9cd8dfb6ceb335922c6ff76682cc" }, diff --git a/lua/user/plugins/editor/init.lua b/lua/user/plugins/editor/init.lua index 2546396..2c8be6e 100644 --- a/lua/user/plugins/editor/init.lua +++ b/lua/user/plugins/editor/init.lua @@ -60,7 +60,7 @@ return { }, }, init = function(plugin) - vim.opt.rtp:append(ts_parsers_path) + vim.opt.rtp:prepend(ts_parsers_path) -- Make queries available early, since lots of plugins don't require nvim-treesitter anymore require('lazy.core.loader').add_to_rtp(plugin) diff --git a/lua/user/plugins/lsp/lspconfig/servers.lua b/lua/user/plugins/lsp/lspconfig/servers.lua index a3526c8..aff965e 100644 --- a/lua/user/plugins/lsp/lspconfig/servers.lua +++ b/lua/user/plugins/lsp/lspconfig/servers.lua @@ -234,8 +234,6 @@ return { purescriptls = { cmd = { servers_path .. '/purescriptls/node_modules/.bin/purescript-language-server', '--stdio' }, - root_dir = lsputil.root_pattern('spago.dhall', 'spago.yaml', 'bower.json', 'psc-package.json'), - -- Ref: https://github.com/nwolverson/vscode-ide-purescript/blob/master/package.json settings = { purescript = {