From cc4ef1a5de3ad4417d459a56a38839f6fe3f044d Mon Sep 17 00:00:00 2001 From: tsegaye27 Date: Sun, 9 Feb 2025 19:06:25 +0300 Subject: [PATCH] made some changes --- lua/settings.lua | 36 ++++++++++++++++++++---------------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/lua/settings.lua b/lua/settings.lua index 62dd31b9..707ddf29 100644 --- a/lua/settings.lua +++ b/lua/settings.lua @@ -1,11 +1,15 @@ -vim.g.have_nerd_font = true +-- Correct clipboard configuration (this was the main issue) +vim.opt.clipboard:append 'unnamedplus' -- Use system clipboard for all operations +-- Remove this line (it's not doing anything useful) +-- vim.g.have_nerd_font = true -- This is a custom variable not used in your config + +-- Rest of your configuration with some optimizations: vim.opt.number = true vim.opt.relativenumber = true vim.opt.mouse = 'a' vim.opt.showmode = false vim.opt.title = true -vim.opt.clipboard = 'unnamedplus' vim.opt.breakindent = true vim.opt.undofile = true vim.opt.ignorecase = true @@ -30,26 +34,26 @@ vim.opt.path:append { '**' } vim.opt.wildignore:append { '*/node_modules/*' } vim.opt.formatoptions:append { 'r' } --- Enable folding in Neovim +-- Improved folding configuration vim.opt.foldmethod = 'expr' vim.opt.foldexpr = 'nvim_treesitter#foldexpr()' -vim.opt.foldlevel = 99 -- Keep folds open by default -vim.opt.foldcolumn = '1' -- Show fold column left of line numbers +vim.opt.foldlevel = 99 +vim.opt.foldcolumn = '1' -vim.opt.foldtext = 'v:lua.custom_foldtext()' -- Custom fold text function - --- Function to change fold symbols +-- Custom fold text function (simplified) function _G.custom_foldtext() - local line = vim.fn.getline(vim.v.foldstart) -- Get the first line of the fold + local line = vim.trim(vim.fn.getline(vim.v.foldstart)) local fold_size = vim.v.foldend - vim.v.foldstart + 1 - return line .. ' (' .. fold_size .. ' lines) ' -- Display fold size + return string.format('⏷ %s ⏤ %d lines ⏵', line, fold_size) end --- Customize fold markers in fold column -vim.opt.statuscolumn = '%C' -- Customize fold column symbols +vim.opt.foldtext = 'v:lua.custom_foldtext()' + +-- Better fold characters configuration vim.opt.fillchars:append { - foldopen = '▾', -- Down arrow for open folds - foldclose = '▸', -- Right arrow for closed folds - foldsep = ' ', -- Space between folds - fold = ' ', -- Empty space for better visuals + foldopen = '', + foldclose = '', + fold = ' ', + foldsep = ' ', + diff = '╱', }