From 82bdf9f215740a35a2db5c0eeacacb2388ca7871 Mon Sep 17 00:00:00 2001 From: mjhika <1zzt6ovh@mojica.anonaddy.com> Date: Tue, 3 Oct 2023 16:40:15 -0400 Subject: [PATCH] fix blankline bug, return to parinfer --- lazy-lock.json | 22 +++++++++++----------- lua/custom/plugins/blankline.lua | 1 + lua/custom/plugins/lisp.lua | 24 ++++++++++++------------ 3 files changed, 24 insertions(+), 23 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index a76169c2..5680b39d 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,6 +1,6 @@ { "Comment.nvim": { "branch": "master", "commit": "0236521ea582747b58869cb72f70ccfa967d2e89" }, - "LuaSnip": { "branch": "master", "commit": "480b032f6708573334f4437d3f83307d143f1a72" }, + "LuaSnip": { "branch": "master", "commit": "6085dfd1808fb0059e13d160317a10c3a68c5407" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-conjure": { "branch": "master", "commit": "d97816d5007be2b060f3a4e09f5b144d97d96fe8" }, "cmp-nvim-lsp": { "branch": "main", "commit": "44b16d11215dce86f253ce0c30949813c0a90765" }, @@ -8,30 +8,30 @@ "conjure": { "branch": "master", "commit": "58c46d1f4999679659a5918284b574c266a7ac83" }, "everforest": { "branch": "master", "commit": "83b666410d7ae0eccf96dbbe3b4b6ac5b8172d38" }, "fidget.nvim": { "branch": "main", "commit": "0ba1e16d07627532b6cae915cc992ecac249fb97" }, - "friendly-snippets": { "branch": "main", "commit": "0368bee1cecaf3c58d436524234baad4c0e0b8cb" }, - "gitsigns.nvim": { "branch": "main", "commit": "bdeba1cec3faddd89146690c10b9a87949c0ee66" }, - "indent-blankline.nvim": { "branch": "master", "commit": "1e79f3dd6e750c5cb4ce99d1755a3e17025c0f47" }, + "friendly-snippets": { "branch": "main", "commit": "43727c2ff84240e55d4069ec3e6158d74cb534b6" }, + "gitsigns.nvim": { "branch": "main", "commit": "2272cf9f0c092e908f892f5b075e6cc2a8d3d07d" }, + "indent-blankline.nvim": { "branch": "master", "commit": "c60e76a638b1d2a4299b9bfc38461cdb02ae8397" }, "lazy.nvim": { "branch": "main", "commit": "59335c5b9d116f5d3948f833288a89e2a829a005" }, "lspkind.nvim": { "branch": "master", "commit": "57610d5ab560c073c465d6faf0c19f200cb67e6e" }, "lualine.nvim": { "branch": "master", "commit": "45e27ca739c7be6c49e5496d14fcf45a303c3a63" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "81e30dd629de24cbb26d08073ee938ab40006695" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "e2705063f395b44f676cd26596a11007a2cbd3bd" }, "mason.nvim": { "branch": "main", "commit": "d66c60e17dd6fd8165194b1d14d21f7eb2c1697a" }, - "neodev.nvim": { "branch": "main", "commit": "58b1c0740e8ad79ce71e2649a449bb90536435cf" }, + "neodev.nvim": { "branch": "main", "commit": "8cc5eb23452d355ea95b7253ca1367c3420352ff" }, "nvim-autopairs": { "branch": "master", "commit": "de4f7138a68d5d5063170f2182fd27faf06b0b54" }, "nvim-cmp": { "branch": "main", "commit": "5dce1b778b85c717f6614e3f4da45e9f19f54435" }, - "nvim-lspconfig": { "branch": "master", "commit": "50fcf96ec5a6e7bfdcbbea4f905c33e85408f170" }, - "nvim-paredit": { "branch": "master", "commit": "df1c7b8881a1717af27009f0587bb5c85a1a11f8" }, - "nvim-treesitter": { "branch": "master", "commit": "dd4e2dbc002dfce109d621e8bdcd9d89438b0a32" }, + "nvim-lspconfig": { "branch": "master", "commit": "361a2878a41f23452457eec12a807ff59bc75882" }, + "nvim-parinfer": { "branch": "master", "commit": "5ca09287ab3f4144f78ff7977fabc27466f71044" }, + "nvim-treesitter": { "branch": "master", "commit": "812c2dd8fe838bb26cb53f0d251116468c2cae37" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "bd103502252027434ec42f628d2dbf54821d4ce6" }, "plenary.nvim": { "branch": "master", "commit": "9ce85b0f7dcfe5358c0be937ad23e456907d410b" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" }, "telescope.nvim": { "branch": "0.1.x", "commit": "54930e1abfc94409e1bb9266e752ef8379008592" }, "vim-fugitive": { "branch": "master", "commit": "99db68d9b3304580bd383da7aaee05c7a954a344" }, - "vim-go": { "branch": "master", "commit": "a2e59981a2d965bed9f4052fa15a08d2ee2f8040" }, + "vim-go": { "branch": "master", "commit": "1401b576c6ac382529188d3d26cff866139f2f9a" }, "vim-rhubarb": { "branch": "master", "commit": "ee69335de176d9325267b0fd2597a22901d927b1" }, "vim-shot-f": { "branch": "master", "commit": "eea71d2a1038aa87fe175de9150b39dc155e5e7f" }, "vim-sleuth": { "branch": "master", "commit": "1cc4557420f215d02c4d2645a748a816c220e99b" }, "vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" }, "which-key.nvim": { "branch": "main", "commit": "7ccf476ebe0445a741b64e36c78a682c1c6118b7" }, - "zig.vim": { "branch": "master", "commit": "a34fb9850a56bb1f1e62bb5cfd0641c8baaeb3f9" } + "zig.vim": { "branch": "master", "commit": "dae9c7e71bd9612440a5a9a131dc86f0e5dc9bef" } } \ No newline at end of file diff --git a/lua/custom/plugins/blankline.lua b/lua/custom/plugins/blankline.lua index 56346a28..0958cda3 100644 --- a/lua/custom/plugins/blankline.lua +++ b/lua/custom/plugins/blankline.lua @@ -3,6 +3,7 @@ return { 'lukas-reineke/indent-blankline.nvim', -- Enable `lukas-reineke/indent-blankline.nvim` -- See `:help indent_blankline.txt` + main = "ibl", opts = { char = '┊', show_trailing_blankline_indent = false, diff --git a/lua/custom/plugins/lisp.lua b/lua/custom/plugins/lisp.lua index b310a0e4..fd2c0428 100644 --- a/lua/custom/plugins/lisp.lua +++ b/lua/custom/plugins/lisp.lua @@ -2,21 +2,21 @@ local lisp_dialects = { "clojure", "fennel", "scheme", "lisp" } return { -- perhaps replace parinfer with guns/vim-sexp and tpope/vim-sexp-mappings-for-regular-people - -- { - -- "gpanders/nvim-parinfer", - -- ft = lisp_dialects, - -- init = function() - -- vim.g.parinfer_force_balance = true - -- vim.g.parinfer_comment_chars = ";;" - -- end, - -- }, { - "julienvincent/nvim-paredit", + "gpanders/nvim-parinfer", ft = lisp_dialects, - config = function() - require("nvim-paredit").setup() - end + init = function() + vim.g.parinfer_force_balance = true + vim.g.parinfer_comment_chars = ";;" + end, }, + -- { + -- "julienvincent/nvim-paredit", + -- ft = lisp_dialects, + -- config = function() + -- require("nvim-paredit").setup() + -- end + -- }, { "Olical/conjure", ft = lisp_dialects,