diff --git a/home/modules/nvim/config/after/ftplugin/vimwiki.vim b/home/modules/nvim/config/after/ftplugin/vimwiki.vim
new file mode 100644
index 0000000..d6ec024
--- /dev/null
+++ b/home/modules/nvim/config/after/ftplugin/vimwiki.vim
@@ -0,0 +1,6 @@
+setlocal expandtab
+setlocal smartindent
+setlocal tabstop=2
+setlocal shiftwidth=2
+setlocal conceallevel=2
+setlocal nocompatible
diff --git a/home/modules/nvim/config/lazy-lock.json b/home/modules/nvim/config/lazy-lock.json
index f02dcfc..847ff4d 100644
--- a/home/modules/nvim/config/lazy-lock.json
+++ b/home/modules/nvim/config/lazy-lock.json
@@ -1,42 +1,43 @@
 {
   "LuaSnip": { "branch": "master", "commit": "c9b9a22904c97d0eb69ccb9bab76037838326817" },
   "barbar.nvim": { "branch": "master", "commit": "53b5a2f34b68875898f0531032fbf090e3952ad7" },
-  "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
+  "cmp-buffer": { "branch": "main", "commit": "b74fab3656eea9de20a9b8116afa3cfc4ec09657" },
   "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" },
-  "cmp-nvim-lsp": { "branch": "main", "commit": "99290b3ec1322070bcfb9e846450a46f6efa50f0" },
-  "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
+  "cmp-nvim-lsp": { "branch": "main", "commit": "a8912b88ce488f411177fc8aed358b04dc246d7b" },
+  "cmp-path": { "branch": "main", "commit": "c6635aae33a50d6010bf1aa756ac2398a2d54c32" },
   "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" },
-  "conform.nvim": { "branch": "master", "commit": "db8a4a9edb217067b1d7a2e0362c74bfe9cc944d" },
+  "conform.nvim": { "branch": "master", "commit": "b1a75324ddf96b7bb84963a297b1ed334db087c0" },
   "flash.nvim": { "branch": "main", "commit": "3c942666f115e2811e959eabbdd361a025db8b63" },
   "follow-md-links.nvim": { "branch": "main", "commit": "ce8735a15dc3e5fc5bb052ec51b849c03e57df53" },
-  "fzf-lua": { "branch": "main", "commit": "54005a680b8115a3596c845c6e448299601c09eb" },
-  "gitsigns.nvim": { "branch": "main", "commit": "7010000889bfb6c26065e0b0f7f1e6aa9163edd9" },
-  "go.nvim": { "branch": "master", "commit": "f058a8c622edf24d27b8ef82fabffdbbc1d55707" },
+  "fzf-lua": { "branch": "main", "commit": "6488ada2f376e47789391dc353b6d91a3f9de6f6" },
+  "gitsigns.nvim": { "branch": "main", "commit": "3c76f7fabac723aa682365ef782f88a83ccdb4ac" },
+  "go.nvim": { "branch": "master", "commit": "680de9a7c43c524f9baecbc24dd7ff3ae395b19b" },
   "guihua.lua": { "branch": "master", "commit": "d783191eaa75215beae0c80319fcce5e6b3beeda" },
   "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
-  "lualine.nvim": { "branch": "master", "commit": "9fef261b53fbe3a2ef01ee9667f6fde064b1ed10" },
+  "lualine.nvim": { "branch": "master", "commit": "1517caa8fff05e4b4999857319d3b0609a7f57fa" },
   "mason-lspconfig.nvim": { "branch": "main", "commit": "1a31f824b9cd5bc6f342fc29e9a53b60d74af245" },
-  "mason-tool-installer.nvim": { "branch": "main", "commit": "5639d58a3d11ff7c05c8e31e159bfedae55d7961" },
+  "mason-tool-installer.nvim": { "branch": "main", "commit": "98767d37f8e5255a5111fc1e3163232d4dc07bda" },
   "mason.nvim": { "branch": "main", "commit": "fc98833b6da5de5a9c5b1446ac541577059555be" },
   "mini.icons": { "branch": "main", "commit": "397ed3807e96b59709ef3292f0a3e253d5c1dc0a" },
