From b68c7097a2bd39512d9acd2a6a6e174cf983bdf2 Mon Sep 17 00:00:00 2001 From: Kyren223 Date: Thu, 4 Jul 2024 19:46:02 +0300 Subject: [PATCH] Neovim: added edgy.nvim, along with neotree integration --- .config/nvim/lazy-lock.json | 5 ++- .config/nvim/lua/options.lua | 3 ++ .config/nvim/lua/plugins/edgy.lua | 46 ++++++++++++++++++++++++++++ .config/nvim/lua/plugins/neotree.lua | 3 ++ 4 files changed, 56 insertions(+), 1 deletion(-) create mode 100644 .config/nvim/lua/plugins/edgy.lua diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json index 6fe6b34..db2fca7 100644 --- a/.config/nvim/lazy-lock.json +++ b/.config/nvim/lazy-lock.json @@ -12,12 +12,12 @@ "darcula-solid.nvim": { "branch": "main", "commit": "d950b9ca20096313c435a93e57af7815766f3d3d" }, "darkstorm.nvim": { "branch": "master", "commit": "bab84a698e5a7bec92bd9d24acbd54554502e35e" }, "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" }, + "edgy.nvim": { "branch": "main", "commit": "a8bc1d24798c80a391f1a5d898a50c41a7f93883" }, "friendly-snippets": { "branch": "main", "commit": "682157939e57bd6a2c86277dfd4d6fbfce63dbac" }, "ftFT.nvim": { "branch": "master", "commit": "f3e43c9584e14b27f04c27a95a9d9f0e58dfec02" }, "github-nvim-theme": { "branch": "main", "commit": "4f44a5c930372c85483d02700f332d34417e50b2" }, "gitsigns.nvim": { "branch": "main", "commit": "82bc6225e958411a6846b27ac7c21bf8af1f72e4" }, "harpoon": { "branch": "harpoon2", "commit": "0378a6c428a0bed6a2781d459d7943843f374bce" }, - "inc-rename.nvim": { "branch": "main", "commit": "535b508c0cb14d00c1836ad901b3c531cb1152bb" }, "indent-blankline.nvim": { "branch": "master", "commit": "4288ce8128a52650e401dda42fd7651a6038f262" }, "kanagawa.nvim": { "branch": "master", "commit": "b4110528b4a12c295efd3ae222882469b2b44d4a" }, "lazy.nvim": { "branch": "main", "commit": "c501b429cf995c645454539b924aaefae45bb9eb" }, @@ -40,6 +40,7 @@ "nvim-autopairs": { "branch": "master", "commit": "c15de7e7981f1111642e7e53799e1211d4606cb9" }, "nvim-cmp": { "branch": "main", "commit": "a110e12d0b58eefcf5b771f533fc2cf3050680ac" }, "nvim-lspconfig": { "branch": "master", "commit": "bd7c76375a511994c9ca8d69441f134dc10ae3bd" }, + "nvim-neoclip.lua": { "branch": "main", "commit": "709c97fabec9da7d04f7d2f5e207423af8c02871" }, "nvim-surround": { "branch": "main", "commit": "ec2dc7671067e0086cdf29c2f5df2dd909d5f71f" }, "nvim-treesitter": { "branch": "master", "commit": "2e9c346aefda680bd14ebf40a50c2897fd637bc2" }, "nvim-web-devicons": { "branch": "master", "commit": "c0cfc1738361b5da1cd0a962dd6f774cc444f856" }, @@ -49,6 +50,7 @@ "okai": { "branch": "main", "commit": "b028c2916c39b1c4ad53756d262f9d0576edac87" }, "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" }, "spaceduck": { "branch": "main", "commit": "350491f19343b24fa85809242089caa02d4dadce" }, + "sqlite.lua": { "branch": "master", "commit": "d0ffd703b56d090d213b497ed4eb840495f14a11" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "9ef21b2e6bb6ebeaf349a0781745549bbb870d27" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, "telescope.nvim": { "branch": "master", "commit": "d90956833d7c27e73c621a61f20b29fdb7122709" }, @@ -56,6 +58,7 @@ "tokyonight.nvim": { "branch": "main", "commit": "81c867c5f638597a82c82094dcb90ed42444dabc" }, "trouble.nvim": { "branch": "main", "commit": "0fe430e953a6c47433ef923555dfe9a42351113a" }, "vim-fugitive": { "branch": "master", "commit": "d0c1a437536778bcc8174b7cb2ffdf98f611e6fe" }, + "vim-illuminate": { "branch": "master", "commit": "5eeb7951fc630682c322e88a9bbdae5c224ff0aa" }, "vim-repeat": { "branch": "master", "commit": "24afe922e6a05891756ecf331f39a1f6743d3d5a" }, "vim-tmux-navigator": { "branch": "master", "commit": "5b3c701686fb4e6629c100ed32e827edf8dad01e" }, "vim-wakatime": { "branch": "master", "commit": "3cb40867cb5a3120f9bef76eff88edc7f1dc1a23" }, diff --git a/.config/nvim/lua/options.lua b/.config/nvim/lua/options.lua index 44b6d93..64caa45 100644 --- a/.config/nvim/lua/options.lua +++ b/.config/nvim/lua/options.lua @@ -33,6 +33,9 @@ vim.opt.wrap = false vim.opt.scrolloff = 8 vim.opt.undofile = true 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 diff --git a/.config/nvim/lua/plugins/edgy.lua b/.config/nvim/lua/plugins/edgy.lua new file mode 100644 index 0000000..2b3551b --- /dev/null +++ b/.config/nvim/lua/plugins/edgy.lua @@ -0,0 +1,46 @@ +return { + 'folke/edgy.nvim', + event = 'VeryLazy', + opts = { + bottom = { + 'Trouble', + { ft = 'qf', title = 'QuickFix' }, + { + ft = 'help', + size = { height = 20 }, + filter = function(buf) -- only show help buffers + return vim.bo[buf].buftype == 'help' + end, + }, + { ft = 'spectre_panel', size = { height = 0.4 } }, + }, + left = { + { + title = 'Neo-Tree', + ft = 'neo-tree', + filter = function(buf) + return vim.b[buf].neo_tree_source == 'filesystem' + end, + size = { height = 0.5 }, + }, + { + title = 'Neo-Tree Git', + ft = 'neo-tree', + filter = function(buf) + return vim.b[buf].neo_tree_source == 'git_status' + end, + 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/neotree.lua b/.config/nvim/lua/plugins/neotree.lua index ab4db82..b8a4ee9 100644 --- a/.config/nvim/lua/plugins/neotree.lua +++ b/.config/nvim/lua/plugins/neotree.lua @@ -6,6 +6,9 @@ return { 'nvim-tree/nvim-web-devicons', 'MunifTanjim/nui.nvim', }, + opts = { + open_files_do_not_replace_types = { 'terminal', 'Trouble', 'qf', 'edgy' }, + }, config = function() vim.keymap.set('n', 'nt', ':Neotree toggle reveal left', { desc = '[N]eotree [T]oggle' }) end,