Skip to content

Commit

Permalink
chore: more QOL improvements and fixes
Browse files Browse the repository at this point in the history
- Noice dropped, added a utils function to manage LspProgress in
statusline
  • Loading branch information
kevinm6 committed Dec 26, 2024
1 parent cfaebc8 commit 9589c3c
Show file tree
Hide file tree
Showing 6 changed files with 34 additions and 303 deletions.
1 change: 0 additions & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
root = true
[*]
; end_of_line = lf
insert_final_newline = false
charset = utf-8

Expand Down
17 changes: 8 additions & 9 deletions lazy-lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,39 +3,38 @@
"alpha-nvim": { "branch": "main", "commit": "de72250e054e5e691b9736ee30db72c65d560771" },
"blink.cmp": { "branch": "main", "commit": "5f442681df24fe705d1ee7ce5b4d435aa4b4dee4" },
"color-picker.nvim": { "branch": "master", "commit": "06cb5f853535dea529a523e9a0e8884cdf9eba4d" },
"conform.nvim": { "branch": "master", "commit": "339b3e4519ec49312d34fcfa275aa15bfaa67025" },
"conform.nvim": { "branch": "master", "commit": "9180320205d250429f0f80e073326c674e2a7149" },
"data-viewer.nvim": { "branch": "main", "commit": "40ddf37bb7ab6c04ff9e820812d1539afe691668" },
"gitsigns.nvim": { "branch": "main", "commit": "5f808b5e4fef30bd8aca1b803b4e555da07fc412" },
"go.nvim": { "branch": "master", "commit": "c6d5ca26377d01c4de1f7bff1cd62c8b43baa6bc" },
"hererocks": { "branch": "master", "commit": "c9c5444dea1e07e005484014a8231aa667be30b6" },
"image.nvim": { "branch": "master", "commit": "b3e1af829a56bb038e5f81bf97798a2950064b62" },
"image.nvim": { "branch": "master", "commit": "b991fc7f845bc6ab40c6ec00b39750dcd5190010" },
"jupytext.nvim": { "branch": "main", "commit": "c8baf3ad344c59b3abd461ecc17fc16ec44d0f7b" },
"lazy.nvim": { "branch": "main", "commit": "7e6c863bc7563efbdd757a310d17ebc95166cef3" },
"lazydev.nvim": { "branch": "main", "commit": "8620f82ee3f59ff2187647167b6b47387a13a018" },
"markdown.nvim": { "branch": "main", "commit": "0022a579ac7355966be5ade77699b88c76b6a549" },
"markdown.nvim": { "branch": "main", "commit": "ba6253d9673daf0cf394b87b2c2ecb7630944c7d" },
"mason-lspconfig.nvim": { "branch": "main", "commit": "2daa8921b7afdcfa47419a21ea343c3df6d74fa0" },
"mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },
"mini.icons": { "branch": "main", "commit": "44c0160526f7ae17ca8e8eab9ab235d047fcf7a6" },
"mini.pairs": { "branch": "main", "commit": "7e834c5937d95364cc1740e20d673afe2d034cdb" },
"mini.surround": { "branch": "main", "commit": "aa5e245829dd12d8ff0c96ef11da28681d6049aa" },
"molten-nvim": { "branch": "main", "commit": "66ee5c0a0fbe3e014b867d04db44592f2d3eb30f" },
"noice.nvim": { "branch": "main", "commit": "eaed6cc9c06aa2013b5255349e4f26a6b17ab70f" },
"nui.nvim": { "branch": "main", "commit": "53e907ffe5eedebdca1cd503b00aa8692068ca46" },
"nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" },
"nvim-dap": { "branch": "master", "commit": "a6070b4e9e9a8ff1bc513c3748eff27080b0f44a" },
"nvim-dap": { "branch": "master", "commit": "665d3569a86395fe0dab85efbdb26d7d2ee57e49" },
"nvim-dap-ui": { "branch": "master", "commit": "ffa89839f97bad360e78428d5c740fdad9a0ff02" },
"nvim-dbee": { "branch": "master", "commit": "21d2cc0844a16262bb6ea93ab3d0a0f20bd87853" },
"nvim-jdtls": { "branch": "master", "commit": "ece818f909c6414cbad4e1fb240d87e003e10fda" },
"nvim-lint": { "branch": "master", "commit": "1fea92f1d9908eaa5eb8bafe08b4293d7aadaa55" },
"nvim-lspconfig": { "branch": "master", "commit": "c580f34bc5fdca8aaf737a9ab8a5d775cb940e57" },
"nvim-lspconfig": { "branch": "master", "commit": "ff2b85abaa810f6611233dbe6d31c07510ebf43d" },
"nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" },
"nvim-notify": { "branch": "master", "commit": "fbef5d32be8466dd76544a257d3f3dce20082a07" },
"nvim-treesitter": { "branch": "master", "commit": "50947387c20ec3fb8c30b8c1c1a1c39f68deb970" },
"nvim-treesitter": { "branch": "master", "commit": "17678b00fa5c2712890a0ec2e269d0a4de1207df" },
"nvim-treesitter-refactor": { "branch": "master", "commit": "d8b74fa87afc6a1e97b18da23e762efb032dc270" },
"nvim-ufo": { "branch": "main", "commit": "270ca542dae992ffe40274718c63645217ebc8bf" },
"nvim-ufo": { "branch": "main", "commit": "32cb247b893a384f1888b9cd737264159ecf183c" },
"obsidian.nvim": { "branch": "main", "commit": "ae1f76a75c7ce36866e1d9342a8f6f5b9c2caf9b" },
"oil.nvim": { "branch": "master", "commit": "ba858b662599eab8ef1cba9ab745afded99cb180" },
"otter.nvim": { "branch": "main", "commit": "7edd39c920f7a28ac711a7c658a7cfdfb804bc82" },
"otter.nvim": { "branch": "main", "commit": "e8c662e1aefa8b483cfba6e00729a39a363dcecc" },
"plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" },
"promise-async": { "branch": "main", "commit": "119e8961014c9bfaf1487bf3c2a393d254f337e2" },
"quarto-nvim": { "branch": "main", "commit": "1cb2d24d7793241bd43f38e3a6f99a6d11f84458" },
Expand Down
22 changes: 20 additions & 2 deletions lua/lib/ui/statusline.lua
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
-- File : statusline.lua
-- Description : Personal statusline config
-- Author : Kevin Manca
-- Last Modified: 18 Jul 2024, 09:52
-- Last Modified: 26 Dec 2024, 11:00
-----------------------------------------

