diff --git a/after/plugin/autotag.lua b/after/plugin/autotag.lua
new file mode 100644
index 0000000..4a1bb61
--- /dev/null
+++ b/after/plugin/autotag.lua
@@ -0,0 +1,16 @@
+require('nvim-ts-autotag').setup({
+  opts = {
+    -- Defaults
+    enable_close = true,         -- Auto close tags
+    enable_rename = true,        -- Auto rename pairs of tags
+    enable_close_on_slash = true -- Auto close on trailing </
+  },
+  -- -- Also override individual filetype configs, these take priority.
+  -- -- Empty by default, useful if one of the "opts" global settings
+  -- -- doesn't work well in a specific filetype
+  -- per_filetype = {
+  --   ["html"] = {
+  --     enable_close = false
+  --   }
+  -- }
+})
diff --git a/after/plugin/firenvim.lua b/after/plugin/firenvim.lua
new file mode 100644
index 0000000..7574023
--- /dev/null
+++ b/after/plugin/firenvim.lua
@@ -0,0 +1,9 @@
+vim.api.nvim_create_autocmd({ 'BufEnter' }, {
+  pattern = "github.com_*.txt",
+  command = "set filetype=markdown"
+})
+
+vim.api.nvim_create_autocmd({ 'BufEnter' }, {
+  pattern = "*lab-tree*.txt",
+  command = "set filetype=python"
+})
diff --git a/after/plugin/lsp.lua b/after/plugin/lsp.lua
index 5236f5c..b80ec3f 100644
--- a/after/plugin/lsp.lua
+++ b/after/plugin/lsp.lua
@@ -66,6 +66,20 @@ vim.filetype.add({ extension = { templ = "templ" } })
 
 lsp_zero.setup_servers({ "gopls", "lua_ls", "nil_ls", "pylsp", "clangd" })
 
