Thomas 1 жил өмнө
parent
commit
3256e2449e

+ 1 - 1
lazy-lock.json

@@ -48,5 +48,5 @@
   "typst.vim": { "branch": "main", "commit": "4d18ced62599ffe5b3c0e5e49566d5456121bc02" },
   "vim-lastplace": { "branch": "master", "commit": "e58cb0df716d3c88605ae49db5c4741db8b48aa9" },
   "vim-tmux-navigator": { "branch": "master", "commit": "5b3c701686fb4e6629c100ed32e827edf8dad01e" },
-  "which-key.nvim": { "branch": "main", "commit": "4d5b8959fd2a4df065ff76ccb39019aaa70cb0dc" }
+  "which-key.nvim": { "branch": "main", "commit": "d077a3f36d4b4d29eccc7feb1ba8e78a421df920" }
 }

+ 13 - 3
lua/config/mappings.lua

@@ -103,11 +103,14 @@ wk.add({
 		{
 			"<C-n>",
 			function()
-				ToggleTree("filesystem")
+				-- ToggleTree("filesystem")
+        require("edgy").toggle("left")
 			end,
-			desc = "Toggle file tree",
+			desc = "Toggle left panel",
 		},
 
+    { "<leader>uh", function() require("edgy").toggle("left") end, desc = "left" },
+
 		-- Typst format
 		{
 			"<leader>ft",
@@ -165,7 +168,14 @@ wk.add({
 		{ "<leader>tf", "<cmd>tabnew %<CR>", desc = "Open current buffer in new tab" }, --  move current buffer to new tab
 		{ "<Esc>", "<cmd>noh<CR>", desc = "clears search highlights", noremap = true, silent = true },
 
-    { "<leader>ib", function() print(vim.bo.filetype) end, desc = "Print the filetype of current buffer" },
+		{
+			"<leader>ib",
+			function()
+				print(vim.bo.filetype)
+			end,
+			desc = "Print the filetype of current buffer",
+		},
+		-- { "<leader>uh", function() require("edgy").select("left") end, desc = "focus left" },
 	},
 	{
 		mode = "v",

+ 16 - 13
lua/plugins/edgy.lua

@@ -1,4 +1,4 @@
----@diagnostic disable: undefined-doc-name
+--@diagnostic disable: undefined-doc-name
 return {
   "folke/edgy.nvim",
   event = "VeryLazy",
@@ -45,18 +45,22 @@ return {
         filter = function(buf)
           return vim.b[buf].neo_tree_source == "filesystem"
         end,
-        size = { height = 0.2 },
+        pinned = true,
+        collapsed = false, -- show window as closed/collapsed on start
+        open = "Neotree position=left filesystem",
+        size = { height = 0.7 },
+      },
+      {
+        title = "Neo-Tree Git",
+        ft = "neo-tree",
+        filter = function(buf)
+          return vim.b[buf].neo_tree_source == "git_status"
+        end,
+        pinned = true,
+        collapsed = false, -- show window as closed/collapsed on start
+        open = "Neotree position=left git_status",
+        size = { height = 0.3 },
       },
-      -- {
-      --   title = "Neo-Tree Git",
-      --   ft = "neo-tree",
-      --   filter = function(buf)
-      --     return vim.b[buf].neo_tree_source == "git_status"
-      --   end,
-      --   pinned = true,
-      --   collapsed = true, -- show window as closed/collapsed on start
-      --   open = "Neotree position=right git_status",
-      -- },
       -- {
       --   title = "Neo-Tree Buffers",
       --   ft = "neo-tree",
@@ -78,7 +82,6 @@ return {
       --
       -- },
       -- any other neo-tree windows
-      "neo-tree",
     },
     options = {
       left = { size = 25 },