neovim: small changes

8 files changed, 27 insertions, 32 deletions

diff --git a/pkgs/custom-neovim/config/init.lua b/pkgs/custom-neovim/config/init.lua
index b2eb7e9..108d8cf 100644
--- a/pkgs/custom-neovim/config/init.lua
+++ b/pkgs/custom-neovim/config/init.lua
@@ -9,15 +9,15 @@ require("colorschemes")
 require("neovide")
 require("mappings")
 require("statusline")
-require("lsp")
 require("completion")
+require("lsp")
 
 -- UI Plugins:
 require("plugins.mini.tabline")
 require("plugins.mini.clue")
 require("plugins.mini.indentscope")
 require("plugins.fidget")
--- require("plugins.mini.notify")
+require("plugins.mini.cursorword")
 require("plugins.treesitter")
 require("plugins.mini.files")
 require("plugins.dropbar")
diff --git a/pkgs/custom-neovim/config/lua/mappings.lua b/pkgs/custom-neovim/config/lua/mappings.lua
index da2cf17..8648ff3 100644
--- a/pkgs/custom-neovim/config/lua/mappings.lua
+++ b/pkgs/custom-neovim/config/lua/mappings.lua
@@ -27,13 +27,6 @@ mapkey("n", "<leader>to", "Open new tab", ":tabnew<cr>")
 mapkey("n", "<leader>tc", "Close tab", ":tabclose<cr>")
 mapkey("n", "<leader>tt", "Go to next tab", ":tabnext<cr>")
 mapkey("n", "<leader>tT", "Go to previous tab", ":tabprev<cr>")
--- mapkey("n", "<leader>tr", "Rename current tab", function()
---   vim.ui.input({ prompt = "Rename tab: "}, function(input)
---     if input then
---       vim.cmd.TabRename(input)
---     end
---   end)
--- end)
 
 -- Buffers
 mapkey("n", "<leader>b", "Manage buffers", "")