+lspconfig.html.setup {
+  cmd = { "vscode-html-language-server", "--stdio" },
+  filetypes = { "html" },
+  init_options = {
+    configurationSection = { "html", "css", "javascript" },
+    embeddedLanguages = {
+      css = true,
+      javascript = true
+    },
+    provideFormatter = true
+  },
+  single_file_support = true
+}
+
 lspconfig.lua_ls.setup({
   settings = {
     Lua = {
diff --git a/after/plugin/neorg.lua b/after/plugin/neorg.lua
deleted file mode 100644
index 82db06d..0000000
--- a/after/plugin/neorg.lua
+++ /dev/null
@@ -1,26 +0,0 @@
-require("neorg").setup({
-  load = {
-    ["core.defaults"] = {},
-    ["core.concealer"] = {},
-    ["core.dirman"] = {
-      config = {
-        workspaces = {
-          notes = "~/documents/notes"
-        },
-        default_workspace = "notes",
-      }
-    },
-    ["core.journal"] = {
-      journal_folder = "~/documents/notes/journal"
-    },
-  }
-})
-
-vim.api.nvim_create_autocmd("Filetype", {
-  pattern = "norg",
-  callback = function()
-  end,
-})
-
-vim.keymap.set("n", "<leader>gi", "<cmd> Neorg index<CR>")
-vim.keymap.set("n", "<leader>gr", "<cmd> Neorg return<CR>")
diff --git a/after/plugin/wiki.lua b/after/plugin/wiki.lua
new file mode 100644
index 0000000..b44fc5d
--- /dev/null
+++ b/after/plugin/wiki.lua
@@ -0,0 +1,14 @@
+vim.g.vimwiki_list = {
+  {
+    path = "~/wiki",
+    auto_tags = 1,
+    auto_diary_index = 1,
+    syntax = 'markdown',
+    ext = '.md',
+    diary_rel_path = 'diary'
+  },
+}
+vim.g.vimwiki_markdown_link_ext = 1
+vim.g.vimwiki_stripsym = ' '
+vim.g.vimwiki_global_ext = 0
+vim.g.vimwiki_auto_header = 1
diff --git a/lazy-lock.json b/lazy-lock.json
index c1d7778..90bf185 100644
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -1,42 +1,43 @@
 {
   "Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" },
-  "LuaSnip": { "branch": "master", "commit": "e808bee352d1a6fcf902ca1a71cee76e60e24071" },
+  "LuaSnip": { "branch": "master", "commit": "8d7aa7a7b7c0875e4878d1d2590924bc1c229305" },
   "auto-pairs": { "branch": "master", "commit": "39f06b873a8449af8ff6a3eee716d3da14d63a76" },
   "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" },
-  "conform.nvim": { "branch": "master", "commit": "f5bd8419f8a29451e20bdb1061a54fe13d5c8de3" },
+  "conform.nvim": { "branch": "master", "commit": "4dd429fe3f47077f4e50cdaf03f7877ce9b213e0" },
   "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" },
-  "gitsigns.nvim": { "branch": "main", "commit": "863903631e676b33e8be2acb17512fdc1b80b4fb" },
-  "go.nvim": { "branch": "master", "commit": "fb612d13c34d3d1d2caa4d5785733abe70dc22f0" },
+  "firenvim": { "branch": "master", "commit": "64f9389b88c8b0c7667d45c171a5f25c42d852fb" },
+  "gitsigns.nvim": { "branch": "main", "commit": "7c27a30450130cd59c4994a6755e3c5d74d83e76" },
+  "go.nvim": { "branch": "master", "commit": "2153f9ee6178dfd625b1a874eab6399fd0a2d984" },
   "gruvbox.nvim": { "branch": "main", "commit": "49d9c0b150ba70efcd831ec7b3cb8ee740067045" },
-  "guihua.lua": { "branch": "master", "commit": "225db770e36aae6a1e9e3a65578095c8eb4038d3" },
+  "guihua.lua": { "branch": "master", "commit": "d783191eaa75215beae0c80319fcce5e6b3beeda" },
   "harpoon": { "branch": "harpoon2", "commit": "0378a6c428a0bed6a2781d459d7943843f374bce" },
-  "indent-blankline.nvim": { "branch": "master", "commit": "e7a4442e055ec953311e77791546238d1eaae507" },
-  "lazy.nvim": { "branch": "main", "commit": "1159bdccd8910a0fd0914b24d6c3d186689023d9" },
+  "indent-blankline.nvim": { "branch": "master", "commit": "04e44b09ee3ff189c69ab082edac1ef7ae2e256c" },
+  "lazy.nvim": { "branch": "main", "commit": "cf8ecc2c5e4332760431a33534240b0cbc6680ab" },
   "lsp-zero.nvim": { "branch": "v3.x", "commit": "56db3d5ce5476b183783160e6045f7337ba12b83" },
   "lsp_signature.nvim": { "branch": "master", "commit": "fc38521ea4d9ec8dbd4c2819ba8126cea743943b" },
-  "lua-utils.nvim": { "branch": "main", "commit": "e565749421f4bbb5d2e85e37c3cef9d56553d8bd" },
-  "lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "25c11854aa25558ee6c03432edfa0df0217324be" },
+  "lualine.nvim": { "branch": "master", "commit": "640260d7c2d98779cab89b1e7088ab14ea354a02" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "4d0e5b49363cac187326998b96aa6a2884e0e89b" },
   "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },
   "neo-tree.nvim": { "branch": "v3.x", "commit": "a77af2e764c5ed4038d27d1c463fa49cd4794e07" },
-  "neogit": { "branch": "master", "commit": "3e44062d164d11848a1663831e4366b86ef6d889" },
-  "neorg": { "branch": "main", "commit": "81ee90cb2d72ac43bfadb7dd276646f34c8f85be" },
+  "neogit": { "branch": "master", "commit": "001f43f50d9589d837cec59004fd92486ab06870" },
   "nui.nvim": { "branch": "main", "commit": "b58e2bfda5cea347c9d58b7f11cf3012c7b3953f" },
-  "nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" },
+  "nvim-cmp": { "branch": "main", "commit": "f17d9b4394027ff4442b298398dfcaab97e40c4f" },
   "nvim-dap": { "branch": "master", "commit": "7ff6936010b7222fea2caea0f67ed77f1b7c60dd" },
-  "nvim-dap-python": { "branch": "master", "commit": "03fe9592409236b9121c03b66a682dfca15a5cac" },
+  "nvim-dap-python": { "branch": "master", "commit": "3e3dd98d4d83715c9e0e429b4a5da7bd706e6ceb" },
   "nvim-dap-ui": { "branch": "master", "commit": "ffa89839f97bad360e78428d5c740fdad9a0ff02" },
-  "nvim-lspconfig": { "branch": "master", "commit": "d6b0c3b38cdb45dcbd658efc2bb721568f68d93f" },
+  "nvim-lspconfig": { "branch": "master", "commit": "54617a18f4cf46f0c2f6d024fa6feb7515fe036d" },
   "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" },
