diff --git a/home/user/.config/nvim/lua/core/mappings/run-scripts.lua b/home/user/.config/nvim/lua/core/mappings/run-scripts.lua index 693e208..95f2435 100644 --- a/home/user/.config/nvim/lua/core/mappings/run-scripts.lua +++ b/home/user/.config/nvim/lua/core/mappings/run-scripts.lua @@ -2,12 +2,11 @@ local function map_filetype(filetype, key, cmd) local function format_string() - local run_script_string = [[:e %% | :terminal %s :set nocursorline number norelativenumber G]] + local run_script_string = [[:terminal %s :set nocursorline number norelativenumber G]] local cmd_string = string.format(run_script_string, cmd) - local map = vim.keymap.set local opts = { noremap = true, silent = true } - map('n', key, cmd_string, opts) + vim.keymap.set('n', key, cmd_string, opts) end diff --git a/home/user/.config/nvim/lua/core/options.lua b/home/user/.config/nvim/lua/core/options.lua index f0538f8..b5da73b 100644 --- a/home/user/.config/nvim/lua/core/options.lua +++ b/home/user/.config/nvim/lua/core/options.lua @@ -144,20 +144,29 @@ vim.cmd.highlight({ "DiagnosticHint", "guifg=Grey" }) opt.langmap = 'ФИСВУАПРШОЛДЬТЩЗЙКЫЕГМЦЧНЯ;ABCDEFGHIJKLMNOPQRSTUVWXYZ,фисвуапршолдьтщзйкыегмцчня;abcdefghijklmnopqrstuvwxyz' +vim.o.viewdir = vim.fn.stdpath('cache')..'/view' +vim.fn.mkdir(vim.o.viewdir, 'p') opt.viewoptions = "folds,cursor" -vim.api.nvim_create_autocmd({"BufWinLeave", "BufLeave"}, { +vim.api.nvim_create_autocmd("BufWinLeave", { pattern = {"?*"}, - callback = function() - vim.cmd.mkview(1) + callback = function(args) + local bufname = vim.api.nvim_buf_get_name(args.buf) + if not bufname:match("^term://") then + vim.cmd.mkview(1) + end + end }) vim.api.nvim_create_autocmd("BufWinEnter", { pattern = {"?*"}, - callback = function() - vim.cmd("silent! loadview 1") + callback = function(args) + local bufname = vim.api.nvim_buf_get_name(args.buf) + if not bufname:match("^term://") then + vim.cmd([[silent! loadview 1]]) + end end, }) -vim.opt.foldcolumn = "1" \ No newline at end of file +vim.opt.foldcolumn = "1"