From a9f2488b4847ca3da43bce03bb01c42bbd080a0a Mon Sep 17 00:00:00 2001 From: srdusr Date: Tue, 31 Oct 2023 21:45:25 +0200 Subject: Changed shading/background --- lua/plugins/toggleterm.lua | 103 +++++++++++++++++++++++---------------------- 1 file changed, 53 insertions(+), 50 deletions(-) (limited to 'lua') diff --git a/lua/plugins/toggleterm.lua b/lua/plugins/toggleterm.lua index 2f978a4..e67bdec 100644 --- a/lua/plugins/toggleterm.lua +++ b/lua/plugins/toggleterm.lua @@ -1,4 +1,4 @@ -local status_ok, toggleterm = pcall(require, "toggleterm") +local status_ok, toggleterm = pcall(require, 'toggleterm') if not status_ok then return end @@ -7,13 +7,13 @@ toggleterm.setup({ autochdir = true, hide_numbers = true, shade_filetypes = {}, - shade_terminals = true, - shading_factor = 1, + shade_terminals = false, + --shading_factor = 1, start_in_insert = true, insert_mappings = true, terminal_mappings = true, persist_size = true, - direction = "float", + direction = 'float', --direction = "vertical", --direction = "horizontal", close_on_exit = true, @@ -24,13 +24,12 @@ toggleterm.setup({ --Normal = { -- background = "#000000", --}, - Normal = { guibg = 'Black', guifg = 'DarkGray' }, - FloatBorder = { guibg = 'Black', guifg = 'DarkGray' }, - NormalFloat = { guibg = 'Black' }, - --float_opts = { - -- border = as.style.current.border, - -- winblend = 3, - --}, + --Normal = { guibg = 'Black', guifg = 'White' }, + --FloatBorder = { guibg = 'Black', guifg = 'DarkGray' }, + --NormalFloat = { guibg = 'Black' }, + float_opts = { + --winblend = 3, + }, }, size = function(term) if term.direction == 'horizontal' then @@ -42,16 +41,15 @@ toggleterm.setup({ float_opts = { width = 70, height = 15, - winblend = 3, - border = "curved", - --winblend = 0, + border = 'curved', highlights = { - border = "Normal", - background = "Normal", + border = 'Normal', + --background = 'Normal', }, + --winblend = 0, }, }) -local mods = require("user.mods") +local mods = require('user.mods') local float_handler = function(term) if not mods.empty(vim.fn.mapcheck('jk', 't')) then vim.keymap.del('t', 'jk', { buffer = term.bufnr }) @@ -63,41 +61,42 @@ function _G.set_terminal_keymaps() local opts = { noremap = true } --local opts = {buffer = 0} --vim.api.nvim_buf_set_keymap(0, "i", ";to", "[[]]Toggleterm", opts) - vim.api.nvim_buf_set_keymap(0, "t", "", [[]], opts) - vim.api.nvim_buf_set_keymap(0, "t", "", [[]], opts) - vim.api.nvim_buf_set_keymap(0, "t", "jk", [[]], opts) - vim.api.nvim_buf_set_keymap(0, "t", "", [[h]], opts) - vim.api.nvim_buf_set_keymap(0, "t", "", [[j]], opts) - vim.api.nvim_buf_set_keymap(0, "t", "", [[k]], opts) - vim.api.nvim_buf_set_keymap(0, "t", "", [[l]], opts) + vim.api.nvim_buf_set_keymap(0, 't', '', [[]], opts) + vim.api.nvim_buf_set_keymap(0, 't', '', [[]], opts) + vim.api.nvim_buf_set_keymap(0, 't', 'jk', [[]], opts) + vim.api.nvim_buf_set_keymap(0, 't', '', [[h]], opts) + vim.api.nvim_buf_set_keymap(0, 't', '', [[j]], opts) + vim.api.nvim_buf_set_keymap(0, 't', '', [[k]], opts) + vim.api.nvim_buf_set_keymap(0, 't', '', [[l]], opts) end -- if you only want these mappings for toggle term use term://*toggleterm#* instead vim.cmd('autocmd! TermOpen term://* lua set_terminal_keymaps()') -local Terminal = require("toggleterm.terminal").Terminal +local Terminal = require('toggleterm.terminal').Terminal -local horizontal_term = Terminal:new({ hidden = true, direction = "horizontal" }) -local vertical_term = Terminal:new({ hidden = true, direction = "vertical" }) +local horizontal_term = Terminal:new({ hidden = true, direction = 'horizontal' }) +local vertical_term = Terminal:new({ hidden = true, direction = 'vertical' }) function Horizontal_term_toggle() - horizontal_term:toggle(8, "horizontal") + horizontal_term:toggle(8, 'horizontal') end + function Vertical_term_toggle() - horizontal_term:toggle(math.floor(vim.o.columns * 0.5), "vertical") + horizontal_term:toggle(math.floor(vim.o.columns * 0.5), 'vertical') end local lazygit = Terminal:new({ - cmd = "lazygit", + cmd = 'lazygit', count = 5, id = 1000, - dir = "git_dir", - direction = "float", + dir = 'git_dir', + direction = 'float', on_open = float_handler, hidden = true, float_opts = { border = { '╒', '═', '╕', '│', '╛', '═', '╘', '│' }, width = 150, - height = 40 + height = 40, }, ---- Function to run on opening the terminal @@ -123,54 +122,58 @@ function Lazygit_toggle() lazygit:close() lazygit = Terminal:new({ cmd = "zsh --login -c 'lazygit'", - dir = "git_dir", - direction = "float", + dir = 'git_dir', + direction = 'float', hidden = true, on_open = float_handler, float_opts = { border = { '╒', '═', '╕', '│', '╛', '═', '╘', '│' }, width = 150, - height = 40 + height = 40, }, }) end lazygit:toggle() end -local node = Terminal:new({ cmd = "node", hidden = true }) +local node = Terminal:new({ cmd = 'node', hidden = true }) function _NODE_TOGGLE() node:toggle() end -local ncdu = Terminal:new({ cmd = "ncdu", hidden = true }) +local ncdu = Terminal:new({ cmd = 'ncdu', hidden = true }) function _NCDU_TOGGLE() ncdu:toggle() end -local htop = Terminal:new({ cmd = "htop", hidden = true }) +local htop = Terminal:new({ cmd = 'htop', hidden = true }) function _HTOP_TOGGLE() htop:toggle() end -local python = Terminal:new({ cmd = "python", hidden = true }) +local python = Terminal:new({ cmd = 'python', hidden = true }) function _PYTHON_TOGGLE() python:toggle() end function Gh_dash() -Terminal:new({ - cmd = 'gh dash', - hidden = true, - direction = 'float', - on_open = float_handler, - float_opts = { - height = function() return math.floor(vim.o.lines * 0.8) end, - width = function() return math.floor(vim.o.columns * 0.95) end, - }, -}) + Terminal:new({ + cmd = 'gh dash', + hidden = true, + direction = 'float', + on_open = float_handler, + float_opts = { + height = function() + return math.floor(vim.o.lines * 0.8) + end, + width = function() + return math.floor(vim.o.columns * 0.95) + end, + }, + }) Gh_dash:toggle() end -- cgit v1.2.3