From 5000465af9ac64b6dc90cb6024fbe2a7c8e159d6 Mon Sep 17 00:00:00 2001 From: Squibid Date: Sun, 26 Feb 2023 17:46:37 -0500 Subject: replace glow/terminal with toggleterm + smol reformatting --- lua/core/maps.lua | 14 +++++++++----- lua/core/overrides/init.lua | 1 + lua/core/overrides/toggleterm.lua | 19 +++++++++++++++++++ lua/core/plugins.lua | 6 +++--- 4 files changed, 32 insertions(+), 8 deletions(-) create mode 100644 lua/core/overrides/toggleterm.lua (limited to 'lua') diff --git a/lua/core/maps.lua b/lua/core/maps.lua index 867653b..dbcd8a3 100644 --- a/lua/core/maps.lua +++ b/lua/core/maps.lua @@ -3,8 +3,9 @@ local opts = { noremap = true, silent = true } -- greatest remap ever a.nvim_set_keymap("n", "p", "\"_dP", opts) --- open term buffer -a.nvim_set_keymap("n", "to", "vw:term", opts) +-- toggle terminal buffer +a.nvim_set_keymap("n", "", "ToggleTerm size=20", opts) +a.nvim_set_keymap("t", "", "ToggleTerm", opts) -- esc to go to normal mode in term bufers a.nvim_set_keymap("t", "", "", opts) @@ -103,9 +104,12 @@ a.nvim_set_keymap("v", "ha", ":HSHighlight 1", opts) a.nvim_set_keymap("v", "hc", ":HSRmHighlight", opts) -- code actions + renaming -a.nvim_set_keymap('n', 'gn', 'lua require("cosmic-ui").rename()', opts) -a.nvim_set_keymap('v', 'ga', 'lua require("cosmic-ui").range_code_actions()', opts) -a.nvim_set_keymap('n', 'ga', 'lua require("cosmic-ui").code_actions()', opts) +a.nvim_set_keymap('n', 'gn', 'lua require("cosmic-ui").rename()', opts) +a.nvim_set_keymap('v', 'ga', 'lua require("cosmic-ui").range_code_actions()', opts) +a.nvim_set_keymap('n', 'ga', 'lua require("cosmic-ui").code_actions()', opts) + +-- glow +a.nvim_set_keymap('n', 'gl', 'lua _glow()', opts) -- vbox note taking diff --git a/lua/core/overrides/init.lua b/lua/core/overrides/init.lua index 0e60a13..783fcd0 100644 --- a/lua/core/overrides/init.lua +++ b/lua/core/overrides/init.lua @@ -20,3 +20,4 @@ require('core.overrides.alpha') require('core.overrides.notify') require('core.overrides.hover') require('core.overrides.scrollbar') +require('core.overrides.toggleterm') diff --git a/lua/core/overrides/toggleterm.lua b/lua/core/overrides/toggleterm.lua new file mode 100644 index 0000000..4f5f598 --- /dev/null +++ b/lua/core/overrides/toggleterm.lua @@ -0,0 +1,19 @@ +require('toggleterm').setup { + shade_terminals = true, +} + +local Terminal = require('toggleterm.terminal').Terminal +local glow = Terminal:new({ + cmd = "glow", + hidden = true, + direction = "float", + float_opts = { + border = "shadow", + width = 120, + height = 50, + } +}) + +function _glow() + glow:toggle() +end diff --git a/lua/core/plugins.lua b/lua/core/plugins.lua index 4dd8e38..82b7bb6 100644 --- a/lua/core/plugins.lua +++ b/lua/core/plugins.lua @@ -75,11 +75,12 @@ require('lazy').setup{ { 'numToStr/Comment.nvim', config = true, }, { 'folke/trouble.nvim' }, { 'folke/todo-comments.nvim', config = true, }, + { 'akinsho/toggleterm.nvim', version = '*' }, -- -- project stuff - { 'sindrets/diffview.nvim', config = true }, - { 'notjedi/nvim-rooter.lua', config = true }, + { 'sindrets/diffview.nvim', config = true, }, + { 'notjedi/nvim-rooter.lua', config = true, }, -- -- notes @@ -92,7 +93,6 @@ require('lazy').setup{ { 'shortcuts/no-neck-pain.nvim', version = '*', }, - { 'ellisonleao/glow.nvim', config = true }, { 'Pocco81/high-str.nvim' }, -- -- cgit v1.2.1