chore(nvim): up

tmm · Jan 12, 2025 · 8b11697 · 8b11697
1 parent c652700
commit 8b11697
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 12 deletions.
diff --git a/.config/nvim/TODO.md b/.config/nvim/TODO.md
@@ -2,8 +2,11 @@
 
 lazy d1529f6
 
+trouble lualine
+
 ## Issues
 
+- snacks git worktree https://github.com/folke/snacks.nvim/issues/405
 - gf in terminal does not focus file (opens in background)
 - neotest output does not auto-scroll in edgy
 

diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json
@@ -12,7 +12,7 @@
   "mason-lspconfig.nvim": { "branch": "main", "commit": "97d9f1d3ad205dece6bcafd1d71cf1507608f3c7" },
   "mason-nvim-dap.nvim": { "branch": "main", "commit": "8b9363d83b5d779813cdd2819b8308651cec2a09" },
   "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },
-  "mini.nvim": { "branch": "main", "commit": "3a3178419ce9947f55708966dabf030eca40735a" },
+  "mini.nvim": { "branch": "main", "commit": "7c0e12076af6a45227273b57110a91e9089a93fc" },
   "neo-tree.nvim": { "branch": "main", "commit": "5185ab7d46f54322bf16d9ef7b1d34708302e2ab" },
   "neotest": { "branch": "master", "commit": "d66cf4e05a116957f0d3a7755a24291c7d1e1f72" },
   "neotest-elixir": { "branch": "master", "commit": "c5067bcc3ec6a0bba7b5694fa15aeb17f16aeb3c" },
@@ -26,10 +26,10 @@
   "nvim-lspconfig": { "branch": "master", "commit": "88157521e890fe7fdf18bee22438875edd6300a6" },
   "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" },
   "nvim-scrollbar": { "branch": "main", "commit": "6994eb9f73d5fdc36ee2c8717940e8c853e51a49" },
-  "nvim-treesitter": { "branch": "master", "commit": "9ef2e37e1b3200004f872a536f0c8ed968b742e6" },
+  "nvim-treesitter": { "branch": "master", "commit": "097fb77312c731347180e8907424f6c967323f05" },
   "nvim-treesitter-context": { "branch": "master", "commit": "d0dd7ce5a9d0be1f28086e818e52fdc5c78975df" },
   "nvim-ts-autotag": { "branch": "main", "commit": "1cca23c9da708047922d3895a71032bc0449c52d" },
-  "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" },
+  "plenary.nvim": { "branch": "master", "commit": "3707cdb1e43f5cea73afb6037e6494e7ce847a66" },
   "snacks.nvim": { "branch": "main", "commit": "d2b2b7bcbf9814d61f2e8049affed750509f44e3" },
   "trouble.nvim": { "branch": "main", "commit": "46cf952fc115f4c2b98d4e208ed1e2dce08c9bf6" },
   "ts-comments.nvim": { "branch": "main", "commit": "872dcfa0418f4a33b7437fb4d9f4e89f2f000d74" },

diff --git a/.config/nvim/lua/plugins.lua b/.config/nvim/lua/plugins.lua
@@ -28,13 +28,6 @@ return {
     },
     dependencies = {
       "rafamadriz/friendly-snippets",
-      -- add blink.compat to dependencies
-      {
-        "saghen/blink.compat",
-        optional = true, -- make optional so it's only enabled if any extras need it
-        opts = {},
-        version = not vim.g.lazyvim_blink_main and "*",
-      },
     },
     opts = {
       appearance = {
@@ -306,7 +299,7 @@ return {
             end,
             pinned = true,
             open = function()
-              vim.cmd(("Neotree show position=%s %s dir=%s"):format(pos[v] or "bottom", v, require("util.root")()))
+              vim.cmd(("Neotree show position=%s %s dir=%s"):format(pos[v] or "bottom", v, require("util.root").get()))
             end,
           })
         end
@@ -701,6 +694,16 @@ return {
   {
     "nvim-lualine/lualine.nvim",
     event = "VeryLazy",
+    init = function()
+      vim.g.lualine_laststatus = vim.o.laststatus
+      if vim.fn.argc(-1) > 0 then
+        -- set an empty statusline till lualine loads
+        vim.o.statusline = " "
+      else
+        -- hide the statusline on the starter page
+        vim.o.laststatus = 0
+      end
+    end,
     config = function()
       local conditions = {
         buffer_not_empty = function()
@@ -773,6 +776,12 @@ return {
               color = "MsgArea",
             },
             -- stylua: ignore
+            {
+              function() return "  " .. require("dap").status() end,
+              cond = function() return require("dap").status() ~= "" end,
+              color = "MsgArea",
+            },
+            -- stylua: ignore
             { require("lazy.status").updates, cond = require("lazy.status").has_updates, color = "MsgArea" },
             { "location", color = "MsgArea" },
           },
@@ -1065,7 +1074,7 @@ return {
     },
     -- stylua: ignore
 		keys = {
-			{ "<leader>fe", function() require("neo-tree.command").execute({ toggle = true }) end, desc = "Explorer NeoTree" },
+			{ "<leader>fe", function() require("neo-tree.command").execute({ toggle = true, dir = require("util.root").get() }) end, desc = "Explorer NeoTree" },
 			{ "<leader>fE", function() require("neo-tree.command").execute({ reveal = true }) end, desc = "Explorer NeoTree (Reveal File)" },
 			{ "<leader>e", "<leader>fe", desc = "Explorer NeoTree", remap = true },
 			{ "<leader>E", "<leader>fE", desc = "Explorer NeoTree (Reveal File)", remap = true },