diff --git a/lazy-lock.json b/lazy-lock.json
deleted file mode 100644
index e092218..0000000
--- a/lazy-lock.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "aerial.nvim": { "branch": "master", "commit": "24ebacab5821107c50f628e8e7774f105c08fe9b" },
-  "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
-  "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" },
-  "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" },
-  "cmp-nvim-lsp-signature-help": { "branch": "main", "commit": "3d8912ebeb56e5ae08ef0906e3a54de1c66b92f1" },
-  "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
-  "cmp-vsnip": { "branch": "main", "commit": "989a8a73c44e926199bfd05fa7a516d51f2d2752" },
-  "gruvbox": { "branch": "master", "commit": "f1ecde848f0cdba877acb0c740320568252cc482" },
-  "lazy.nvim": { "branch": "main", "commit": "31ddbea7c10b6920c9077b66c97951ca8682d5c8" },
-  "nvim-cmp": { "branch": "main", "commit": "ce16de5665c766f39c271705b17fff06f7bcb84f" },
-  "nvim-lspconfig": { "branch": "master", "commit": "b3014f2209503944f2714cf27c95591433a0c7d8" },
-  "nvim-treesitter": { "branch": "master", "commit": "ef267f0c285928ea3a0d3362a260a0728fd4a146" },
-  "plenary.nvim": { "branch": "master", "commit": "8aad4396840be7fc42896e3011751b7609ca4119" },
-  "telescope-fzf-native.nvim": { "branch": "main", "commit": "9ef21b2e6bb6ebeaf349a0781745549bbb870d27" },
-  "telescope.nvim": { "branch": "master", "commit": "6312868392331c9c0f22725041f1ec2bef57c751" },
-  "tokyonight.nvim": { "branch": "main", "commit": "9bf9ec53d5e87b025e2404069b71e7ebdc3a13e5" },
-  "vim-commentary": { "branch": "master", "commit": "c4b8f52cbb7142ec239494e5a2c4a512f92c4d07" },
-  "vim-fugitive": { "branch": "master", "commit": "dac8e5c2d85926df92672bf2afb4fc48656d96c7" },
-  "vim-polyglot": { "branch": "master", "commit": "bc8a81d3592dab86334f27d1d43c080ebf680d42" },
-  "vim-vsnip": { "branch": "master", "commit": "02a8e79295c9733434aab4e0e2b8c4b7cea9f3a9" }
-}
\ No newline at end of file
diff --git a/lua/plugins/lazy.lua b/lua/plugins/lazy.lua
index 1a3de84..45dc2a8 100644
--- a/lua/plugins/lazy.lua
+++ b/lua/plugins/lazy.lua
@@ -33,11 +33,27 @@ require('lazy').setup({
     },
     {
         "folke/tokyonight.nvim",
-        lazy = true,
-        -- config = function()
-        --   -- load the colorscheme here
-        --   vim.cmd([[colorscheme tokyonight]])
-        -- end,
+        lazy = true
+    },
+    {
+        "folke/which-key.nvim",
+        event = "VeryLazy",
+        opts = {
+            preset = "modern",
+            icons = {
+                mappings = false,
+                rules = false
+            }
+        },
+         keys = {
+           {
+             "<leader>?",
+             function()
+               require("which-key").show({ global = false })
+             end,
+             desc = "Buffer Local Keymaps (which-key)",
+           },
+         },
     },
     { 'nvim-telescope/telescope-fzf-native.nvim',
         build = 'cmake -S. -Bbuild -DCMAKE_BUILD_TYPE=Release && cmake --build build --config Release && cmake --install build --prefix build'
@@ -49,8 +65,6 @@ require('lazy').setup({
             local telescope = require('telescope')
 
             telescope.setup{
-                -- defaults = {
-                -- }
                 extensions = {
                     fzf = {
                         fuzzy = true,                    -- false will only do exact matching
@@ -61,23 +75,24 @@ require('lazy').setup({
                     }
                 }
             }
-
-            --telescope.load_extension('fzy')
             telescope.load_extension('fzf')
 
+            local wk = require("which-key")
             local builtin = require('telescope.builtin')
-            vim.keymap.set('n', '<C-p>', builtin.find_files, {})
-            vim.keymap.set('n', '<leader>ft', builtin.treesitter, {})
-            vim.keymap.set('n', '<leader>fg', builtin.live_grep, {})
-            vim.keymap.set('n', '<leader>fb', builtin.buffers, {})
-            vim.keymap.set('n', '<leader>fh', builtin.help_tags, {})
+            wk.add({
+                    { '<C-p>', builtin.find_files, desc = "Find file", mode = "n" },
+                    { '<leader>ft', builtin.treesitter, desc = "Treesitter symbol", mode = "n" },
+                    { '<leader>fg', builtin.live_grep, desc = "Live grep", mode = "n" },
+                    { '<leader>fb', builtin.buffers, desc = "Search in buffers", mode = "n" },
+                    { '<leader>fh', builtin.help_tags, desc = "Help search", mode = "n" }
+                })
         end
     },
     { "nvim-treesitter/nvim-treesitter",
         build = ":TSUpdate",
         config = function()
             require("nvim-treesitter.configs").setup {
-                ensure_installed = { "c", "cpp", "pascal", "lua", "glsl", "yaml" },
+                ensure_installed = { "c", "cpp", "lua" },
                 highlight = { enable = true, }
             }
         end
@@ -86,16 +101,19 @@ require('lazy').setup({
         'neovim/nvim-lspconfig',
         config = function()
             -- Setup language servers.
+            local wk = require("which-key")
             local lspconfig = require('lspconfig')
             --lspconfig.clangd.setup {}
             --lspconfig.neocmake.setup {}
 
             -- Global mappings.
             -- See `:help vim.diagnostic.*` for documentation on any of the below functions
-            vim.keymap.set('n', '<space>e', vim.diagnostic.open_float)
-            vim.keymap.set('n', '[d', vim.diagnostic.goto_prev)
-            vim.keymap.set('n', ']d', vim.diagnostic.goto_next)
-            vim.keymap.set('n', '<space>q', vim.diagnostic.setloclist)
+            wk.add({
+                    { '<space>e', vim.diagnostic.open_float, desc = "Open diagnostic window", mode = "n" },
+                    { '[d', vim.diagnostic.goto_prev, desc = "Previous diagnostic", mode = "n" },
+                    { ']d', vim.diagnostic.goto_next, desc = "Next diagnostic", mode = "n" },
+                    { '<space>q', vim.diagnostic.setloclist, desc = "Add buffer diagnostics to the location list", mode = "n" }
+                })
 
             -- Use LspAttach autocommand to only map the following keys
             -- after the language server attaches to the current buffer