From b24b91367c075b6dc0e006768ccc6256459ee8b8 Mon Sep 17 00:00:00 2001 From: Luminiferous Date: Fri, 4 Jul 2025 13:43:19 +0200 Subject: [PATCH] Cleaned up Terminal Code and added some hotkeys --- init.lua | 35 ++++++++++++++++++++++------------- 1 file changed, 22 insertions(+), 13 deletions(-) diff --git a/init.lua b/init.lua index f8c90fa..85d5dc8 100644 --- a/init.lua +++ b/init.lua @@ -1,3 +1,7 @@ +-- Set Language {{{ +vim.api.nvim_exec2('language POSIX', {}) +-- }}} + -- Source configs with dependencies {{{ --for _, file in ipairs(vim.fn.readdir(vim.fn.stdpath('config')..'/lua-heavy', [[v:val =~ '\.lua$']])) do -- require(file:gsub('%.lua$', '')) @@ -50,30 +54,30 @@ vim.opt.statusline = ' #%n %f %h%w%m%r %= %y %l:%c %p%% ' -- }}} -- Toggle Terminal Script {{{ -local te_buf = nil -local te_win_id = nil +local term_buf = nil +local term_winid = nil local function openTerminal() - if vim.fn.bufexists(te_buf) ~= 1 then - vim.api.nvim_command("au TermOpen * setlocal nonumber norelativenumber signcolumn=no") - vim.api.nvim_command("sp | winc J | res 10 | te") - te_win_id = vim.fn.win_getid() - te_buf = vim.fn.bufnr('%') - elseif vim.fn.win_gotoid(te_win_id) ~= 1 then - vim.api.nvim_command("sb " .. te_buf .. "| winc J | res 10") - te_win_id = vim.fn.win_getid() + if vim.fn.bufexists(term_buf) ~= 1 then + vim.api.nvim_command("autocmd TermOpen * setlocal nonumber norelativenumber signcolumn=no") + vim.api.nvim_command("split | wincmd J | resize 10 | term") + term_winid = vim.fn.win_getid() + term_buf = vim.fn.bufnr('%') + elseif vim.fn.win_gotoid(term_winid) ~= 1 then + vim.api.nvim_command("sbuffer " .. term_buf .. "| wincmd J | resize 10") + term_winid = vim.fn.win_getid() end vim.api.nvim_command("startinsert") end local function hideTerminal() - if vim.fn.win_gotoid(te_win_id) == 1 then + if vim.fn.win_gotoid(term_winid) == 1 then vim.api.nvim_command("hide") end end function ToggleTerminal() - if vim.fn.win_gotoid(te_win_id) == 1 then + if vim.fn.win_gotoid(term_winid) == 1 then hideTerminal() else openTerminal() @@ -89,6 +93,11 @@ vim.api.nvim_create_autocmd({ 'TermOpen' }, { -- }}} -- Keymaps {{{ -vim.api.nvim_set_keymap('n', 'f', ':find ', { noremap = true, silent = true }) +vim.keymap.set('n', '', ':b#', { noremap = true, silent = true }) +vim.keymap.set('n', '', ':bprevious', { noremap = true, silent = true }) +vim.keymap.set('n', '', ':bnext', { noremap = true, silent = true }) +vim.keymap.set('n', 'f', ':find ', { noremap = true, silent = true }) vim.keymap.set('n', 't', ToggleTerminal) +vim.keymap.set('t', '', '') +vim.keymap.set('n', 'x', '"_x') -- }}}