diff --git a/nvim/lazy-lock.json b/nvim/lazy-lock.json index 1a45728..246fb79 100644 --- a/nvim/lazy-lock.json +++ b/nvim/lazy-lock.json @@ -1,65 +1,62 @@ { "CopilotChat.nvim": { "branch": "canary", "commit": "82923efe22b604cf9c0cad0bb2a74aa9247755ab" }, - "SchemaStore.nvim": { "branch": "main", "commit": "35f36c50b9f1e1e916d0e3f004cb48dffd2bf737" }, - "bufferline.nvim": { "branch": "main", "commit": "99337f63f0a3c3ab9519f3d1da7618ca4f91cffe" }, - "catppuccin": { "branch": "main", "commit": "c0bea773a09e49e123136b099bce9ddc1bf395d2" }, + "SchemaStore.nvim": { "branch": "main", "commit": "73594484edfa33ec9301e42c6c7a4af25c48266f" }, + "bufferline.nvim": { "branch": "main", "commit": "81820cac7c85e51e4cf179f8a66d13dbf7b032d9" }, + "catppuccin": { "branch": "main", "commit": "31fcfb02c47952d5c75aec893b93b2878abe5fbb" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-git": { "branch": "main", "commit": "8dfbc33fb32c33e5c0be9dcc8176a4f4d395f95e" }, "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, - "conform.nvim": { "branch": "master", "commit": "6e5d476e97dbd251cc2233d42fd238c810404701" }, - "copilot-cmp": { "branch": "master", "commit": "b0ec7067460d77fc28a96429c99a84b2248f0f61" }, + "conform.nvim": { "branch": "master", "commit": "c26dadf8a47a547768d1048a0d698ecec33494ce" }, + "copilot-cmp": { "branch": "master", "commit": "b6e5286b3d74b04256d0a7e3bd2908eabec34b44" }, "copilot.lua": { "branch": "master", "commit": "86537b286f18783f8b67bccd78a4ef4345679625" }, - "dashboard-nvim": { "branch": "master", "commit": "b88c997f468a1bacb1e9b13ff3b567638caa06e6" }, - "dial.nvim": { "branch": "master", "commit": "7af2daaaf933b0617ded0f78b49f4d5fc45f9f64" }, - "friendly-snippets": { "branch": "main", "commit": "700c4a25caacbb4648c9a27972c2fe203948e0c2" }, - "fzf-lua": { "branch": "main", "commit": "b59bb9a205547a4d57987ab939845d9b35833466" }, + "dashboard-nvim": { "branch": "master", "commit": "69a4c935cc43d3d725ed0600c6d00593bc23d132" }, + "dial.nvim": { "branch": "master", "commit": "750f802879c90ea51f92b68c35fa562ee575804a" }, + "friendly-snippets": { "branch": "main", "commit": "682157939e57bd6a2c86277dfd4d6fbfce63dbac" }, + "fzf-lua": { "branch": "main", "commit": "41ea49cfc1b3f0586753bbeb7850474f28dc22cf" }, "headlines.nvim": { "branch": "master", "commit": "618ef1b2502c565c82254ef7d5b04402194d9ce3" }, "inc-rename.nvim": { "branch": "main", "commit": "535b508c0cb14d00c1836ad901b3c531cb1152bb" }, - "indent-blankline.nvim": { "branch": "master", "commit": "d98f537c3492e87b6dc6c2e3f66ac517528f406f" }, + "indent-blankline.nvim": { "branch": "master", "commit": "65e20ab94a26d0e14acac5049b8641336819dfc7" }, "log-highlight.nvim": { "branch": "main", "commit": "c18d1fd20c411f9fd9702d6d0d09edf3faa2bb96" }, "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" }, "luvit-meta": { "branch": "main", "commit": "ce76f6f6cdc9201523a5875a4471dcfe0186eb60" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "37a336b653f8594df75c827ed589f1c91d91ff6c" }, "mason.nvim": { "branch": "main", "commit": "0950b15060067f752fde13a779a994f59516ce3d" }, - "mini.ai": { "branch": "main", "commit": "9fef1097bca44616133cde6a6769e7aa07d12d7d" }, - "mini.align": { "branch": "main", "commit": "68a8d3205f0e7ce1bded057f4a851f42ef8fc584" }, - "mini.animate": { "branch": "main", "commit": "0a35f6db55cfac04a0999abe3465f7b692dc56a7" }, - "mini.diff": { "branch": "main", "commit": "6c1708a42ccb204d0c62d968eceb0203e037e61d" }, - "mini.hipatterns": { "branch": "main", "commit": "427712c754bfdccd8da7073576cd8e2586c0fe93" }, - "mini.pairs": { "branch": "main", "commit": "40261dfcec7623cd57be3c3beb50fa73f2650cdf" }, - "mini.surround": { "branch": "main", "commit": "dad4ee9846fed670f221feb4d32203912be8804b" }, + "mini.ai": { "branch": "main", "commit": "ebf806de0292ef89b2756cfb0b55040901d1c441" }, + "mini.align": { "branch": "main", "commit": "5020e5dc473707b293aeec5b05e7e88444246885" }, + "mini.animate": { "branch": "main", "commit": "88d133a11c0dd0736bd081a8c014a6a60477776e" }, + "mini.diff": { "branch": "main", "commit": "9d451672f2f4f8613c859618b5a7a5bf0c4cfa08" }, + "mini.hipatterns": { "branch": "main", "commit": "5d28a7e3f399de64c4dbf71f8c6c3b633d986f15" }, + "mini.pairs": { "branch": "main", "commit": "18a2d9d7106d08d3560d07c03dcbf5680c8675cc" }, + "mini.surround": { "branch": "main", "commit": "af280fc18792b4d142aab4c1638a8949a38ff33a" }, "neo-tree.nvim": { "branch": "v3.x", "commit": "29f7c215332ba95e470811c380ddbce2cebe2af4" }, - "neogen": { "branch": "main", "commit": "6de0add4805165317ab7d3d36b5cef48b1b865f3" }, - "neotest": { "branch": "master", "commit": "f30bab1faef13d47f3905e065215c96a42d075ad" }, + "neotest": { "branch": "master", "commit": "26ed90509c377d10dbdebd25b7094a886323b32b" }, "neotest-plenary": { "branch": "master", "commit": "dcaf5ed67a9e28a246e9783319e5aa6c9ea1c584" }, "neotest-python": { "branch": "master", "commit": "2e83d2bc00acbcc1fd529dbf0a0e677cabfe6b50" }, - "neotest-vitest": { "branch": "main", "commit": "6965a714793d9d156dadbe734c99b3a307f65c61" }, - "nerdy.nvim": { "branch": "main", "commit": "b467d6609b78d6a5f1e12cbc08fcc1ac87af20f5" }, - "nui.nvim": { "branch": "main", "commit": "322978c734866996274467de084a95e4f9b5e0b1" }, + "neotest-vitest": { "branch": "main", "commit": "353364aa05b94b09409cbef21b79c97c5564e2ce" }, + "nui.nvim": { "branch": "main", "commit": "61574ce6e60c815b0a0c4b5655b8486ba58089a1" }, "nvim-cmp": { "branch": "main", "commit": "a110e12d0b58eefcf5b771f533fc2cf3050680ac" }, - "nvim-lint": { "branch": "master", "commit": "941fa1220a61797a51f3af9ec6b7d74c8c7367ce" }, - "nvim-lspconfig": { "branch": "master", "commit": "bd7c76375a511994c9ca8d69441f134dc10ae3bd" }, + "nvim-dap": { "branch": "master", "commit": "6f79b822997f2e8a789c6034e147d42bc6706770" }, + "nvim-dap-python": { "branch": "master", "commit": "d777c2b32ed39f61209c09bede28d7491621a631" }, + "nvim-lint": { "branch": "master", "commit": "efc6fc83f0772283e064c53a8f9fb5645bde0bc0" }, + "nvim-lspconfig": { "branch": "master", "commit": "7edfd6692ba17f8d4fe08d84142781898ab0a672" }, "nvim-nio": { "branch": "master", "commit": "7969e0a8ffabdf210edd7978ec954a47a737bbcc" }, "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" }, "nvim-snippets": { "branch": "main", "commit": "5c978b3ba0c504dc9f94ca93d17029f26064d229" }, - "nvim-spectre": { "branch": "master", "commit": "ec67d4b5370094b923dfcf6b09b39142f2964861" }, - "nvim-treesitter": { "branch": "master", "commit": "4d112977c706034370a7fed65f7c957ec268eaa2" }, + "nvim-spectre": { "branch": "master", "commit": "49fae98ef2bfa8342522b337892992e3495065d5" }, + "nvim-treesitter": { "branch": "master", "commit": "f0e3b5c5fe38d0012c63368db90017fef87c85a2" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "34867c69838078df7d6919b130c0541c0b400c47" }, - "nvim-ts-autotag": { "branch": "main", "commit": "06fe07d7523ba8c755fac7c913fceba43b1720ee" }, + "nvim-ts-autotag": { "branch": "main", "commit": "ddfccbf0df1b9349c2b9e9b17f4afa8f9b6c1ed1" }, "nvim-web-devicons": { "branch": "master", "commit": "c0cfc1738361b5da1cd0a962dd6f774cc444f856" }, - "octo.nvim": { "branch": "master", "commit": "1f0029d5283443bad9a818fd7d9db253404bf8aa" }, + "octo.nvim": { "branch": "master", "commit": "7731ca4e31b32c176a383642ffcd7d593ac17774" }, "perfanno.nvim": { "branch": "master", "commit": "b138718bf4289b429dc81cadaf80ace8221c647b" }, "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" }, "qmk.nvim": { "branch": "main", "commit": "cfa6cecae362d23778cd97317d33ab12671e157c" }, "tailwindcss-colorizer-cmp.nvim": { "branch": "main", "commit": "3d3cd95e4a4135c250faf83dd5ed61b8e5502b86" }, "tree-sitter-caddy": { "branch": "master", "commit": "65b60437983933d00809c8927e7d8a29ca26dfa3" }, - "tree-sitter-just": { "branch": "main", "commit": "fd814fc6c579f68c2a642f5e0268cf69daae92d7" }, + "tree-sitter-just": { "branch": "main", "commit": "379fbe36d1e441bc9414ea050ad0c85c9d6935ea" }, "treesj": { "branch": "main", "commit": "f98deb33805485b56a8d44d1a27d16874af00d7f" }, - "vim-dadbod": { "branch": "master", "commit": "7888cb7164d69783d3dce4e0283decd26b82538b" }, - "vim-dadbod-completion": { "branch": "master", "commit": "5d5ad196fcde223509d7dabbade0148f7884c5e3" }, - "vim-dadbod-ui": { "branch": "master", "commit": "0dc68d9225a70d42f8645049482e090c1a8dce25" }, "wezterm-types": { "branch": "main", "commit": "1518752906ba3fac0060d9efab6e4d3ec15d4b5a" }, "yanky.nvim": { "branch": "main", "commit": "73215b77d22ebb179cef98e7e1235825431d10e4" } } \ No newline at end of file diff --git a/nvim/lazyvim.json b/nvim/lazyvim.json index 23983bd..b770613 100644 --- a/nvim/lazyvim.json +++ b/nvim/lazyvim.json @@ -3,7 +3,6 @@ "lazyvim.plugins.extras.coding.copilot", "lazyvim.plugins.extras.coding.copilot-chat", "lazyvim.plugins.extras.coding.mini-surround", - "lazyvim.plugins.extras.coding.neogen", "lazyvim.plugins.extras.coding.yanky", "lazyvim.plugins.extras.editor.dial", "lazyvim.plugins.extras.editor.fzf", @@ -14,7 +13,6 @@ "lazyvim.plugins.extras.lang.json", "lazyvim.plugins.extras.lang.markdown", "lazyvim.plugins.extras.lang.python", - "lazyvim.plugins.extras.lang.sql", "lazyvim.plugins.extras.lang.tailwind", "lazyvim.plugins.extras.lang.typescript", "lazyvim.plugins.extras.lang.yaml", @@ -28,7 +26,7 @@ ], "news": { "NEWS.md": "6077", - "doc/news.txt": "4293" + "doc/news.txt": "5244" }, "version": 6 } \ No newline at end of file diff --git a/nvim/lua/plugins/tmp.lua b/nvim/lua/plugins/tmp.lua index 8368728..0bb3f46 100644 --- a/nvim/lua/plugins/tmp.lua +++ b/nvim/lua/plugins/tmp.lua @@ -1,5 +1,43 @@ -return { +-- vim.api.nvim_create_autocmd("VimEnter", { +-- group = vim.api.nvim_create_augroup("group", { clear = true }), +-- callback = function(ev) +-- vim.defer_fn(function() +-- dd("loading") +-- require("lazy.core.plugin").load() +-- -- local plugins = require("lazy.core.config").plugins["lazy.nvim"] +-- -- local p = require("lazy.core.config").plugins +-- end, 2000) +-- end, +-- }) +return { + -- { "gvvaughan/lyaml" }, + { "folke/noice.nvim", event = "CmdLineEnter" }, + -- { "stevearc/dressing.nvim", enabled = false }, + -- { "folke/noice.nvim", opts = { debug = true } }, + -- { "neo-tree.nvim", enabled = false }, + { + "ibhagwan/fzf-lua", + dev = false, + opts = { + winopts = { + -- border = "none", + }, + }, + }, + -- { + -- "nvim-neorg/neorg", + -- enabled = false, + -- cmd = "Neorg", + -- opts = {}, + -- }, + { + "folke/edgy.nvim", + enabled = true, + opts = { + animate = { enabled = true }, + }, + }, { "justinsgithub/wezterm-types", lazy = true }, { "folke/lazydev.nvim", @@ -16,9 +54,16 @@ return { opts = { show_help = false }, }, { + "folke/trouble.nvim", + -- build = function() + -- for i = 1, 5 do + -- require("lazy.util").sleep(1000) + -- coroutine.yield("step" .. i) + -- end + -- end, opts = { - debug = true, + -- debug = true, -- preview = { -- type = "split", -- relative = "win", @@ -62,13 +107,6 @@ return { { "gA", mode = { "n", "v" } }, }, }, - { - "2kabhishek/nerdy.nvim", - cmd = "Nerdy", - keys = { - { "ci", "Nerdy", desc = "Pick Icon" }, - }, - }, { "folke/flash.nvim", ---@module 'flash' diff --git a/nvim/lua/plugins/ui.lua b/nvim/lua/plugins/ui.lua index 3f251ff..0b433ad 100644 --- a/nvim/lua/plugins/ui.lua +++ b/nvim/lua/plugins/ui.lua @@ -72,12 +72,6 @@ return { { "nvim-lualine/lualine.nvim", opts = function(_, opts) - table.insert(opts.sections.lualine_x, { - function() - return require("util.dashboard").status() - end, - }) - ---@type table local mutagen = {} @@ -91,7 +85,11 @@ return { status = {}, } local now = vim.uv.now() -- timestamp in milliseconds - if mutagen[cwd].enabled and (mutagen[cwd].updated + 10000 < now) then + local refresh = mutagen[cwd].updated + 10000 < now + if #mutagen[cwd].status > 0 then + refresh = mutagen[cwd].updated + 1000 < now + end + if mutagen[cwd].enabled and refresh then ---@type {name:string, status:string, idle:boolean}[] local sessions = {} local lines = vim.fn.systemlist("mutagen project list") diff --git a/nvim/lua/util/debug.lua b/nvim/lua/util/debug.lua index c757b0f..b4af46a 100644 --- a/nvim/lua/util/debug.lua +++ b/nvim/lua/util/debug.lua @@ -50,7 +50,7 @@ function M.dump(...) if vim.tbl_isempty(value) then value = nil else - value = vim.tbl_islist(value) and vim.tbl_count(value) <= 1 and value[1] or value + value = (vim.islist or vim.tbl_islist)(value) and vim.tbl_count(value) <= 1 and value[1] or value end M._dump(value) end @@ -60,7 +60,7 @@ function M.bt(...) if vim.tbl_isempty(value) then value = nil else - value = vim.tbl_islist(value) and vim.tbl_count(value) <= 1 and value[1] or value + value = (vim.islist or vim.tbl_islist)(value) and vim.tbl_count(value) <= 1 and value[1] or value end M._dump(value, { bt = true }) end