From ff3e9dc7de59c6c7193272136bf6373207ba6975 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20Dudr?= <vladimir@tango-dj.cz>
Date: Tue, 18 Apr 2023 14:35:59 +0200
Subject: [PATCH] nvim

---
 dot_config/nvim/lua/configs/keys.lua           | 10 ++++++++++
 dot_config/nvim/lua/configs/options.lua        | 13 +++++++------
 .../nvim/lua/configs/packages/colors.lua       | 14 +++++++-------
 dot_config/nvim/lua/configs/packages/lsp.lua   | 18 ++++++++++++++++--
 4 files changed, 40 insertions(+), 15 deletions(-)

diff --git a/dot_config/nvim/lua/configs/keys.lua b/dot_config/nvim/lua/configs/keys.lua
index 025cd0b..a96e10e 100644
--- a/dot_config/nvim/lua/configs/keys.lua
+++ b/dot_config/nvim/lua/configs/keys.lua
@@ -28,6 +28,16 @@ function M.setup()
   vim.keymap.set('n', '<leader>ow', function() toggle_win_opt('wrap') end, { desc = 'Toggle wrap' })
   vim.keymap.set('n', '<leader>on', function() toggle_win_opt('number') end, { desc = 'Toggle number' })
   vim.keymap.set('n', '<leader>or', function() toggle_win_opt('relativenumber') end, { desc = 'Toggle relativenumber' })
+  vim.keymap.set('n', '<leader>of', function()
+    if (vim.api.nvim_win_get_option(0, 'foldmethod') ~= 'marker') then
+      vim.api.nvim_win_set_option(0, 'foldmethod', 'marker')
+      vim.api.nvim_win_set_option(0, 'foldlevel', 0)
+    else
+      vim.api.nvim_win_set_option(0, 'foldmethod', 'expr')
+      vim.api.nvim_win_set_option(0, 'foldlevel', 99)
+    end
+    vim.notify('Fdm: ' .. vim.api.nvim_win_get_option(0, 'foldmethod'))
+  end, { desc = 'Toggle foldmethod marker/expr' })
 end
 
 return M
diff --git a/dot_config/nvim/lua/configs/options.lua b/dot_config/nvim/lua/configs/options.lua
index 0b950e3..f2db9f6 100644
--- a/dot_config/nvim/lua/configs/options.lua
+++ b/dot_config/nvim/lua/configs/options.lua
@@ -12,6 +12,7 @@ function M.setup()
   vim.o.expandtab = true
   vim.o.fileencodings = 'ucs-bom,utf-8,default,windows-1250,cp852'
   vim.o.foldopen = 'hor,mark,percent,quickfix,search,tag,undo' -- removed block so { and friends don't open fold
+  vim.o.foldexpr = 'nvim_treesitter#foldexpr()'
   vim.o.hidden = true
   vim.o.ignorecase = true
   vim.o.inccommand = 'split'
@@ -55,15 +56,15 @@ function M.setup()
     vim.o.relativenumber = false
     vim.o.list = false
     vim.o.statusline = ''
-      .. ' %{fnamemodify(getcwd(),":t")}' -- basename of cwd
+      .. ' %{fnamemodify(getcwd(),":t")}'      -- basename of cwd
       .. '%( │  %{get(b:,"gitsigns_head","")}%)' -- branch
-      .. ' │  %<%f%( [%M%R%W]%)' -- filename and modification flags
-      .. '%=' -- rest is right
-      .. '%y ' -- filetype
-      .. '%-7.(%3.l:%-3.(%c%V%)%) %P' -- ruler
+      .. ' │  %<%f%( [%M%R%W]%)'             -- filename and modification flags
+      .. '%='                                     -- rest is right
+      .. '%y '                                    -- filetype
+      .. '%-7.(%3.l:%-3.(%c%V%)%) %P'             -- ruler
 
     if vim.fn.has('nvim-0.9') then
-      vim.o.statuscolumn = '%C%3l %=%s'
+      vim.o.statuscolumn = '%=%l %C%s'
     end
   end
   set_winopts()
diff --git a/dot_config/nvim/lua/configs/packages/colors.lua b/dot_config/nvim/lua/configs/packages/colors.lua
index 5fb2574..8c71e33 100644
--- a/dot_config/nvim/lua/configs/packages/colors.lua
+++ b/dot_config/nvim/lua/configs/packages/colors.lua
@@ -153,13 +153,13 @@ function M.config()
         linenr_style = {}
       end
 
-      link('@tag.delimiter.xml', 'xmlTag')
-      link('@tag.xml', 'xmlTagName')
-      link('@tag.attribute.xml', 'xmlAttrib')
-
-      link('@tag.delimiter.html', 'htmlTag')
-      link('@tag.html', 'htmlTagName')
-      link('@tag.attribute.html', 'htmlArg')
+      -- link('@tag.delimiter.xml', 'xmlTag')
+      -- link('@tag.xml', 'xmlTagName')
+      -- link('@tag.attribute.xml', 'xmlAttrib')
+      --
+      -- link('@tag.delimiter.html', 'htmlTag')
+      -- link('@tag.html', 'htmlTagName')
+      -- link('@tag.attribute.html', 'htmlArg')
 
       gr:hl('LineNr', 'gray', 'dark0_hard', linenr_style)
       gr:hl('LspCodeLens', 'gray', nil, { 'italic' })
diff --git a/dot_config/nvim/lua/configs/packages/lsp.lua b/dot_config/nvim/lua/configs/packages/lsp.lua
index 3b44def..de3dacc 100644
--- a/dot_config/nvim/lua/configs/packages/lsp.lua
+++ b/dot_config/nvim/lua/configs/packages/lsp.lua
@@ -198,7 +198,21 @@ local function config() -- {{{
     rust_analyzer = {},
     cssls = {},
     html = {},
-    lemminx = {}, -- xml
+    lemminx = {
+      settings = {
+        xml = {
+          format = {
+            enabled = true,
+            splitAttributes = true,
+            formatComments = true,
+            joinCDATALines = false,
+            joinCommentLines = false,
+            joinContentLines = false,
+            spaceBeforeEmptyCloseTag = true,
+          },
+        },
+      },
+    }, -- xml
     rnix = {},
     omnisharp = {
       -- {{{
@@ -212,7 +226,7 @@ local function config() -- {{{
       organize_imports_on_format = true,
       enable_import_completion = true,
       sdk_include_prereleases = true,
-      analyze_open_documents_only = true,
+      analyze_open_documents_only = false,
     }, -- }}}
     lua_ls = {
       -- {{{