+  "nvim-notify": { "branch": "master", "commit": "fbef5d32be8466dd76544a257d3f3dce20082a07" },
   "nvim-surround": { "branch": "main", "commit": "ec2dc7671067e0086cdf29c2f5df2dd909d5f71f" },
-  "nvim-treesitter": { "branch": "master", "commit": "68b2bdd99d889e9705f7e90ae64d990f3ff03cf3" },
+  "nvim-treesitter": { "branch": "master", "commit": "38c12cb9ac8e1c547a8472c87df9e9d7c8b1af0d" },
+  "nvim-ts-autotag": { "branch": "main", "commit": "e239a560f338be31337e7abc3ee42515daf23f5e" },
   "nvim-web-devicons": { "branch": "master", "commit": "19d257cf889f79f4022163c3fbb5e08639077bd8" },
-  "pathlib.nvim": { "branch": "main", "commit": "57e5598af6fe253761c1b48e0b59b7cd6699e2c1" },
   "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" },
-  "telescope.nvim": { "branch": "master", "commit": "df534c3042572fb958586facd02841e10186707c" },
+  "telescope.nvim": { "branch": "master", "commit": "85922dde3767e01d42a08e750a773effbffaea3e" },
   "undotree": { "branch": "master", "commit": "78b5241191852ffa9bb5da5ff2ee033160798c3b" },
   "vim-fugitive": { "branch": "master", "commit": "d4877e54cef67f5af4f950935b1ade19ed6b7370" },
   "vim-tmux-navigator": { "branch": "master", "commit": "a9b52e7d36114d40350099f254b5f299a35df978" },
+  "vimwiki": { "branch": "dev", "commit": "72792615e739d0eb54a9c8f7e0a46a6e2407c9e8" },
   "which-key.nvim": { "branch": "main", "commit": "8badb359f7ab8711e2575ef75dfe6fbbd87e4821" },
   "window-picker": { "branch": "main", "commit": "41cfaa428577c53552200a404ae9b3a0b5719706" },
   "xkbswitch.nvim": { "branch": "master", "commit": "1e14fe0ff9e11ff1671c9db30a8702d9d21f3816" }
diff --git a/lua/qvim/plugins.lua b/lua/qvim/plugins.lua
index 475725e..d55a411 100644
--- a/lua/qvim/plugins.lua
+++ b/lua/qvim/plugins.lua
@@ -80,6 +80,16 @@ return {
     opts = {},
   },
 
+  {
+    "rcarriga/nvim-notify",
+    config = function()
+      require("notify").setup({
+        background_colour = "#000000",
+      })
+      vim.notify = require('notify')
+    end
+  },
+
   {
     "folke/which-key.nvim",
     config = function()
@@ -136,9 +146,39 @@ return {
 
   -- note-taking
   {
-    "nvim-neorg/neorg",
-    lazy = false,  -- Disable lazy loading as some `lazy.nvim` distributions set `lazy = true` by default
-    version = "*", -- Pin Neorg to the latest stable release
-    -- config = true,
+    "vimwiki/vimwiki",
+    init = function()
+      vim.g.vimwiki_list = {
+        {
+          path = "~/documents/wiki",
+          auto_tags = 1,
+          auto_diary_index = 1,
+          syntax = 'markdown',
+          ext = '.md',
+          diary_rel_path = 'diary',
+          links_space_char = "_",
+        },
+      }
+      vim.g.vimwiki_markdown_link_ext = 1
+      vim.g.vimwiki_stripsym = ' '
+      vim.g.vimwiki_global_ext = 0
+      vim.g.vimwiki_auto_header = 1
+      vim.g.vimwiki_syntax_plugins = {
+        codeblock = {
+          ["```lua"] = { parser = "lua" },
+          ["```python"] = { parser = "python" },
+          ["```javascript"] = { parser = "javascript" },
+          ["```bash"] = { parser = "bash" },
+          ["```html"] = { parser = "html" },
+          ["```css"] = { parser = "css" },
+          ["```c"] = { parser = "c" },
+        },
+      }
+    end
   },
+
+  { 'glacambre/firenvim', build = ":call firenvim#install(0)" },
+
+  -- html
+  "windwp/nvim-ts-autotag",
 }