add few plugins and change some options

6 files changed, 121 insertions, 68 deletions

diff --git a/cats.nix b/cats.nix
index cf24548..94443d0 100644
--- a/cats.nix
+++ b/cats.nix
@@ -98,6 +98,7 @@ in
         conform-nvim
         nvim-lint
         lazydev-nvim
+        trouble-nvim
       ];
 
       picker = {
@@ -127,6 +128,7 @@ in
     ui = [
       # mini-indentscope
       hlchunk-nvim
+      mini-statusline
     ];
 
     tsitter = [
diff --git a/lua/config/options.lua b/lua/config/options.lua
index 909ce31..62a4a44 100644
--- a/lua/config/options.lua
+++ b/lua/config/options.lua
@@ -3,14 +3,14 @@ vim.g.mapleader = " "
 vim.g.maplocalleader = " "
 vim.o.updatetime = 1500
 
-vim.opt.inccommand = "split"
+vim.o.inccommand = "split"
 
-vim.opt.undofile = false
-vim.opt.undodir = vim.fn.expand("~/.local/share/nvim/undo")
+vim.o.undofile = false
+vim.o.undodir = vim.fn.expand("~/.local/share/nvim/undo")
 
 vim.o.termguicolors = true
--- vim.opt.guicursor = "n-v-c-sm:block,ci-ve:ver25,r-cr-o:hor20"
-vim.o.showmode = true
+-- vim.o.guicursor = "n-v-c-sm:block,ci-ve:ver25,r-cr-o:hor20"
+vim.o.showmode = false
 vim.o.showcmd = false
 vim.o.signcolumn = "yes"
 vim.o.cursorline = true
@@ -46,7 +46,7 @@ vim.o.incsearch = true
 vim.o.title = true
 vim.o.swapfile = false
 
-vim.opt.foldlevel = 99
-vim.opt.foldlevelstart = 99
-vim.opt.foldenable = true
+vim.o.foldlevel = 99
+vim.o.foldlevelstart = 99
+vim.o.foldenable = true
 vim.o.foldmethod = "expr"
diff --git a/lua/plugins/general.lua b/lua/plugins/general.lua
index f115247..6716bbc 100644
--- a/lua/plugins/general.lua
+++ b/lua/plugins/general.lua
@@ -91,4 +91,44 @@ return {
             })
         end,
     },
+    {
+        "trouble.nvim",
+        for_cat = "core.general",
+        cmd = "Trouble",
+        keys = {
+            {
+                "<leader>xx",
+                "<cmd>Trouble diagnostics toggle<cr>",
+                desc = "Diagnostics (Trouble)",
+            },
+            {
+                "<leader>xX",
+                "<cmd>Trouble diagnostics toggle filter.buf=0<cr>",
+                desc = "Buffer Diagnostics (Trouble)",
+            },
+            {
+                "<leader>cs",
+                "<cmd>Trouble symbols toggle focus=false<cr>",
+                desc = "Symbols (Trouble)",
+            },
+            {
+                "<leader>cl",
+                "<cmd>Trouble lsp toggle focus=false win.position=right<cr>",
+                desc = "LSP Definitions / references / ... (Trouble)",
+            },
+            {
+                "<leader>xL",
+                "<cmd>Trouble loclist toggle<cr>",
+                desc = "Location List (Trouble)",
+            },
+            {
+                "<leader>xQ",
+                "<cmd>Trouble qflist toggle<cr>",
+                desc = "Quickfix List (Trouble)",
+            },
+        },
+        after = function()
+            require("trouble").setup()
+        end,
+    },
 }
diff --git a/lua/plugins/init.lua b/lua/plugins/init.lua
index 19e47d1..33575ee 100644
--- a/lua/plugins/init.lua
+++ b/lua/plugins/init.lua
@@ -9,4 +9,5 @@ return {
     { import = "plugins.picker" },
     { import = "plugins.debug" },
     { import = "plugins.linter" },
+    { import = "plugins.ui" },
 }
diff --git a/lua/plugins/misc.lua b/lua/plugins/misc.lua
index 4dc1a7b..37185ae 100644
--- a/lua/plugins/misc.lua
+++ b/lua/plugins/misc.lua
@@ -47,64 +47,4 @@ return {
             })
         end,
     },
