50 files changed, 30 insertions, 26 deletions
diff --git a/home-manager/soispha/config/neovim/nixvim/plugins/colorscheme/default.nix b/hm/soispha/conf/nvim/plugins/colorscheme/default.nix
index 21069752..21069752 100644
--- a/home-manager/soispha/config/neovim/nixvim/plugins/colorscheme/default.nix
+++ b/hm/soispha/conf/nvim/plugins/colorscheme/default.nix
diff --git a/home-manager/soispha/config/neovim/nixvim/plugins/colorscheme/lua/mk_todos_readable.lua b/hm/soispha/conf/nvim/plugins/colorscheme/lua/mk_todos_readable.lua
index 0145ec19..0145ec19 100644
--- a/home-manager/soispha/config/neovim/nixvim/plugins/colorscheme/lua/mk_todos_readable.lua
+++ b/hm/soispha/conf/nvim/plugins/colorscheme/lua/mk_todos_readable.lua
diff --git a/home-manager/soispha/config/neovim/nixvim/plugins/colorscheme/lua/nightfox.lua b/hm/soispha/conf/nvim/plugins/colorscheme/lua/nightfox.lua
index 025eb133..025eb133 100644
--- a/home-manager/soispha/config/neovim/nixvim/plugins/colorscheme/lua/nightfox.lua
+++ b/hm/soispha/conf/nvim/plugins/colorscheme/lua/nightfox.lua
diff --git a/home-manager/soispha/config/neovim/nixvim/plugins/default.nix b/hm/soispha/conf/nvim/plugins/default.nix
index 796ae3f2..796ae3f2 100644
--- a/home-manager/soispha/config/neovim/nixvim/plugins/default.nix
+++ b/hm/soispha/conf/nvim/plugins/default.nix
diff --git a/home-manager/soispha/config/neovim/nixvim/plugins/femaco/default.nix b/hm/soispha/conf/nvim/plugins/femaco/default.nix
index 6d7ec16a..6d7ec16a 100644
--- a/home-manager/soispha/config/neovim/nixvim/plugins/femaco/default.nix
+++ b/hm/soispha/conf/nvim/plugins/femaco/default.nix
diff --git a/home-manager/soispha/config/neovim/nixvim/plugins/femaco/lua/femaco.lua b/hm/soispha/conf/nvim/plugins/femaco/lua/femaco.lua
index 12171793..12171793 100644
--- a/home-manager/soispha/config/neovim/nixvim/plugins/femaco/lua/femaco.lua
+++ b/hm/soispha/conf/nvim/plugins/femaco/lua/femaco.lua
diff --git a/home-manager/soispha/config/neovim/nixvim/plugins/goto-preview/default.nix b/hm/soispha/conf/nvim/plugins/goto-preview/default.nix
index 740bb04c..740bb04c 100644
--- a/home-manager/soispha/config/neovim/nixvim/plugins/goto-preview/default.nix
+++ b/hm/soispha/conf/nvim/plugins/goto-preview/default.nix
diff --git a/home-manager/soispha/config/neovim/nixvim/plugins/goto-preview/lua/goto-preview.lua b/hm/soispha/conf/nvim/plugins/goto-preview/lua/goto-preview.lua
index cde50d3e..cde50d3e 100644
--- a/home-manager/soispha/config/neovim/nixvim/plugins/goto-preview/lua/goto-preview.lua
+++ b/hm/soispha/conf/nvim/plugins/goto-preview/lua/goto-preview.lua
diff --git a/home-manager/soispha/config/neovim/nixvim/plugins/harpoon/default.nix b/hm/soispha/conf/nvim/plugins/harpoon/default.nix
index ecd1d6cb..ecd1d6cb 100644
--- a/home-manager/soispha/config/neovim/nixvim/plugins/harpoon/default.nix
+++ b/hm/soispha/conf/nvim/plugins/harpoon/default.nix
diff --git a/home-manager/soispha/config/neovim/nixvim/plugins/leap/default.nix b/hm/soispha/conf/nvim/plugins/leap/default.nix
index bffdf33c..bffdf33c 100644
--- a/home-manager/soispha/config/neovim/nixvim/plugins/leap/default.nix
+++ b/hm/soispha/conf/nvim/plugins/leap/default.nix
diff --git a/home-manager/soispha/config/neovim/nixvim/plugins/lf-nvim/default.nix b/hm/soispha/conf/nvim/plugins/lf-nvim/default.nix
index c562f400..c562f400 100644
--- a/home-manager/soispha/config/neovim/nixvim/plugins/lf-nvim/default.nix
+++ b/hm/soispha/conf/nvim/plugins/lf-nvim/default.nix
diff --git a/home-manager/soispha/config/neovim/nixvim/plugins/lf-nvim/lua/lf-nvim.lua b/hm/soispha/conf/nvim/plugins/lf-nvim/lua/lf-nvim.lua
index 8a0cf817..8a0cf817 100644
--- a/home-manager/soispha/config/neovim/nixvim/plugins/lf-nvim/lua/lf-nvim.lua
+++ b/hm/soispha/conf/nvim/plugins/lf-nvim/lua/lf-nvim.lua
diff --git a/home-manager/soispha/config/neovim/nixvim/plugins/lsp-progress-nvim/default.nix b/hm/soispha/conf/nvim/plugins/lsp-progress-nvim/default.nix
index 6602ceb6..6602ceb6 100644
--- a/home-manager/soispha/config/neovim/nixvim/plugins/lsp-progress-nvim/default.nix
+++ b/hm/soispha/conf/nvim/plugins/lsp-progress-nvim/default.nix
diff --git a/home-manager/soispha/config/neovim/nixvim/plugins/lsp-progress-nvim/lua/lsp-progress-nvim.lua b/hm/soispha/conf/nvim/plugins/lsp-progress-nvim/lua/lsp-progress-nvim.lua
index 4273085c..4273085c 100644
--- a/home-manager/soispha/config/neovim/nixvim/plugins/lsp-progress-nvim/lua/lsp-progress-nvim.lua
+++ b/hm/soispha/conf/nvim/plugins/lsp-progress-nvim/lua/lsp-progress-nvim.lua
diff --git a/home-manager/soispha/config/neovim/nixvim/plugins/lsp/default.nix b/hm/soispha/conf/nvim/plugins/lsp/default.nix
index b7c1e174..b7c1e174 100644
--- a/home-manager/soispha/config/neovim/nixvim/plugins/lsp/default.nix
+++ b/hm/soispha/conf/nvim/plugins/lsp/default.nix
diff --git a/home-manager/soispha/config/neovim/nixvim/plugins/lsp/keymaps/default.nix b/hm/soispha/conf/nvim/plugins/lsp/keymaps/default.nix
index 4017521d..4017521d 100644
--- a/home-manager/soispha/config/neovim/nixvim/plugins/lsp/keymaps/default.nix
+++ b/hm/soispha/conf/nvim/plugins/lsp/keymaps/default.nix
diff --git a/home-manager/soispha/config/neovim/nixvim/plugins/lsp/servers/default.nix b/hm/soispha/conf/nvim/plugins/lsp/servers/default.nix
index 8ffac2e1..8ffac2e1 100644
--- a/home-manager/soispha/config/neovim/nixvim/plugins/lsp/servers/default.nix
+++ b/hm/soispha/conf/nvim/plugins/lsp/servers/default.nix
diff --git a/home-manager/soispha/config/neovim/nixvim/plugins/lsp/servers/servers/bashls.nix b/hm/soispha/conf/nvim/plugins/lsp/servers/servers/bashls.nix
index 0577a335..0577a335 100644
--- a/home-manager/soispha/config/neovim/nixvim/plugins/lsp/servers/servers/bashls.nix
+++ b/hm/soispha/conf/nvim/plugins/lsp/servers/servers/bashls.nix
diff --git a/home-manager/soispha/config/neovim/nixvim/plugins/lsp/servers/servers/ccls.nix b/hm/soispha/conf/nvim/plugins/lsp/servers/servers/ccls.nix
index 0698bcce..0698bcce 100644
--- a/home-manager/soispha/config/neovim/nixvim/plugins/lsp/servers/servers/ccls.nix
+++ b/hm/soispha/conf/nvim/plugins/lsp/servers/servers/ccls.nix
diff --git a/home-manager/soispha/config/neovim/nixvim/plugins/lsp/servers/servers/ltex.nix b/hm/soispha/conf/nvim/plugins/lsp/servers/servers/ltex.nix
index 0d039f82..0d039f82 100644
--- a/home-manager/soispha/config/neovim/nixvim/plugins/lsp/servers/servers/ltex.nix
+++ b/hm/soispha/conf/nvim/plugins/lsp/servers/servers/ltex.nix
diff --git a/home-manager/soispha/config/neovim/nixvim/plugins/lsp/servers/servers/lua-ls.nix b/hm/soispha/conf/nvim/plugins/lsp/servers/servers/lua-ls.nix
index 5a44b500..5a44b500 100644
--- a/home-manager/soispha/config/neovim/nixvim/plugins/lsp/servers/servers/lua-ls.nix
+++ b/hm/soispha/conf/nvim/plugins/lsp/servers/servers/lua-ls.nix
diff --git a/home-manager/soispha/config/neovim/nixvim/plugins/lsp/servers/servers/nil_ls.nix b/hm/soispha/conf/nvim/plugins/lsp/servers/servers/nil_ls.nix
index f0cccbdc..f0cccbdc 100644
--- a/home-manager/soispha/config/neovim/nixvim/plugins/lsp/servers/servers/nil_ls.nix
+++ b/hm/soispha/conf/nvim/plugins/lsp/servers/servers/nil_ls.nix
diff --git a/home-manager/soispha/config/neovim/nixvim/plugins/lsp/servers/servers/rust-analyzer.nix b/hm/soispha/conf/nvim/plugins/lsp/servers/servers/rust-analyzer.nix
index 943a8c80..943a8c80 100644
--- a/home-manager/soispha/config/neovim/nixvim/plugins/lsp/servers/servers/rust-analyzer.nix
+++ b/hm/soispha/conf/nvim/plugins/lsp/servers/servers/rust-analyzer.nix
diff --git a/home-manager/soispha/config/neovim/nixvim/plugins/lsp/servers/servers/texlab.nix b/hm/soispha/conf/nvim/plugins/lsp/servers/servers/texlab.nix
index 59af8d39..59af8d39 100644
--- a/home-manager/soispha/config/neovim/nixvim/plugins/lsp/servers/servers/texlab.nix
+++ b/hm/soispha/conf/nvim/plugins/lsp/servers/servers/texlab.nix
diff --git a/home-manager/soispha/config/neovim/nixvim/plugins/lspkind/default.nix b/hm/soispha/conf/nvim/plugins/lspkind/default.nix
index ed7d411b..ed7d411b 100644
--- a/home-manager/soispha/config/neovim/nixvim/plugins/lspkind/default.nix
+++ b/hm/soispha/conf/nvim/plugins/lspkind/default.nix
diff --git a/home-manager/soispha/config/neovim/nixvim/plugins/lualine/default.nix b/hm/soispha/conf/nvim/plugins/lualine/default.nix
index de48efea..0b789558 100644
--- a/home-manager/soispha/config/neovim/nixvim/plugins/lualine/default.nix
+++ b/hm/soispha/conf/nvim/plugins/lualine/default.nix
@@ -19,31 +19,35 @@
       '';
     };
     get_mixed_indent = {
-      __raw = ''
-        function()
-            local space_pat = [[\v^ +]]
-            local tab_pat = [[\v^\t+]]
-            local space_indent = vim.fn.search(space_pat, 'nwc')
-            local tab_indent = vim.fn.search(tab_pat, 'nwc')
-            local mixed = (space_indent > 0 and tab_indent > 0)
-            local mixed_same_line
-            if not mixed then
-                mixed_same_line = vim.fn.search([[\v^(\t+ | +\t)]], 'nwc')
-                mixed = mixed_same_line > 0
-            end
-            if not mixed then return "" end
-            if mixed_same_line ~= nil and mixed_same_line > 0 then
-                return 'MI:' .. mixed_same_line
-            end
-            local space_indent_cnt = vim.fn.searchcount({ pattern = space_pat, max_count = 1e3 }).total
-            local tab_indent_cnt = vim.fn.searchcount({ pattern = tab_pat, max_count = 1e3 }).total
-            if space_indent_cnt > tab_indent_cnt then
-                return 'MI:' .. tab_indent
-            else
-                return 'MI:' .. space_indent
-            end
-        end
-      '';
+      __raw =
+        /*
+        lua
+        */
+        ''
+          function()
+              local space_pat = [[\v^ +]]
+              local tab_pat = [[\v^\t+]]
+              local space_indent = vim.fn.search(space_pat, 'nwc')
+              local tab_indent = vim.fn.search(tab_pat, 'nwc')
+              local mixed = (space_indent > 0 and tab_indent > 0)
+              local mixed_same_line
+              if not mixed then
+                  mixed_same_line = vim.fn.search([[\v^(\t+ | +\t)]], 'nwc')
+                  mixed = mixed_same_line > 0
+              end
+              if not mixed then return "" end
+              if mixed_same_line ~= nil and mixed_same_line > 0 then
+                  return 'MI:' .. mixed_same_line
+              end
+              local space_indent_cnt = vim.fn.searchcount({ pattern = space_pat, max_count = 1e3 }).total
+              local tab_indent_cnt = vim.fn.searchcount({ pattern = tab_pat, max_count = 1e3 }).total
+              if space_indent_cnt > tab_indent_cnt then
+                  return 'MI:' .. tab_indent
+              else
+                  return 'MI:' .. space_indent
+              end
+          end
+        '';
     };
   in {
     enable = true;
diff --git a/home-manager/soispha/config/neovim/nixvim/plugins/luasnip/default.nix b/hm/soispha/conf/nvim/plugins/luasnip/default.nix
index 50a0b94c..50a0b94c 100644
--- a/home-manager/soispha/config/neovim/nixvim/plugins/luasnip/default.nix
+++ b/hm/soispha/conf/nvim/plugins/luasnip/default.nix
diff --git a/home-manager/soispha/config/neovim/nixvim/plugins/luasnip/lua/luasnip.lua b/hm/soispha/conf/nvim/plugins/luasnip/lua/luasnip.lua
index 0a603692..0a603692 100644
--- a/home-manager/soispha/config/neovim/nixvim/plugins/luasnip/lua/luasnip.lua
+++ b/hm/soispha/conf/nvim/plugins/luasnip/lua/luasnip.lua
diff --git a/home-manager/soispha/config/neovim/nixvim/plugins/luasnip/lua/snippets/all.lua b/hm/soispha/conf/nvim/plugins/luasnip/lua/snippets/all.lua
index 5ce91a87..5ce91a87 100644
--- a/home-manager/soispha/config/neovim/nixvim/plugins/luasnip/lua/snippets/all.lua
+++ b/hm/soispha/conf/nvim/plugins/luasnip/lua/snippets/all.lua
diff --git a/home-manager/soispha/config/neovim/nixvim/plugins/luasnip/lua/snippets/html/html.lua b/hm/soispha/conf/nvim/plugins/luasnip/lua/snippets/html/html.lua
index c467dd68..c467dd68 100644
--- a/home-manager/soispha/config/neovim/nixvim/plugins/luasnip/lua/snippets/html/html.lua
+++ b/hm/soispha/conf/nvim/plugins/luasnip/lua/snippets/html/html.lua
diff --git a/home-manager/soispha/config/neovim/nixvim/plugins/luasnip/lua/snippets/tex/delimiter.lua b/hm/soispha/conf/nvim/plugins/luasnip/lua/snippets/tex/delimiter.lua
index e50898fc..e50898fc 100644
--- a/home-manager/soispha/config/neovim/nixvim/plugins/luasnip/lua/snippets/tex/delimiter.lua
+++ b/hm/soispha/conf/nvim/plugins/luasnip/lua/snippets/tex/delimiter.lua
diff --git a/home-manager/soispha/config/neovim/nixvim/plugins/luasnip/lua/snippets/tex/greek.lua b/hm/soispha/conf/nvim/plugins/luasnip/lua/snippets/tex/greek.lua
index 19989093..19989093 100644
--- a/home-manager/soispha/config/neovim/nixvim/plugins/luasnip/lua/snippets/tex/greek.lua
+++ b/hm/soispha/conf/nvim/plugins/luasnip/lua/snippets/tex/greek.lua
diff --git a/home-manager/soispha/config/neovim/nixvim/plugins/nvim-cmp/default.nix b/hm/soispha/conf/nvim/plugins/nvim-cmp/default.nix
index 2fd35272..2fd35272 100644
--- a/home-manager/soispha/config/neovim/nixvim/plugins/nvim-cmp/default.nix
+++ b/hm/soispha/conf/nvim/plugins/nvim-cmp/default.nix
diff --git a/home-manager/soispha/config/neovim/nixvim/plugins/nvim-lint/default.nix b/hm/soispha/conf/nvim/plugins/nvim-lint/default.nix
index c583ebf6..c583ebf6 100644
--- a/home-manager/soispha/config/neovim/nixvim/plugins/nvim-lint/default.nix
+++ b/hm/soispha/conf/nvim/plugins/nvim-lint/default.nix
diff --git a/home-manager/soispha/config/neovim/nixvim/plugins/nvim-lint/lua/nvim-lint.lua b/hm/soispha/conf/nvim/plugins/nvim-lint/lua/nvim-lint.lua
index 582da638..582da638 100644
--- a/home-manager/soispha/config/neovim/nixvim/plugins/nvim-lint/lua/nvim-lint.lua
+++ b/hm/soispha/conf/nvim/plugins/nvim-lint/lua/nvim-lint.lua
diff --git a/home-manager/soispha/config/neovim/nixvim/plugins/raw_plugins/default.nix b/hm/soispha/conf/nvim/plugins/raw_plugins/default.nix
index 941cb7cb..941cb7cb 100644
--- a/home-manager/soispha/config/neovim/nixvim/plugins/raw_plugins/default.nix
+++ b/hm/soispha/conf/nvim/plugins/raw_plugins/default.nix
diff --git a/home-manager/soispha/config/neovim/nixvim/plugins/telescope/default.nix b/hm/soispha/conf/nvim/plugins/telescope/default.nix
index b5054ed0..b5054ed0 100644
--- a/home-manager/soispha/config/neovim/nixvim/plugins/telescope/default.nix
+++ b/hm/soispha/conf/nvim/plugins/telescope/default.nix
diff --git a/home-manager/soispha/config/neovim/nixvim/plugins/telescope/defaults/default.nix b/hm/soispha/conf/nvim/plugins/telescope/defaults/default.nix
index 1d88aad8..1d88aad8 100644
--- a/home-manager/soispha/config/neovim/nixvim/plugins/telescope/defaults/default.nix
+++ b/hm/soispha/conf/nvim/plugins/telescope/defaults/default.nix
diff --git a/home-manager/soispha/config/neovim/nixvim/plugins/telescope/extensions/bibtex/default.nix b/hm/soispha/conf/nvim/plugins/telescope/extensions/bibtex/default.nix
index 12c9736c..12c9736c 100644
--- a/home-manager/soispha/config/neovim/nixvim/plugins/telescope/extensions/bibtex/default.nix
+++ b/hm/soispha/conf/nvim/plugins/telescope/extensions/bibtex/default.nix
diff --git a/home-manager/soispha/config/neovim/nixvim/plugins/telescope/extensions/default.nix b/hm/soispha/conf/nvim/plugins/telescope/extensions/default.nix
index 0b1e033a..0b1e033a 100644
--- a/home-manager/soispha/config/neovim/nixvim/plugins/telescope/extensions/default.nix
+++ b/hm/soispha/conf/nvim/plugins/telescope/extensions/default.nix
diff --git a/home-manager/soispha/config/neovim/nixvim/plugins/telescope/extensions/frecency/default.nix b/hm/soispha/conf/nvim/plugins/telescope/extensions/frecency/default.nix
index 4a4c22be..4a4c22be 100644
--- a/home-manager/soispha/config/neovim/nixvim/plugins/telescope/extensions/frecency/default.nix
+++ b/hm/soispha/conf/nvim/plugins/telescope/extensions/frecency/default.nix
diff --git a/home-manager/soispha/config/neovim/nixvim/plugins/telescope/extensions/fzy-native/default.nix b/hm/soispha/conf/nvim/plugins/telescope/extensions/fzy-native/default.nix
index ce0bdccc..ce0bdccc 100644
--- a/home-manager/soispha/config/neovim/nixvim/plugins/telescope/extensions/fzy-native/default.nix
+++ b/hm/soispha/conf/nvim/plugins/telescope/extensions/fzy-native/default.nix
diff --git a/home-manager/soispha/config/neovim/nixvim/plugins/telescope/extensions/rooter/default.nix b/hm/soispha/conf/nvim/plugins/telescope/extensions/rooter/default.nix
index 779448cc..779448cc 100644
--- a/home-manager/soispha/config/neovim/nixvim/plugins/telescope/extensions/rooter/default.nix
+++ b/hm/soispha/conf/nvim/plugins/telescope/extensions/rooter/default.nix
diff --git a/home-manager/soispha/config/neovim/nixvim/plugins/telescope/extensions/rooter/lua/rooter.lua b/hm/soispha/conf/nvim/plugins/telescope/extensions/rooter/lua/rooter.lua
index eaf68ecf..eaf68ecf 100644
--- a/home-manager/soispha/config/neovim/nixvim/plugins/telescope/extensions/rooter/lua/rooter.lua
+++ b/hm/soispha/conf/nvim/plugins/telescope/extensions/rooter/lua/rooter.lua
diff --git a/home-manager/soispha/config/neovim/nixvim/plugins/telescope/extensions/symbols/default.nix b/hm/soispha/conf/nvim/plugins/telescope/extensions/symbols/default.nix
index 1a679776..1a679776 100644
--- a/home-manager/soispha/config/neovim/nixvim/plugins/telescope/extensions/symbols/default.nix
+++ b/hm/soispha/conf/nvim/plugins/telescope/extensions/symbols/default.nix
diff --git a/home-manager/soispha/config/neovim/nixvim/plugins/telescope/keymaps/default.nix b/hm/soispha/conf/nvim/plugins/telescope/keymaps/default.nix
index f0745f73..f0745f73 100644
--- a/home-manager/soispha/config/neovim/nixvim/plugins/telescope/keymaps/default.nix
+++ b/hm/soispha/conf/nvim/plugins/telescope/keymaps/default.nix
diff --git a/home-manager/soispha/config/neovim/nixvim/plugins/todo-comments/default.nix b/hm/soispha/conf/nvim/plugins/todo-comments/default.nix
index f4d2b1c9..9ed6cc87 100644
--- a/home-manager/soispha/config/neovim/nixvim/plugins/todo-comments/default.nix
+++ b/hm/soispha/conf/nvim/plugins/todo-comments/default.nix
@@ -8,7 +8,7 @@
     highlight = {
       keyword = "wide_fg";
     };
-    keywordds = {
+    keywords = {
       /*
       # Defaults:
       FIX = {
diff --git a/home-manager/soispha/config/neovim/nixvim/plugins/treesitter/default.nix b/hm/soispha/conf/nvim/plugins/treesitter/default.nix
index 9d30d6b9..9d30d6b9 100644
--- a/home-manager/soispha/config/neovim/nixvim/plugins/treesitter/default.nix
+++ b/hm/soispha/conf/nvim/plugins/treesitter/default.nix
diff --git a/home-manager/soispha/config/neovim/nixvim/plugins/vim-tex/default.nix b/hm/soispha/conf/nvim/plugins/vim-tex/default.nix
index 9b5cea5e..9b5cea5e 100644
--- a/home-manager/soispha/config/neovim/nixvim/plugins/vim-tex/default.nix
+++ b/hm/soispha/conf/nvim/plugins/vim-tex/default.nix
diff --git a/home-manager/soispha/config/neovim/nixvim/plugins/which-key/default.nix b/hm/soispha/conf/nvim/plugins/which-key/default.nix
index be63f7ac..be63f7ac 100644
--- a/home-manager/soispha/config/neovim/nixvim/plugins/which-key/default.nix
+++ b/hm/soispha/conf/nvim/plugins/which-key/default.nix