Add Oil and only load vimwiki when necessary

This commit is contained in:
Thomas Avé 2023-08-27 23:34:20 +02:00
parent 0bb78792e9
commit 7f84db5ff1
3 changed files with 30 additions and 9 deletions

View File

@ -19,10 +19,14 @@ vim.keymap.set("n", "gn", ":n<cr>", { noremap = true, silent = true })
vim.keymap.set("n", "<leader>d", require("trouble").open, { noremap = true, silent = true })
vim.keymap.set("n", "gi", ":ClangdSwitchSourceHeader<cr>", { noremap = true, silent = true })
vim.keymap.set("n", "<leader>t", ":NvimTreeFindFileToggle<cr>", { noremap = true, silent = true })
vim.keymap.set("n", "-", require("oil").open, { desc = "Open parent directory" })
vim.keymap.set("n", "<leader>-", require("oil").open, { desc = "Open parent directory" })
vim.keymap.set("n", "<leader>g", require("neogit").open, { noremap = true, silent = true })
vim.keymap.set("x", "<leader>a", "<C-A>", { noremap = true, silent = true })
vim.keymap.set("x", "<leader>x", "<C-X>", { noremap = true, silent = true })
vim.keymap.set("x", "<leader>ga", "g<C-A>", { noremap = true, silent = true })
vim.keymap.set("x", "<leader>gx", "g<C-X>", { noremap = true, silent = true })
vim.keymap.set("x", "<leader>ga", "g<C-A>", { noremap = true, silent = true })
vim.keymap.set("n", "<leader>s", ":sp<cr>", { noremap = true, silent = true })
vim.keymap.set("n", "<leader>v", ":vs<cr>", { noremap = true, silent = true })
vim.keymap.set("v", "J", ":m '>+1<CR>gv=gv")
vim.keymap.set("v", "K", ":m '<-2<CR>gv=gv")

View File

@ -18,13 +18,35 @@ require('lazy').setup({
'debugloop/telescope-undo.nvim',
'intrntbrn/awesomewm-vim-tmux-navigator',
'mhartington/formatter.nvim',
'vimwiki/vimwiki',
{ 'windwp/nvim-autopairs', event = "InsertEnter", opts = {}},
{'vimwiki/vimwiki', init = function ()
vim.g.vimwiki_list = {{path = '~/Workspace/D&D/Lumentis Campaign Setting/', syntax = 'markdown', ext = '.md'}}
vim.g.vimwiki_key_mappings = { table_mappings = 0 }
vim.g.vimwiki_markdown_link_ext = 1
vim.g.vimwiki_global_ext = 0
end, ft='markdown' },
{'stevearc/oil.nvim', opts = {
keymaps = {
["g?"] = "actions.show_help",
["<CR>"] = "actions.select",
["<leader>v"] = "actions.select_vsplit",
["<leader>s"] = "actions.select_split",
["<leader>p"] = "actions.preview",
["<escape>"] = "actions.close",
["<leader>r"] = "actions.refresh",
["-"] = "actions.parent",
["_"] = "actions.open_cwd",
["`"] = "actions.cd",
["~"] = "actions.tcd",
["g."] = "actions.toggle_hidden",
},
-- Set to false to disable all of the above keymaps
use_default_keymaps = false,
}, dependencies = { "nvim-tree/nvim-web-devicons" }, lazy = true},
{'windwp/nvim-autopairs', event = "InsertEnter", opts = {}},
{"folke/flash.nvim", event = "VeryLazy", opts = {highlight = {backdrop=false}, modes = {char = {highlight = {backdrop = false}}}, prompt = {enabled = false}}, keys = {{"s", mode = {"n","x","o"}, function() require("flash").jump() end}}},
{'NeogitOrg/neogit', dependencies = {"nvim-lua/plenary.nvim", "nvim-telescope/telescope.nvim", "sindrets/diffview.nvim"}, config = true, lazy = true},
{'akinsho/bufferline.nvim', version = "*", dependencies = 'nvim-tree/nvim-web-devicons'},
{'cappyzawa/trim.nvim', config = function () require("trim").setup({ ft_blocklist= {"markdown", "vimwiki"}, patterns = { [[%s/\s\+$//e]], [[%s/\($\n\s*\)\+\%$//]], [[%s/\%^\n\+//]], }, }) end},
{'folke/neodev.nvim', config = function () require('neodev').setup({}) end},
{'folke/trouble.nvim', dependencies = {"nvim-tree/nvim-web-devicons"}, config = function () require('trouble').setup() end, lazy = true},
{'hrsh7th/nvim-cmp', dependencies = {'hrsh7th/cmp-buffer', 'hrsh7th/cmp-cmdline', 'hrsh7th/cmp-nvim-lsp', 'hrsh7th/cmp-path', 'dcampos/nvim-snippy', 'honza/vim-snippets','dcampos/cmp-snippy' }},
{'lervag/vimtex', ft='latex'},

View File

@ -37,10 +37,5 @@ vim.wo.relativenumber = true
vim.g.rooter_patterns = {".git", "Makefile", "CMakeLists.txt", "build/"}
vim.g.rooter_silent_chdir = 1
-- VimWiki
vim.g.vimwiki_list = {{path = '~/Workspace/D&D/Lumentis Campaign Setting/', syntax = 'markdown', ext = '.md'}}
vim.g.vimwiki_key_mappings = { table_mappings = 0 }
vim.g.vimwiki_markdown_link_ext = 1
-- Vimtex
vim.g.tex_flavor = 'latex'