From bffcdd8460de62f96e94c9df0523553a676e65ac Mon Sep 17 00:00:00 2001
From: ignuki <inakidomoc@gmail.com>
Date: Sat, 29 Mar 2025 19:39:46 +0100
Subject: [PATCH] improve nvim folding and update alacritty config

---
 README.md                                  |  1 +
 alacritty/.config/alacritty/alacritty.toml |  2 --
 nvim/.config/nvim/lua/ink/init.lua         | 13 ++++++++-----
 nvim/.config/nvim/lua/ink/lsp.lua          | 15 +++++++++++++++
 4 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 911a3d7..827bec7 100644
--- a/README.md
+++ b/README.md
@@ -10,6 +10,7 @@
 - starship
 - tmux
 - tmux-plugin-manager
+- python3-libtmux
 - neovim
 - lua-language-server
 - stylua
diff --git a/alacritty/.config/alacritty/alacritty.toml b/alacritty/.config/alacritty/alacritty.toml
index 0959438..89a8752 100644
--- a/alacritty/.config/alacritty/alacritty.toml
+++ b/alacritty/.config/alacritty/alacritty.toml
@@ -1,5 +1,3 @@
-import = ["~/.config/alacritty/dracula.toml"]
-
 [font]
 size = 13.0
 
diff --git a/nvim/.config/nvim/lua/ink/init.lua b/nvim/.config/nvim/lua/ink/init.lua
index 79e3e72..e478638 100644
--- a/nvim/.config/nvim/lua/ink/init.lua
+++ b/nvim/.config/nvim/lua/ink/init.lua
@@ -50,12 +50,15 @@ vim.opt.iskeyword:append("-") -- hyphenated words recognized by searches
 vim.opt.formatoptions:remove({ "c", "r", "o" })
 vim.opt.runtimepath:remove("/usr/share/vim/vimfiles") -- separate vim plugins from neovim in case vim still in use
 
-vim.opt.foldmethod = "expr"
-vim.opt.foldexpr = "v:lua.vim.treesitter.foldexpr()"
-vim.opt.foldtext = ""
+-- Nice and simple folding:
+vim.opt.foldenable = true
 vim.opt.foldlevel = 99
-vim.opt.foldlevelstart = 99
-vim.opt.foldnestmax = 6
+vim.opt.foldmethod = "expr"
+-- Default to treesitter folding
+vim.opt.foldexpr = "v:lua.vim.treesitter.foldexpr()"
+-- vim.opt.foldtext = "> "
+vim.opt.fillchars:append({ fold = ">" })
+
 vim.opt.incsearch = true -- search as characters are entered
 
 -- remove trailing whitespace
diff --git a/nvim/.config/nvim/lua/ink/lsp.lua b/nvim/.config/nvim/lua/ink/lsp.lua
index f21f4f5..19f3a40 100644
--- a/nvim/.config/nvim/lua/ink/lsp.lua
+++ b/nvim/.config/nvim/lua/ink/lsp.lua
@@ -16,6 +16,21 @@ vim.lsp.config("rust", {
 vim.lsp.enable("luals")
 vim.lsp.enable("rust")
 
+-- [[FOLDING SETUP
+-- Prefer LSP folding if client supports it
+vim.api.nvim_create_autocmd("LspAttach", {
+	callback = function(args)
+		local client = vim.lsp.get_client_by_id(args.data.client_id)
+		if client ~= nil then
+			if client:supports_method("textDocument/foldingRange") then
+				local win = vim.api.nvim_get_current_win()
+				vim.wo[win][0].foldexpr = "v:lua.vim.lsp.foldexpr()"
+			end
+		end
+	end,
+})
+-- ]]
+
 ---[[AUTOCOMPLETION SETUP
 vim.o.completeopt = "menuone,noinsert,popup,fuzzy"
 vim.api.nvim_create_autocmd("LspAttach", {