-  "mini.pairs": { "branch": "main", "commit": "1a3e73649c0eaef2f6c48ce1e761c6f0a7c11918" },
-  "nvim-cmp": { "branch": "main", "commit": "1e1900b0769324a9675ef85b38f99cca29e203b3" },
+  "mini.pairs": { "branch": "main", "commit": "69864a2efb36c030877421634487fd90db1e4298" },
+  "nvim-cmp": { "branch": "main", "commit": "059e89495b3ec09395262f16b1ad441a38081d04" },
   "nvim-lspconfig": { "branch": "master", "commit": "0ef64599b8aa0187ee5f6d92cb39c951f348f041" },
-  "nvim-surround": { "branch": "main", "commit": "6c54643ef42016b744888b06d2381abd23f9b7ea" },
-  "nvim-treesitter": { "branch": "master", "commit": "f09a2215b8fed4c2e86f2dd1912e14166958c06a" },
+  "nvim-surround": { "branch": "main", "commit": "caf6f633d4d77a29b6e265b560c5a035d171a913" },
+  "nvim-treesitter": { "branch": "master", "commit": "30654ee72a69e7c76a54b66d748dae088429e863" },
   "nvim-web-devicons": { "branch": "master", "commit": "4c3a5848ee0b09ecdea73adcd2a689190aeb728c" },
-  "oil.nvim": { "branch": "master", "commit": "548587d68b55e632d8a69c92cefd981f360634fa" },
+  "oil.nvim": { "branch": "master", "commit": "302bbaceeafc690e6419e0c8296e804d60cb9446" },
   "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" },
-  "render-markdown.nvim": { "branch": "main", "commit": "92256e02db70c474f97fc461b6b6bc4aff7a499a" },
-  "rose-pine": { "branch": "main", "commit": "7d1b5c7dcd274921f0f58e90a8bf935f6a95fbf3" },
-  "schemastore.nvim": { "branch": "main", "commit": "9bac14f8e4951ed57d32a6944d8e3969d50e4d67" },
+  "render-markdown.nvim": { "branch": "main", "commit": "c283dec1ea94947499c36bb17443e15d6acf5cda" },
+  "rose-pine": { "branch": "main", "commit": "96ff3993a67356ee85d1cdab9be652cdc1c5d1ac" },
+  "schemastore.nvim": { "branch": "main", "commit": "e659e0c6ca06727ed898aaaeea3850f528898684" },
   "snacks.nvim": { "branch": "main", "commit": "bc0630e43be5699bb94dadc302c0d21615421d93" },
   "todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" },
   "vim-cool": { "branch": "master", "commit": "9ea940c0d537e55de0de4c0298c04b976960fb12" },
   "vim-dadbod": { "branch": "master", "commit": "9f0ca8bcef704659820a95c3bbd2c262583a66a1" },
   "vim-dadbod-completion": { "branch": "master", "commit": "a8dac0b3cf6132c80dc9b18bef36d4cf7a9e1fe6" },
   "vim-dadbod-ssh": { "branch": "master", "commit": "9bce775ee76c3dd6d7508dcd9eb276b36133d710" },
-  "vim-dadbod-ui": { "branch": "master", "commit": "f4d37b7312ae6489e5c04bee654ca521baac188a" },
+  "vim-dadbod-ui": { "branch": "master", "commit": "685e75b34ee0e12f92ec4507ea8bb7f1aaa936e5" },
   "vim-sleuth": { "branch": "master", "commit": "be69bff86754b1aa5adcbb527d7fcd1635a84080" },
+  "vimwiki": { "branch": "dev", "commit": "72792615e739d0eb54a9c8f7e0a46a6e2407c9e8" },
   "which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" }
 }