@@ -46,12 +39,6 @@ mapkey("n", "<leader>bg", "Open buffer live grep picker", ":lua Snacks.picker.gr
 -- Windows
 mapkey("n", "<leader>w", "Manage windows", "<C-w>")
 
--- Fix arrow keys in wincmd
--- mapkey("n", "<c-w><left>", "Focus left", "lua vim.cmd.wincmd('h')<cr>")
--- mapkey("n", "<c-w><down>", "Focus down", "lua vim.cmd.wincmd('j')<cr>")
--- mapkey("n", "<c-w><up>", "Focus up", "lua vim.cmd.wincmd('k')<cr>")
--- mapkey("n", "<c-w><right>", "Focus right", "lua vim.cmd.wincmd('l')<cr>")
-
 -- Sessions
 mapkey("n", "<leader>m", "Manage sessions", "")
 mapkey("n", "<leader>mm", "Open session picker", ":Autosession search<cr>")
@@ -78,8 +65,6 @@ vim.keymap.set("c", "<cr>", function()
   return '<cr>'
 end, { expr = true }) -- Make enter complete command.
 mapkey("n", "<esc>", "Clear highlights", ":noh<cr>") -- Make esc clear highlights
--- mapkey("n", "<leader>q", "Close buffer", ":bd<cr>")
--- mapkey("n", "<leader>Q", "Force close buffer", ":bd!<cr>")
 
 -- Newline in normal mode.
 mapkey('n', '<CR>', "Add newline below", 'm`o<Esc>``')
diff --git a/pkgs/custom-neovim/config/lua/plugins/cmp.lua b/pkgs/custom-neovim/config/lua/plugins/cmp.lua
deleted file mode 100644
index 2ef2cca..0000000
--- a/pkgs/custom-neovim/config/lua/plugins/cmp.lua
+++ /dev/null
@@ -1 +0,0 @@
-require("nvim-cmp").setup()
diff --git a/pkgs/custom-neovim/config/lua/plugins/mini/cursorword.lua b/pkgs/custom-neovim/config/lua/plugins/mini/cursorword.lua
new file mode 100644
index 0000000..530b88b
--- /dev/null
+++ b/pkgs/custom-neovim/config/lua/plugins/mini/cursorword.lua
@@ -0,0 +1 @@
+require("mini.cursorword").setup()
diff --git a/pkgs/custom-neovim/config/lua/plugins/mini/notify.lua b/pkgs/custom-neovim/config/lua/plugins/mini/notify.lua
deleted file mode 100644
index 8c4d63c..0000000
--- a/pkgs/custom-neovim/config/lua/plugins/mini/notify.lua
+++ /dev/null
@@ -1 +0,0 @@
-require("mini.notify").setup()
diff --git a/pkgs/custom-neovim/config/lua/plugins/mini/tabline.lua b/pkgs/custom-neovim/config/lua/plugins/mini/tabline.lua
index 90ba53a..7eccb36 100644
--- a/pkgs/custom-neovim/config/lua/plugins/mini/tabline.lua
+++ b/pkgs/custom-neovim/config/lua/plugins/mini/tabline.lua
@@ -7,6 +7,20 @@ require("mini.tabline").setup {
 
 local link_hl = Utils.link_highlight
 
-link_hl("MiniTablineModifiedHidden", "MiniTablineHidden")
-link_hl("MiniTablineModifiedVisible", "MiniTablineVisible")
-link_hl("MiniTablineModifiedCurrent", "MiniTablineCurrent")
+vim.api.nvim_create_autocmd({"Colorscheme", "VimEnter"}, {
+
+  callback = function()
+    -- Change colors.
+    link_hl("MiniTablineHidden", "MiniStatuslineFilename")
+    link_hl("MiniTablineVisible", "MiniStatuslineFilename")
+    link_hl("MiniTablineVisible", "Italic")
+    -- link_hl("MiniTablineCurrent", "MiniFilesCursorLine")
+    link_hl("MiniTablineCurrent", "Bold")
+
+    -- Make modified buffers the same color.
+    link_hl("MiniTablineModifiedHidden", "MiniTablineHidden")
+    link_hl("MiniTablineModifiedVisible", "MiniTablineVisible")
+    link_hl("MiniTablineCurrent", "MiniFilesCursorLine")
+    link_hl("MiniTablineModifiedCurrent", "MiniTablineCurrent")
+  end,
+})
diff --git a/pkgs/custom-neovim/config/lua/statusline.lua b/pkgs/custom-neovim/config/lua/statusline.lua
index 978ce0b..08bbe50 100644
--- a/pkgs/custom-neovim/config/lua/statusline.lua
+++ b/pkgs/custom-neovim/config/lua/statusline.lua
@@ -65,25 +65,25 @@ statusline_components.diagnostic_status = function()
   local errors = #vim.diagnostic.get(0, { severity = 1 })
 
   if errors > 0 then
-    table.insert(diagnostics, "%#DiagnosticSignError# " .. tostring(errors))
+    table.insert(diagnostics, "%#DiagnosticSignError# " .. tostring(errors))
   end
 
   local warnings = #vim.diagnostic.get(0, { severity = 2 })
 
   if warnings > 0 then
-    table.insert(diagnostics, "%#DiagnosticSignWarn# " .. tostring(warnings))
+    table.insert(diagnostics, "%#DiagnosticSignWarn# " .. tostring(warnings))
   end
 
   local infos = #vim.diagnostic.get(0, { severity = 3 })
 
   if infos > 0 then
-    table.insert(diagnostics, "%#DiagnosticSignInfo# " .. tostring(infos))
+    table.insert(diagnostics, "%#DiagnosticSignInfo# " .. tostring(infos))
   end
 
   local hints = #vim.diagnostic.get(0, { severity = 4 })
 
   if hints > 0 then
-    table.insert(diagnostics, "%#DiagnosticSignHint# " .. tostring(hints))
+    table.insert(diagnostics, "%#DiagnosticSignHint# " .. tostring(hints))
   end
 
   table.insert(diagnostics, "%#StatusLine#")
@@ -176,15 +176,15 @@ statusline_components.git_status = function()
   local gitsigns_status = vim.b.gitsigns_status_dict
 
   if gitsigns_status.added > 0 then
-    table.insert(status, hi_pattern:format("Added", ("+%s"):format(gitsigns_status.added)))
+    table.insert(status, hi_pattern:format("Added", (" %s"):format(gitsigns_status.added)))
   end
 
   if gitsigns_status.changed > 0 then
-    table.insert(status, hi_pattern:format("Changed", ("+%s"):format(gitsigns_status.changed)))
+    table.insert(status, hi_pattern:format("Changed", (" %s"):format(gitsigns_status.changed)))
   end
 
   if gitsigns_status.removed > 0 then
-    table.insert(status, hi_pattern:format("Removed", ("+%s"):format(gitsigns_status.removed)))
+    table.insert(status, hi_pattern:format("Removed", (" %s"):format(gitsigns_status.removed)))
   end
 
   return table.concat(status, " ")
diff --git a/pkgs/custom-neovim/design.md b/pkgs/custom-neovim/design.md
index 1c228f4..b54e944 100644
--- a/pkgs/custom-neovim/design.md
+++ b/pkgs/custom-neovim/design.md
@@ -12,9 +12,6 @@
 
 - find dropbar load autocommand and modify to work on winenter to prevent no dropbar when splitting
 - make lazyvim launch with default shell bash
-- add more binds to mini.files
-- make autocomplete accept the current completion when I resume typing
-- Add LSP status to status bar
 
 ## Todo if possible
 - make splits automatically equalize when window resized