local sl = {
Expand All @@ -19,6 +19,7 @@ local sl = {
lazy = true,
mason = true,
noice = true,

checkhealth = true,
WhichKey = true,
query = true,
Expand Down Expand Up @@ -262,6 +263,20 @@ local function get_lsp_diagnostic()
)
end

---Get lsp progress, trying to remove Noice and mini-view
---@return string progress formatted progress
local function get_lsp_progress()
local lsp = vim.lsp.status()
if lsp then
lsp = lsp:gsub(":", " ")
lsp = lsp:gsub("(%d+%%)", "%1%%") -- sanitize percentage
lsp = lsp:gsub("%s+", " ")
return lsp
end

return ""
end

---Get git status with `gitsigns` plugin
---and display data depending on available window width
---@return string git_status git formatted data
Expand Down Expand Up @@ -418,6 +433,7 @@ local function enable_statusline()
"",
sl.colors.empty,
session_name(),
get_lsp_progress(),
get_python_env(),

-- Middle
Expand Down Expand Up @@ -469,6 +485,8 @@ function sl.toggle()
"VimResized",
"FileType",
"FileChangedShellPost",
"DiagnosticChanged",
"LspProgress",
}, {
group = vim.api.nvim_create_augroup("_statusline", { clear = true }),
callback = function(cb)
Expand All @@ -485,4 +503,4 @@ end

vim.api.nvim_create_user_command("ToggleStatusline", sl.toggle, { desc = "Toggle Statusline" })

return sl
return sl
2 changes: 1 addition & 1 deletion lua/plugins/editor/completion.lua
Original file line number Diff line number Diff line change
Expand Up @@ -104,4 +104,4 @@ return {
},
},
},
}
}
Loading

0 comments on commit 9589c3c

Please sign in to comment.