From 2c67cae7df1cbfc8c4557fcbf4dad8bb2a412c28 Mon Sep 17 00:00:00 2001 From: Kyren223 Date: Thu, 4 Jul 2024 23:55:29 +0300 Subject: [PATCH] Neovim: added overseer (not configured yet) and some other changes --- .config/nvim/lazy-lock.json | 1 + .config/nvim/lua/keymaps.lua | 1 + .config/nvim/lua/options.lua | 1 - .config/nvim/lua/plugins/edgy.lua | 9 --------- .config/nvim/lua/plugins/overseer.lua | 10 ++++++++++ .../overseer/template/user/c_build_make.lua | 17 +++++++++++++++++ 6 files changed, 29 insertions(+), 10 deletions(-) create mode 100644 .config/nvim/lua/plugins/overseer.lua create mode 100644 .config/nvim/lua/plugins/overseer/template/user/c_build_make.lua diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json index db2fca7..a1176e0 100644 --- a/.config/nvim/lazy-lock.json +++ b/.config/nvim/lazy-lock.json @@ -48,6 +48,7 @@ "octo.nvim": { "branch": "master", "commit": "7731ca4e31b32c176a383642ffcd7d593ac17774" }, "oil.nvim": { "branch": "master", "commit": "65c53dbe4f2140236590a7568a5f22a77d16be39" }, "okai": { "branch": "main", "commit": "b028c2916c39b1c4ad53756d262f9d0576edac87" }, + "overseer.nvim": { "branch": "master", "commit": "433ae548434d83ab3c6afe6afc549832f7dd56f1" }, "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" }, "spaceduck": { "branch": "main", "commit": "350491f19343b24fa85809242089caa02d4dadce" }, "sqlite.lua": { "branch": "master", "commit": "d0ffd703b56d090d213b497ed4eb840495f14a11" }, diff --git a/.config/nvim/lua/keymaps.lua b/.config/nvim/lua/keymaps.lua index 2b2dba8..3b0f4aa 100644 --- a/.config/nvim/lua/keymaps.lua +++ b/.config/nvim/lua/keymaps.lua @@ -5,6 +5,7 @@ vim.keymap.set('n', 'z', function() vim.cmd('Neotree close') vim.cmd('Trouble todo close') end, { desc = '[Z]en Mode' }) +vim.keymap.set({ 'i', 'c' }, '', '+') -- Undo/Redo vim.keymap.set('n', 'U', ':redo') diff --git a/.config/nvim/lua/options.lua b/.config/nvim/lua/options.lua index 64caa45..94eee95 100644 --- a/.config/nvim/lua/options.lua +++ b/.config/nvim/lua/options.lua @@ -36,7 +36,6 @@ vim.opt.termguicolors = true vim.opt.laststatus = 3 -- views can only be fully collapsed with the global statusline vim.opt.splitkeep = "screen" -- for edgy.nvim - -- Disable warnings for missing language providers vim.g.loaded_node_provider = 0 vim.g.loaded_perl_provider = 0 diff --git a/.config/nvim/lua/plugins/edgy.lua b/.config/nvim/lua/plugins/edgy.lua index 2b3551b..7f01245 100644 --- a/.config/nvim/lua/plugins/edgy.lua +++ b/.config/nvim/lua/plugins/edgy.lua @@ -32,15 +32,6 @@ return { pinned = true, open = 'Neotree position=right git_status', }, - { - title = 'Neo-Tree Buffers', - ft = 'neo-tree', - filter = function(buf) - return vim.b[buf].neo_tree_source == 'buffers' - end, - pinned = true, - open = 'Neotree position=top buffers', - }, }, }, } diff --git a/.config/nvim/lua/plugins/overseer.lua b/.config/nvim/lua/plugins/overseer.lua new file mode 100644 index 0000000..6362f2a --- /dev/null +++ b/.config/nvim/lua/plugins/overseer.lua @@ -0,0 +1,10 @@ +return { + 'stevearc/overseer.nvim', + opts = {}, + config = function() + require('overseer').setup({ + templates = { 'builtin', 'user.c_build_make' }, + }) + vim.keymap.set('n', 'r', ':OverseerRun', { desc = '[R]un Task' }) + end, +} diff --git a/.config/nvim/lua/plugins/overseer/template/user/c_build_make.lua b/.config/nvim/lua/plugins/overseer/template/user/c_build_make.lua new file mode 100644 index 0000000..58d7e3c --- /dev/null +++ b/.config/nvim/lua/plugins/overseer/template/user/c_build_make.lua @@ -0,0 +1,17 @@ +return { + name = 'C build (make)', + builder = function() + -- Full path to current file (see :help expand()) + local file = vim.fn.expand('%:p') + file = file:sub(1, -3) + return { + name = 'Make C file', + cmd = { 'make' }, + args = { file }, + components = { { 'on_output_quickfix', open = true }, 'default' }, + } + end, + condition = { + filetype = { 'c' }, + }, +}