From 25e4b4de09309f2e4910cab69c9d8bf0d0f5debf Mon Sep 17 00:00:00 2001 From: sloane Date: Sun, 10 Nov 2024 16:16:11 -0500 Subject: [PATCH] neovim pollen support --- .config/nvim/lazy-lock.json | 17 +++++---- .config/nvim/lua/plugins/core.lua | 6 ++- .config/nvim/lua/plugins/syntax.lua | 51 +++++++++++++++++++++++++ .config/nvim/lua/plugins/treesitter.lua | 23 ----------- 4 files changed, 65 insertions(+), 32 deletions(-) create mode 100644 .config/nvim/lua/plugins/syntax.lua delete mode 100644 .config/nvim/lua/plugins/treesitter.lua diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json index 7d8bced..13a6fcb 100644 --- a/.config/nvim/lazy-lock.json +++ b/.config/nvim/lazy-lock.json @@ -1,18 +1,19 @@ { - "LuaSnip": { "branch": "master", "commit": "8d7aa7a7b7c0875e4878d1d2590924bc1c229305" }, + "LuaSnip": { "branch": "master", "commit": "2737edc9e674e537dc0a97e3405658d57d2d31ed" }, + "catppuccin": { "branch": "main", "commit": "637d99e638bc6f1efedac582f6ccab08badac0c6" }, "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, "hunk.nvim": { "branch": "master", "commit": "eb89245a66bdfce10436d15923bf4deb43d23c96" }, - "lazy.nvim": { "branch": "main", "commit": "cf8ecc2c5e4332760431a33534240b0cbc6680ab" }, - "lsp-zero.nvim": { "branch": "v4.x", "commit": "19a8b90340c6c522219c84f7befe784d657ab28e" }, + "lazy.nvim": { "branch": "main", "commit": "b1134ab82ee4279e31f7ddf7e34b2a99eb9b7bc9" }, + "lsp-zero.nvim": { "branch": "v4.x", "commit": "4f1e00bfe276758d30fec5d1eb161108ff8a959b" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "4d0e5b49363cac187326998b96aa6a2884e0e89b" }, "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, "mini.icons": { "branch": "main", "commit": "a2742459f0ee32806c2438ca06b4d8b331f3f4d4" }, "nerdtree": { "branch": "master", "commit": "9b465acb2745beb988eff3c1e4aa75f349738230" }, "nui.nvim": { "branch": "main", "commit": "b58e2bfda5cea347c9d58b7f11cf3012c7b3953f" }, "nvim-autopairs": { "branch": "master", "commit": "ee297f215e95a60b01fde33275cc3c820eddeebe" }, - "nvim-cmp": { "branch": "main", "commit": "29fb4854573355792df9e156cb779f0d31308796" }, - "nvim-lspconfig": { "branch": "master", "commit": "54617a18f4cf46f0c2f6d024fa6feb7515fe036d" }, - "nvim-treesitter": { "branch": "master", "commit": "b065b59196edb10a7c29bfbed88cc225b7e3de37" }, + "nvim-cmp": { "branch": "main", "commit": "f17d9b4394027ff4442b298398dfcaab97e40c4f" }, + "nvim-lspconfig": { "branch": "master", "commit": "d01864641c6e43c681c3e9f6cf4745c75fdd9dcc" }, + "nvim-treesitter": { "branch": "master", "commit": "425b58968340bd5b4621c2a0d626c73556516d3d" }, "nvim-web-devicons": { "branch": "master", "commit": "19d257cf889f79f4022163c3fbb5e08639077bd8" }, "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" }, "telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, @@ -20,7 +21,7 @@ "vim-commentary": { "branch": "master", "commit": "64a654ef4a20db1727938338310209b6a63f60c9" }, "vim-dispatch": { "branch": "master", "commit": "a2ff28abdb2d89725192db5b8562977d392a4d3f" }, "vim-fugitive": { "branch": "master", "commit": "d4877e54cef67f5af4f950935b1ade19ed6b7370" }, - "vim-helix": { "branch": "main", "commit": "0d6bab9626cf74dedc16997e9f8d8c356939e76d" }, + "vim-pollen": { "branch": "master", "commit": "aaceb56e67a155900f55319dfe92c4bd8aa8c56a" }, "vim-repeat": { "branch": "master", "commit": "65846025c15494983dafe5e3b46c8f88ab2e9635" }, "vim-rhubarb": { "branch": "master", "commit": "ee69335de176d9325267b0fd2597a22901d927b1" }, "vim-sensible": { "branch": "master", "commit": "0ce2d843d6f588bb0c8c7eec6449171615dc56d9" }, @@ -28,5 +29,5 @@ "vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" }, "vim-textobj-user": { "branch": "master", "commit": "41a675ddbeefd6a93664a4dc52f302fe3086a933" }, "vim-tmux-navigator": { "branch": "master", "commit": "424b5caa154bff34dc258ee53cec5a8e36cf7ea8" }, - "which-key.nvim": { "branch": "main", "commit": "8badb359f7ab8711e2575ef75dfe6fbbd87e4821" } + "which-key.nvim": { "branch": "main", "commit": "68e37e12913a66b60073906f5d3f14dee0de19f2" } } diff --git a/.config/nvim/lua/plugins/core.lua b/.config/nvim/lua/plugins/core.lua index 79b6e54..a21512c 100644 --- a/.config/nvim/lua/plugins/core.lua +++ b/.config/nvim/lua/plugins/core.lua @@ -51,6 +51,10 @@ return { { 'windwp/nvim-autopairs', event = 'InsertEnter', - config = true, + config = function () + require('nvim-autopairs').setup({ + disabled_filetype = { 'TelescopePrompt', 'pollen' }, + }) + end, }, } diff --git a/.config/nvim/lua/plugins/syntax.lua b/.config/nvim/lua/plugins/syntax.lua new file mode 100644 index 0000000..17722fd --- /dev/null +++ b/.config/nvim/lua/plugins/syntax.lua @@ -0,0 +1,51 @@ +return { + { + 'nvim-treesitter/nvim-treesitter', + build = ':TSUpdate', + config = function () + require('nvim-treesitter.configs').setup({ + ensure_installed = { + 'elixir', + 'javascript', + 'typescript', + 'css', + 'markdown', + 'lua', + 'html', + }, + auto_install = false, + highlight = { + enable = true, + }, + }) + end + }, + { + 'otherjoel/vim-pollen', + config = function () + vim_pollen_autogroup = vim.api.nvim_create_augroup('vim-pollen', { clear = true }) + vim.api.nvim_create_autocmd({ 'BufRead', 'BufNewFile' }, { + pattern = { '*.pm', '*.pp', '*.ptree', '*.p' }, + command = 'set filetype=pollen', + group = vim_pollen_autogroup, + }) + vim.api.nvim_create_autocmd('FileType', { + pattern = { 'pollen' }, + command = 'setlocal wrap', + group = vim_pollen_autogroup, + }) + vim.api.nvim_create_autocmd('FileType', { + pattern = { 'pollen' }, + command = 'setlocal linebreak', + group = vim_pollen_autogroup, + }) + vim.api.nvim_create_autocmd('FileType', { + pattern = { 'pollen' }, + callback = function () + require('nvim-autopairs').disable() + end, + group = vim_pollen_autogroup, + }) + end + }, +} diff --git a/.config/nvim/lua/plugins/treesitter.lua b/.config/nvim/lua/plugins/treesitter.lua deleted file mode 100644 index 2af0df1..0000000 --- a/.config/nvim/lua/plugins/treesitter.lua +++ /dev/null @@ -1,23 +0,0 @@ -return { - { - 'nvim-treesitter/nvim-treesitter', - build = ':TSUpdate', - config = function () - require('nvim-treesitter.configs').setup({ - ensure_installed = { - 'elixir', - 'javascript', - 'typescript', - 'css', - 'markdown', - 'lua', - 'html', - }, - auto_install = true, - highlight = { - enable = true, - }, - }) - end - }, -}