From 9d9fb12a88bbfe29fa9ace06ae287a8c8c3630ff Mon Sep 17 00:00:00 2001 From: Zoe Roux Date: Sun, 15 Oct 2023 21:15:31 +0200 Subject: [PATCH] Update things and disable folds --- modules/misc/nvim/lazy-lock.json | 56 ++++++++++---------- modules/misc/nvim/lua/plugins/git.lua | 4 +- modules/misc/nvim/lua/plugins/line.lua | 21 +------- modules/misc/nvim/lua/plugins/treesiter.lua | 58 +-------------------- modules/misc/nvim/lua/plugins/ui.lua | 30 ++++++++--- 5 files changed, 56 insertions(+), 113 deletions(-) diff --git a/modules/misc/nvim/lazy-lock.json b/modules/misc/nvim/lazy-lock.json index 07a4834..879394f 100644 --- a/modules/misc/nvim/lazy-lock.json +++ b/modules/misc/nvim/lazy-lock.json @@ -1,64 +1,64 @@ { "Comment.nvim": { "branch": "master", "commit": "0236521ea582747b58869cb72f70ccfa967d2e89" }, - "LuaSnip": { "branch": "master", "commit": "8efa4e402a24df6a4713a2ec653147c49e8f73de" }, + "LuaSnip": { "branch": "master", "commit": "0df29db3543837f8b41597f2640397c5ec792b7b" }, "ReplaceWithRegister": { "branch": "master", "commit": "832efc23111d19591d495dc72286de2fb0b09345" }, - "SchemaStore.nvim": { "branch": "main", "commit": "57b379a6f521eca8e955283c2886b6261c4e14e8" }, + "SchemaStore.nvim": { "branch": "main", "commit": "1d7565ee358fe336c470a428f86d1e1e18fa1349" }, "auto-save.nvim": { "branch": "main", "commit": "94003fec719ac04dac8a055c9b1baab6de4ac152" }, - "catppuccin": { "branch": "main", "commit": "85e93601e0f0b48aa2c6bbfae4d0e9d7a1898280" }, + "catppuccin": { "branch": "main", "commit": "f03cbfb65664e55451d91616242bd1c63919da10" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-nvim-lsp": { "branch": "main", "commit": "44b16d11215dce86f253ce0c30949813c0a90765" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, - "cmp_luasnip": { "branch": "master", "commit": "18095520391186d634a0045dacaa346291096566" }, - "conform.nvim": { "branch": "master", "commit": "da5b9402bc3d114c93bc49bcbb4bf3e5c6c14527" }, - "dressing.nvim": { "branch": "master", "commit": "c1e1d5fa44fe08811b6ef4aadac2b50e602f9504" }, - "friendly-snippets": { "branch": "main", "commit": "ebf6d6e83494cdd88a54a429340256f4dbb6a052" }, + "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, + "conform.nvim": { "branch": "master", "commit": "ea44a6f0a5b8f3924537b004a76e8aef26f2b22a" }, + "dressing.nvim": { "branch": "master", "commit": "1f2d1206a03bd3add8aedf6251e4534611de577f" }, + "friendly-snippets": { "branch": "main", "commit": "43727c2ff84240e55d4069ec3e6158d74cb534b6" }, "git-conflict.nvim": { "branch": "main", "commit": "896261933afe2fddf6fb043d9cd4d88301b151a9" }, - "gitsigns.nvim": { "branch": "main", "commit": "bce4576a9047085a528c479a7fe1e2f6b787b6c1" }, - "harpoon": { "branch": "master", "commit": "21f4c47c6803d64ddb934a5b314dcb1b8e7365dc" }, + "gitsigns.nvim": { "branch": "main", "commit": "ff01d34daaed72f271a8ffa088a7e839a60c640f" }, + "harpoon": { "branch": "master", "commit": "c1aebbad9e3d13f20bedb8f2ce8b3a94e39e424a" }, "increment-activator": { "branch": "master", "commit": "55efcff88be45bd98cfdf7333dd718399373d10c" }, - "indent-blankline.nvim": { "branch": "master", "commit": "9637670896b68805430e2f72cf5d16be5b97a22a" }, + "indent-blankline.nvim": { "branch": "master", "commit": "0fe34b4c1b926e106d105d3ae88ef6cbf6743572" }, "lazy-lsp.nvim": { "branch": "master", "commit": "287d190557fdec28e10eb1a4312422d09e261911" }, - "lazy.nvim": { "branch": "main", "commit": "2a9354c7d2368d78cbd5575a51a2af5bd8a6ad01" }, + "lazy.nvim": { "branch": "main", "commit": "c5598617daad5fc4915032fef987c70efa48c0ef" }, "leap.nvim": { "branch": "main", "commit": "5efe985cf68fac3b6a6dfe7a75fbfaca8db2af9c" }, - "lsp_signature.nvim": { "branch": "master", "commit": "51784ba4ce87b362c139b8c2db6583c0aec20536" }, + "lsp_signature.nvim": { "branch": "master", "commit": "33250c84c7a552daf28ac607d9d9e82f88cd0907" }, "lualine.nvim": { "branch": "master", "commit": "45e27ca739c7be6c49e5496d14fcf45a303c3a63" }, "mini.align": { "branch": "main", "commit": "86c8edae77023a7b71d0fa9e2bf78960c1e46fd8" }, "mini.pairs": { "branch": "main", "commit": "dfa9f6e2576bb8853be277d96b735af59d9be7c2" }, "mini.splitjoin": { "branch": "main", "commit": "5f4237ae557f255a1f1a435c76c6a715be39060a" }, - "neo-tree.nvim": { "branch": "main", "commit": "71f1841ba6c652908678cece623f52c1fea8a6cd" }, - "neodev.nvim": { "branch": "main", "commit": "471324e6c746284dbbdc1d357799d1911bb7e120" }, + "neo-tree.nvim": { "branch": "main", "commit": "63ebe879ad4798b66d29c0b2c8d04942389d438e" }, + "neodev.nvim": { "branch": "main", "commit": "18093bdfb6ac1a6e5789894eb65f394aefff620f" }, "neodim": { "branch": "master", "commit": "41535b577deed1bb770830fd9263c3923b70a18c" }, - "noice.nvim": { "branch": "main", "commit": "74c2902146b080035beb19944baf6f014a954720" }, - "nui.nvim": { "branch": "main", "commit": "c8de23342caf8d50b15d6b28368d36a56a69d76f" }, + "noice.nvim": { "branch": "main", "commit": "b990101f508b29470bfa16cdf3c08f040d85b435" }, + "nui.nvim": { "branch": "main", "commit": "c0c8e347ceac53030f5c1ece1c5a5b6a17a25b32" }, "nvim-cmp": { "branch": "main", "commit": "5dce1b778b85c717f6614e3f4da45e9f19f54435" }, "nvim-colorizer.lua": { "branch": "master", "commit": "dde3084106a70b9a79d48f426f6d6fec6fd203f7" }, "nvim-lightbulb": { "branch": "master", "commit": "8f00b89dd1b1dbde16872bee5fbcee2e58c9b8e9" }, - "nvim-lint": { "branch": "master", "commit": "3c936d9d28aa5c5d4c90780e1c3430171bdcb3c2" }, - "nvim-lspconfig": { "branch": "master", "commit": "f3195835c0447ee2c80152b893ab51ca162b04a9" }, + "nvim-lint": { "branch": "master", "commit": "6d596b87862909370f4d1e6535cc9fad80c89fe6" }, + "nvim-lspconfig": { "branch": "master", "commit": "2a101fb00e6f6eb29c230736b99f05c3b3192b94" }, "nvim-navic": { "branch": "master", "commit": "0ffa7ffe6588f3417e680439872f5049e38a24db" }, "nvim-pqf": { "branch": "main", "commit": "d15582d3d0c09280f371fa5f21537cf4530ed330" }, "nvim-scrollbar": { "branch": "main", "commit": "35f99d559041c7c0eff3a41f9093581ceea534e8" }, "nvim-surround": { "branch": "main", "commit": "0d6882635817a2677749a330127d12ac30a4f3c8" }, - "nvim-treesitter": { "branch": "master", "commit": "940916074833159bf7b8cbb4bf5e59161461fa5a" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "bd103502252027434ec42f628d2dbf54821d4ce6" }, + "nvim-treesitter": { "branch": "master", "commit": "f8fcb0da0618be551560a57fa1457dc6f889e568" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "76c7a89b41de77a4f83fb77fa072c5ad7605fe3b" }, "nvim-ts-autotag": { "branch": "main", "commit": "6be1192965df35f94b8ea6d323354f7dc7a557e4" }, - "nvim-ts-context-commentstring": { "branch": "main", "commit": "95e9ba9de4289d221666b66fd930d157c7ca08c6" }, - "nvim-ufo": { "branch": "main", "commit": "ddec0c27e9cd2d22df4ecacc45e9d6ce567f7c35" }, - "nvim-web-devicons": { "branch": "master", "commit": "973ab742f143a796a779af4d786ec409116a0d87" }, + "nvim-ts-context-commentstring": { "branch": "main", "commit": "92e688f013c69f90c9bbd596019ec10235bc51de" }, + "nvim-ufo": { "branch": "main", "commit": "f7eea53e88456403212df074b9aa3148a3908435" }, + "nvim-web-devicons": { "branch": "master", "commit": "3af745113ea537f58c4b1573b64a429fefad9e07" }, "omnisharp-extended-lsp.nvim": { "branch": "main", "commit": "53edfb413a54c9e55dcddc9e9fa4977a897e4425" }, - "plenary.nvim": { "branch": "master", "commit": "9ce85b0f7dcfe5358c0be937ad23e456907d410b" }, + "plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" }, "promise-async": { "branch": "main", "commit": "e94f35161b8c5d4a4ca3b6ff93dd073eb9214c0e" }, - "statuscol.nvim": { "branch": "main", "commit": "0944234914438695050eec6f83b4669864680c1a" }, + "statuscol.nvim": { "branch": "main", "commit": "98d02fc90ebd7c4674ec935074d1d09443d49318" }, "telescope-fzf-native.nvim": { "branch": "feature/69-prebuilt-release-binaries", "commit": "af1d3c6efa0124123272bba094a60e15682c9cd5" }, - "telescope.nvim": { "branch": "master", "commit": "b543aaa2c9cf8123ed2fe7dbb6c211a9cd415124" }, + "telescope.nvim": { "branch": "master", "commit": "74ce793a60759e3db0d265174f137fb627430355" }, "todo-comments.nvim": { "branch": "main", "commit": "3094ead8edfa9040de2421deddec55d3762f64d1" }, "trouble.nvim": { "branch": "cascading-sev-2", "commit": "b97b3261433d659b0edb8aedd90dc0b199b8f37b" }, "unimpaired-which-key.nvim": { "branch": "main", "commit": "321a247ecbbb31a59a8580350eec044b88d82e81" }, - "vim-lumen": { "branch": "master", "commit": "847814713ca6a44c06c6a325101cefb2b3fff2c5" }, + "vim-lumen": { "branch": "master", "commit": "7b03332f602706b4d7e99a1cae35a13a9fa0ab15" }, "vim-repeat": { "branch": "master", "commit": "24afe922e6a05891756ecf331f39a1f6743d3d5a" }, "vim-sleuth": { "branch": "master", "commit": "1cc4557420f215d02c4d2645a748a816c220e99b" }, "vim-unimpaired": { "branch": "master", "commit": "6d44a6dc2ec34607c41ec78acf81657248580bf1" }, "vim-wordmotion": { "branch": "master", "commit": "81d9bd298376ab0dc465c85d55afa4cb8d5f47a1" }, "virtcolumn.nvim": { "branch": "main", "commit": "cd9485d64a0763c5572272e03d70cbff1f91fde0" }, - "which-key.nvim": { "branch": "main", "commit": "7ccf476ebe0445a741b64e36c78a682c1c6118b7" } + "which-key.nvim": { "branch": "main", "commit": "6962dae3565369363b59dd51fb206051555fcb4d" } } \ No newline at end of file diff --git a/modules/misc/nvim/lua/plugins/git.lua b/modules/misc/nvim/lua/plugins/git.lua index 998f00a..c180d28 100644 --- a/modules/misc/nvim/lua/plugins/git.lua +++ b/modules/misc/nvim/lua/plugins/git.lua @@ -6,8 +6,8 @@ return { signs = { add = { text = "▕" }, change = { text = "▕" }, - delete = { text = "󰐊" }, - topdelete = { text = "󰐊" }, + -- delete = { text = "󰐊" }, + -- topdelete = { text = "󰐊" }, changedelete = { text = "▕" }, untracked = { text = "▕" }, }, diff --git a/modules/misc/nvim/lua/plugins/line.lua b/modules/misc/nvim/lua/plugins/line.lua index 0dafb43..efd2d73 100644 --- a/modules/misc/nvim/lua/plugins/line.lua +++ b/modules/misc/nvim/lua/plugins/line.lua @@ -6,22 +6,6 @@ return { vim.opt["showmode"] = false local gps = require("nvim-navic") - local toggleterm = { - sections = { - lualine_a = { - { - 'mode', - fmt = function(str) return string.format("%7s", str) end - }, - }, - lualine_b = { - function() - return 'ToggleTerm #' .. vim.b.toggle_number - end - } - }, - filetypes = { "toggleterm" }, - } return { options = { @@ -88,8 +72,8 @@ return { lualine_x = { -- require "dap".status, { - require("noice").api.statusline.mode.get, - cond = require("noice").api.statusline.mode.has, + require("noice").api.status.mode.get, + cond = require("noice").api.status.mode.has, color = { fg = "#ff9e64" }, }, 'fileformat', @@ -106,7 +90,6 @@ return { "quickfix", "neo-tree", "fugitive", - toggleterm }, } end diff --git a/modules/misc/nvim/lua/plugins/treesiter.lua b/modules/misc/nvim/lua/plugins/treesiter.lua index 5aa154f..f9256a1 100644 --- a/modules/misc/nvim/lua/plugins/treesiter.lua +++ b/modules/misc/nvim/lua/plugins/treesiter.lua @@ -32,63 +32,7 @@ return { }, }, }, - config = function(_, opts) - require("nvim-treesitter.configs").setup(opts) - end, - }, - - { - "kevinhwang91/nvim-ufo", - event = "VeryLazy", - dependencies = "kevinhwang91/promise-async", - init = function() - vim.o.foldcolumn = '1' - vim.o.foldlevel = 99 - vim.o.foldlevelstart = 99 - vim.o.foldenable = true - end, - opts = { - provider_selector = function(bufnr, filetype, buftype) - return { 'treesitter', 'indent' } - end, - fold_virt_text_handler = function(virtText, lnum, endLnum, width, truncate) - local newVirtText = {} - local foldedLines = endLnum - lnum - local suffix = ("  %d"):format(foldedLines) - local sufWidth = vim.fn.strdisplaywidth(suffix) - local targetWidth = width - sufWidth - local curWidth = 0 - for _, chunk in ipairs(virtText) do - local chunkText = chunk[1] - local chunkWidth = vim.fn.strdisplaywidth(chunkText) - if targetWidth > curWidth + chunkWidth then - table.insert(newVirtText, chunk) - else - chunkText = truncate(chunkText, targetWidth - curWidth) - local hlGroup = chunk[2] - table.insert(newVirtText, { chunkText, hlGroup }) - chunkWidth = vim.fn.strdisplaywidth(chunkText) - -- str width returned from truncate() may less than 2nd argument, need padding - if curWidth + chunkWidth < targetWidth then - suffix = suffix .. (" "):rep(targetWidth - curWidth - chunkWidth) - end - break - end - curWidth = curWidth + chunkWidth - end - local rAlignAppndx = - math.max(math.min(vim.opt.textwidth["_value"], width - 1) - curWidth - sufWidth, 0) - suffix = (" "):rep(rAlignAppndx) .. suffix - table.insert(newVirtText, { suffix, "MoreMsg" }) - return newVirtText - end, - }, - config = function(_, opts) - require("ufo").setup(opts) - vim.keymap.set("n", "zR", require("ufo").openAllFolds) - vim.keymap.set("n", "zM", require("ufo").closeAllFolds) - vim.keymap.set("n", "zr", require("ufo").openFoldsExceptKinds) - end, + main = "nvim-treesitter.configs", }, { diff --git a/modules/misc/nvim/lua/plugins/ui.lua b/modules/misc/nvim/lua/plugins/ui.lua index b435e7d..1ad698a 100644 --- a/modules/misc/nvim/lua/plugins/ui.lua +++ b/modules/misc/nvim/lua/plugins/ui.lua @@ -2,12 +2,29 @@ return { { "lukas-reineke/indent-blankline.nvim", event = { "BufReadPost", "BufNewFile" }, + main = "ibl", opts = { - char = "▏", - filetype_exclude = { "help", "alpha", "dashboard", "neo-tree", "Trouble", "lazy" }, - show_trailing_blankline_indent = true, - use_treesitter = true, - show_current_context = true, + indent = { + char = "▏", + tab_char = "▏", + }, + exclude = { + filetypes = { + "help", + "alpha", + "dashboard", + "neo-tree", + "Trouble", + "lazy", + "lspinfo", + "packer", + "checkhealth", + "help", + "man", + "", + } + }, + scope = { show_start = false }, }, }, @@ -68,14 +85,13 @@ return { require("statuscol").setup({ relculright = false, segments = { - { text = { builtin.foldfunc }, click = "v:lua.ScFa" }, { sign = { name = { ".*" }, maxwidth = 1, }, click = "v:lua.ScSa" }, { text = { builtin.lnumfunc }, click = "v:lua.ScLa", }, { - sign = { name = { "GitSign*" }, maxwidth = 1, colwidth = 1 }, + sign = { namespace = { "gitsign" }, maxwidth = 1, colwidth = 1 }, click = "v:lua.ScSa" }, }