summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzachir <zachir@librem.one>2025-08-27 21:22:26 -0500
committerzachir <zachir@librem.one>2025-08-27 21:22:26 -0500
commite628008f52c6d813b03a003efb8f81c768db4ec4 (patch)
treefa294a3f0fabab74a62d5a39b6f69f56970e1c24
parentb791cc7c3437316984e6365395fcc6c8a30a53e0 (diff)
parent6d41b928fad9c472281d6ea0d058e3eca58a1e15 (diff)
Merge branch 'master' into cla
-rw-r--r--nvim/init.lua1
-rw-r--r--nvim/lua/keymaps.lua8
-rw-r--r--nvim/lua/plugins.lua9
-rw-r--r--nvim/lua/vimwiki.lua10
4 files changed, 24 insertions, 4 deletions
diff --git a/nvim/init.lua b/nvim/init.lua
index 4b295d5..06b973a 100644
--- a/nvim/init.lua
+++ b/nvim/init.lua
@@ -4,3 +4,4 @@ require('lsp')
require('plugins')
require('colorscheme')
require('term')
+require('vimwiki')
diff --git a/nvim/lua/keymaps.lua b/nvim/lua/keymaps.lua
index 4f4a489..ff04b7d 100644
--- a/nvim/lua/keymaps.lua
+++ b/nvim/lua/keymaps.lua
@@ -23,10 +23,10 @@ vim.keymap.set('n', '<C-Up>', ':resize -2<CR>', opts)
vim.keymap.set('n', '<C-Down>', ':resize +2<CR>', opts)
vim.keymap.set('n', '<C-Left>', ':vertical resize -2<CR>', opts)
vim.keymap.set('n', '<C-Right>', ':vertical resize +2<CR>', opts)
-vim.keymap.set('n', '<leader>wh :vertical resize', '-1<CR>')
-vim.keymap.set('n', '<leader>wj :resize', '-1<CR>')
-vim.keymap.set('n', '<leader>wk :resize', '+1<CR>')
-vim.keymap.set('n', '<leader>wl :vertical resize', '+1<CR>')
+vim.keymap.set('n', '<leader>wh', ':vertical resize -1<CR>')
+vim.keymap.set('n', '<leader>wj', ':resize -1<CR>')
+vim.keymap.set('n', '<leader>wk', ':resize +1<CR>')
+vim.keymap.set('n', '<leader>wl', ':vertical resize +1<CR>')
-- NerdTREE
vim.keymap.set('n', '<leader>tt', ':NERDTreeToggle<CR>')
diff --git a/nvim/lua/plugins.lua b/nvim/lua/plugins.lua
index f90b09c..3684b89 100644
--- a/nvim/lua/plugins.lua
+++ b/nvim/lua/plugins.lua
@@ -14,6 +14,15 @@ vim.opt.rtp:prepend(lazypath)
require("lazy").setup({
-- LSP manager
{ "mason-org/mason.nvim", opts = {} },
+ {"vimwiki/vimwiki",
+ init = function()
+ vim.g.vimwiki_list = {
+ {
+ path = '~/.local/share/vimwiki'
+ },
+ }
+ end,
+ },
{
"mason-org/mason-lspconfig.nvim",
dependencies = {
diff --git a/nvim/lua/vimwiki.lua b/nvim/lua/vimwiki.lua
new file mode 100644
index 0000000..43b8aa6
--- /dev/null
+++ b/nvim/lua/vimwiki.lua
@@ -0,0 +1,10 @@
+-- Required for Vimwiki to work
+vim.opt.compatible = false
+
+-- Vimwiki Keybindings
+local opts = {
+ noremap = false,
+ silent = true,
+}
+
+vim.keymap.set('n', '<leader>wx', '<Plug>VimwikiIndex', opts)