-    -- {
-    --     "mini.indentscope",
-    --     for_cats = "ui",
-    --     event = { "BufReadPre", "BufNewFile" },
-    --     after = function()
-    --         require("mini.indentscope").setup({ symbol = "│" })
-    --     end,
-    -- },
-    {
-        "hlchunk.nvim",
-        for_cats = "ui",
-        event = { "BufReadPre", "BufNewFile" },
-        after = function()
-            local ignored_filetypes = {
-                gitcommit = true,
-                oil = true,
-                Neogitstatus = true,
-                TelescopePrompt = true,
-                NvimTree = true,
-                help = true,
-                nix = true,
-            }
-
-            require("hlchunk").setup({
-                chunk = {
-                    enable = true,
-                    priority = 15,
-                    -- style = {
-                    --     vim.api.nvim_get_hl(0, { name = "IndentBlanklineIndent1" }),
-                    --     vim.api.nvim_get_hl(0, { name = "DiagnosticError" }),
-                    -- },
-                    use_treesitter = true,
-                    chars = {
-                        horizontal_line = "─",
-                        vertical_line = "│",
-                        left_top = "╭",
-                        left_bottom = "╰",
-                        right_arrow = "─",
-                    },
-                    textobject = "",
-                    exclude_filetypes = ignored_filetypes,
-                    max_file_size = 1024 * 1024,
-                    error_sign = true,
-                    -- animation related
-                    duration = 200,
-                    delay = 300,
-                },
-                indent = {
-                    enable = true,
-                    priority = 10,
-                    style = { vim.api.nvim_get_hl(0, { name = "Whitespace" }) },
-                    use_treesitter = true,
-                    exclude_filetypes = ignored_filetypes,
-                    chars = { "│" },
-                    ahead_lines = 5,
-                    delay = 100,
-                },
-            })
-        end,
-    },
 }
diff --git a/lua/plugins/ui.lua b/lua/plugins/ui.lua
new file mode 100644
index 0000000..c399416
--- /dev/null
+++ b/lua/plugins/ui.lua
@@ -0,0 +1,70 @@
+return {
+    -- {
+    --     "mini.indentscope",
+    --     for_cats = "ui",
+    --     event = { "BufReadPre", "BufNewFile" },
+    --     after = function()
+    --         require("mini.indentscope").setup({ symbol = "│" })
+    --     end,
+    -- },
+    {
+        "mini.statusline",
+        for_cats = "ui",
+        event = { "DeferredUIEnter" },
+        after = function()
+            require("mini.statusline").setup()
+        end,
+    },
+    {
+        "hlchunk.nvim",
+        for_cats = "ui",
+        event = { "BufReadPre", "BufNewFile" },
+        after = function()
+            local ignored_filetypes = {
+                gitcommit = true,
+                oil = true,
+                Neogitstatus = true,
+                TelescopePrompt = true,
+                NvimTree = true,
+                help = true,
+                nix = true,
+            }
+
+            require("hlchunk").setup({
+                chunk = {
+                    enable = true,
+                    priority = 15,
+                    -- style = {
+                    --     vim.api.nvim_get_hl(0, { name = "IndentBlanklineIndent1" }),
+                    --     vim.api.nvim_get_hl(0, { name = "DiagnosticError" }),
+                    -- },
+                    use_treesitter = true,
+                    chars = {
+                        horizontal_line = "─",
+                        vertical_line = "│",
+                        left_top = "╭",
+                        left_bottom = "╰",
+                        right_arrow = "─",
+                    },
+                    textobject = "",
+                    exclude_filetypes = ignored_filetypes,
+                    max_file_size = 1024 * 1024,
+                    error_sign = true,
+                    -- animation related
+                    duration = 200,
+                    delay = 300,
+                },
+                indent = {
+                    enable = true,
+                    priority = 10,
+                    style = { vim.api.nvim_get_hl(0, { name = "Whitespace" }) },
+                    use_treesitter = true,
+                    exclude_filetypes = ignored_filetypes,
+                    chars = { "│" },
+                    ahead_lines = 5,
+                    delay = 100,
+                },
+            })
+        end,
+    },
+}