Merge branch 'main' of github.com:elitherl/vim-config into main

This commit is contained in:
Evie Litherland-Smith 2022-11-30 14:51:34 +00:00
commit 4b3277779d
3 changed files with 21 additions and 2 deletions

View file

@ -1,4 +1,11 @@
require('aerial').setup { require('aerial').setup {
backends = { "treesitter", "lsp", "markdown", "man" },
layout = {
default_direction = "right", -- "float",
placement = "edge",
},
attach_mode = "global",
lazy_load = false,
on_attach = function(bufnr) on_attach = function(bufnr)
-- Toggle the aerial window with <leader>a -- Toggle the aerial window with <leader>a
vim.api.nvim_buf_set_keymap(bufnr, 'n', '<leader>k', '<cmd>AerialToggle!<CR>', {}) vim.api.nvim_buf_set_keymap(bufnr, 'n', '<leader>k', '<cmd>AerialToggle!<CR>', {})
@ -9,4 +16,5 @@ require('aerial').setup {
vim.api.nvim_buf_set_keymap(bufnr, 'n', '[[', '<cmd>AerialPrevUp<CR>', {}) vim.api.nvim_buf_set_keymap(bufnr, 'n', '[[', '<cmd>AerialPrevUp<CR>', {})
vim.api.nvim_buf_set_keymap(bufnr, 'n', ']]', '<cmd>AerialNextUp<CR>', {}) vim.api.nvim_buf_set_keymap(bufnr, 'n', ']]', '<cmd>AerialNextUp<CR>', {})
end, end,
open_automatic = true,
} }

View file

@ -1,6 +1,17 @@
vim.g.loaded = 1 vim.g.loaded_netrw = 1
vim.g.loaded_netrwPlugin = 1 vim.g.loaded_netrwPlugin = 1
require('nvim-tree').setup { require('nvim-tree').setup {
open_on_setup=true,
open_on_setup_file=true,
hijack_cursor=true,
sync_root_with_cwd=true,
update_focused_file = {
enable = true,
},
diagnostics = {
enable = true,
show_on_dirs = true,
},
filters = { custom = { "^.git$" } }, filters = { custom = { "^.git$" } },
renderer = { renderer = {
group_empty = true, group_empty = true,

View file

@ -3,6 +3,6 @@ require 'nvim-treesitter.configs'.setup {
highlight = { highlight = {
enable = true, enable = true,
additional_vim_regex_highlighting = false, additional_vim_regex_highlighting = false,
disable = { 'help' }, disable = { 'help', 'fortran' },
}, },
} }