diff --git a/lazy-lock.json b/lazy-lock.json index 1e6b1d7..7fd6b89 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -24,6 +24,7 @@ "indent-rainbowline.nvim": { "branch": "master", "commit": "572e8157de85d7af3f0085b5c74c059518900649" }, "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, "lazydev.nvim": { "branch": "main", "commit": "f59bd14a852ca43db38e3662395354cb2a9b13e0" }, + "lua-console.nvim": { "branch": "main", "commit": "bdf40fdc2147d190688d5bfb6aa50d2b73418a64" }, "markview.nvim": { "branch": "main", "commit": "e6b0f5aee8105adab6077509c46459812db4cffa" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "1a31f824b9cd5bc6f342fc29e9a53b60d74af245" }, "mason-null-ls.nvim": { "branch": "main", "commit": "2b8433f76598397fcc97318d410e0c4f7a4bea6a" }, diff --git a/lua/plugins/astrocore.lua b/lua/plugins/astrocore.lua index aee118f..3fb1bdf 100644 --- a/lua/plugins/astrocore.lua +++ b/lua/plugins/astrocore.lua @@ -35,11 +35,14 @@ return { -- navigate buffer tabs -- ["]b"] = { function() require("astrocore.buffer").nav(vim.v.count1) end, desc = "Next buffer" }, -- ["[b"] = { function() require("astrocore.buffer").nav(-vim.v.count1) end, desc = "Previous buffer" }, - ["a"] = { function() require("astrocore.buffer").nav(vim.v.count1) end, desc = "Next buffer" }, - [";"] = { function() require("astrocore.buffer").nav(-vim.v.count1) end, desc = "Previous buffer" }, + ["a"] = { function() require("astrocore.buffer").nav(-vim.v.count1) end, desc = "Previous buffer" }, + [";"] = { function() require("astrocore.buffer").nav(vim.v.count1) end, desc = "Next buffer" }, [""] = { function() require("astrocore.buffer").nav(vim.v.count1) end, desc = "Next buffer" }, [""] = { function() require("astrocore.buffer").nav(-vim.v.count1) end, desc = "Previous buffer" }, + -- show file path + ["fP"] = { function() print(vim.fn.expand "%:p") end, desc = "Show file path" }, + -- mappings seen under group name "Buffer" -- ["bd"] = { -- function() diff --git a/lua/plugins/lua_console.lua b/lua/plugins/lua_console.lua new file mode 100644 index 0000000..11752d9 --- /dev/null +++ b/lua/plugins/lua_console.lua @@ -0,0 +1,11 @@ +if true then return {} end + +return { + "yarospace/lua-console.nvim", + lazy = true, + keys = { + { "`", desc = "Lua-console - toggle", mode = { "t", "n" } }, + { "`", desc = "Lua-console - attach to buffer" }, + }, + opts = {}, +} diff --git a/lua/plugins/terminal.lua b/lua/plugins/terminal.lua index 484b477..ad96080 100644 --- a/lua/plugins/terminal.lua +++ b/lua/plugins/terminal.lua @@ -12,14 +12,33 @@ return { { ",tt", function() - local size = vim.o.lines * 0.4 - require("toggleterm").toggle(nil, size) + local term = require "toggleterm.terminal" + local id = term.get_focused_id() + local last = term.get_last_focused() + if id then + require("toggleterm").toggle(id) + elseif last then + require("toggleterm").toggle(last.id) + else + require("astrocore").notify("No terminal is opening", vim.log.levels.INFO, { title = "Toggle Term" }) + end end, mode = { "n", "t" }, - desc = "Toggle terminal horizontal", + desc = "Toggle terminal", }, - { ",tn", "ToggleTerm direction=tab", desc = "Toggle terminal in tab" }, - { ",tN", "TermNew direction=tab", desc = "New terminal in tab" }, + -- select + { ",ts", "TermSelect", desc = "Select Terminal", mode = { "t", "n" } }, + + -- toggle + { ",tf", "ToggleTerm direction=float", desc = "Toggle terminal float", mode = { "t", "n" } }, + -- { ",tn", "ToggleTerm direction=tab", desc = "Toggle terminal in tab" }, + + -- new + { ",tn", desc = "New terminal" }, + { ",tnt", "TermNew name=tab direction=tab", desc = "New terminal in tab" }, + { ",tnh", "TermNew name=horiz direction=horizontal", desc = "New horizontal terminal" }, + { ",tnv", "TermNew name=verti direction=vertical", desc = "New vertical terminal" }, + { ",tnf", "TermNew name=float direction=float", desc = "New float terminal" }, { "", "resize +2", desc = "Resize terminal up", mode = "t" }, { "", "resize -2", desc = "Resize terminal down", mode = "t" },