diff --git a/home/modules/nvim/config/lua/plugins/lualine.lua b/home/modules/nvim/config/lua/plugins/lualine.lua
index 8d564f3..a52da87 100644
--- a/home/modules/nvim/config/lua/plugins/lualine.lua
+++ b/home/modules/nvim/config/lua/plugins/lualine.lua
@@ -10,11 +10,11 @@ return {
     winbar = {},
     sections = {
       lualine_a = { "mode" },
-      lualine_b = { { "filename", path = 3, color = { gui = "italic" } } },
-      lualine_c = {},
-      lualine_x = { "diagnostics", "diff" },
-      lualine_y = { "branch" },
-      lualine_z = { "location", "encoding" },
+      lualine_b = { "branch" },
+      lualine_c = { "diff" },
+      lualine_x = { "diagnostics" },
+      lualine_y = { "location" },
+      lualine_z = { "filetype" },
     },
   },
 }
diff --git a/home/modules/nvim/config/lua/plugins/markdown.lua b/home/modules/nvim/config/lua/plugins/markdown.lua
index 5e0ee21..b4dc6ff 100644
--- a/home/modules/nvim/config/lua/plugins/markdown.lua
+++ b/home/modules/nvim/config/lua/plugins/markdown.lua
@@ -2,7 +2,7 @@ return {
   "MeanderingProgrammer/render-markdown.nvim",
   dependencies = { "nvim-treesitter/nvim-treesitter", "echasnovski/mini.icons", "jghauser/follow-md-links.nvim" },
   opts = {
-    ft = { "markdown" },
+    ft = { "markdown", "vimwiki" },
     completions = { lsp = { enabled = true } },
   },
 }
diff --git a/home/modules/nvim/config/lua/plugins/vimwiki.lua b/home/modules/nvim/config/lua/plugins/vimwiki.lua
new file mode 100644
index 0000000..9a216b0
--- /dev/null
+++ b/home/modules/nvim/config/lua/plugins/vimwiki.lua
@@ -0,0 +1,10 @@
+return {
+  "vimwiki/vimwiki",
+  init = function()
+    vim.g.vimwiki_list = { { path = "~/notes", syntax = "markdown", ext = "md" } }
+    vim.g.vimwiki_map_prefix = "<Leader>o"
+  end,
+  keys = {
+    { "<leader>d", "<cmd>90vsplit | VimwikiMakeDiaryNote<cr>", desc = "Open today's diary in split", mode = "n" },
+  },
+}
diff --git a/home/modules/nvim/config/lua/plugins/which-key.lua b/home/modules/nvim/config/lua/plugins/which-key.lua
index 882f4d7..fe2a68c 100644
--- a/home/modules/nvim/config/lua/plugins/which-key.lua
+++ b/home/modules/nvim/config/lua/plugins/which-key.lua
@@ -7,6 +7,7 @@ return {
     icons = { mappings = false },
   },
   keys = {
+    { "<leader>d", "<cmd>80vsplit | VimwikiMakeDiaryNote<cr>", desc = "Open today's diary in split", mode = "n" },
     { "<leader>.", "<cmd>FzfLua files<cr>", desc = "Find file in dir", mode = "n" },
     { "<leader><leader>", "<cmd>FzfLua git_files<cr>", desc = "Find git file", mode = "n" },
     { "<leader>B", "<cmd>FzfLua buffers<cr>", desc = "Opens buffers", mode = "n" },
@@ -161,6 +162,12 @@ return {
       desc = "Split windows vertically",
       mode = "n",
     },
+    {
+      "<leader>wx",
+      "<cmd>bd<cr>",
+      desc = "Delete buffer and window",
+      mode = "n",
+    },
     { "<leader>x", group = "config", mode = "n" },
     {
       "<leader>xn",
@@ -169,7 +176,5 @@ return {
       mode = "n",
     },
     { "<leader>xr", "<cmd>source $MYVIMRC<cr>", desc = "Reload config", mode = "n" },
-    { "<leader>do", "<cmd>DiffviewOpen<cr>", desc = "Open diff view", mode = "n" },
-    { "<leader>dh", "<cmd>DiffviewFileHistory<cr>", desc = "Open file history diff", mode = "n" },
   },
 }