diff --git a/nvim/init.lua b/nvim/init.lua
index 53fb6c5..a695868 100644
--- a/nvim/init.lua
+++ b/nvim/init.lua
@@ -32,4 +32,7 @@ vim.wo.number = true
 vim.opt.fillchars = {
   vert = " "
 }
+vim.diagnostic.config({
+  virtual_text = true
+})
 vim.cmd[[colorscheme dracula]]
diff --git a/nvim/lazy-lock.json b/nvim/lazy-lock.json
index 218c2ea..2bcf3a4 100644
--- a/nvim/lazy-lock.json
+++ b/nvim/lazy-lock.json
@@ -4,15 +4,19 @@
   "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" },
   "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
   "dashboard-nvim": { "branch": "master", "commit": "b88c997f468a1bacb1e9b13ff3b567638caa06e6" },
+  "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" },
   "dracula.nvim": { "branch": "master", "commit": "194f10d0312236164f3865d404b4bcdcfd41deb7" },
   "friendly-snippets": { "branch": "main", "commit": "682157939e57bd6a2c86277dfd4d6fbfce63dbac" },
   "gitsigns.nvim": { "branch": "main", "commit": "8df63f2ddc615feb71fd4aee45a4cee022876df1" },
   "indent-blankline.nvim": { "branch": "master", "commit": "d98f537c3492e87b6dc6c2e3f66ac517528f406f" },
   "lazy.nvim": { "branch": "main", "commit": "bc620783663ab09d16bff9fdecc07da65b2a1528" },
+  "lazydev.nvim": { "branch": "main", "commit": "6184ebbbc8045d70077659b7d30c705a588dc62f" },
   "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" },
+  "luvit-meta": { "branch": "main", "commit": "ce76f6f6cdc9201523a5875a4471dcfe0186eb60" },
   "mason.nvim": { "branch": "main", "commit": "0950b15060067f752fde13a779a994f59516ce3d" },
   "mkdnflow.nvim": { "branch": "main", "commit": "8065d69e73a2623203138bca9dc436df7784ef11" },
   "neo-tree.nvim": { "branch": "v3.x", "commit": "29f7c215332ba95e470811c380ddbce2cebe2af4" },
+  "neogit": { "branch": "master", "commit": "11dea1b67bb153cd5b4a2de348ceefa69508dfce" },
   "noice.nvim": { "branch": "main", "commit": "88ac36864b5976a64b14a8f156c616f41b32f228" },
   "nui.nvim": { "branch": "main", "commit": "322978c734866996274467de084a95e4f9b5e0b1" },
   "nvim-autopairs": { "branch": "master", "commit": "c15de7e7981f1111642e7e53799e1211d4606cb9" },
@@ -23,6 +27,7 @@
   "nvim-ts-autotag": { "branch": "main", "commit": "ddfccbf0df1b9349c2b9e9b17f4afa8f9b6c1ed1" },
   "nvim-web-devicons": { "branch": "master", "commit": "c0cfc1738361b5da1cd0a962dd6f774cc444f856" },
   "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" },
+  "symbol-usage.nvim": { "branch": "main", "commit": "533846260d3d053aebbf224617cc5294c219a8b1" },
   "telescope.nvim": { "branch": "master", "commit": "f2bfde705ac752c52544d5cfa8b0aee0a766c1ed" },
   "trouble.nvim": { "branch": "main", "commit": "2d8610a07033f2b367e71230ab128f8b89c2639d" }
 }
\ No newline at end of file
diff --git a/nvim/lua/plugins/barbar.lua b/nvim/lua/plugins/barbar.lua
index 105d466..9ec503b 100644
--- a/nvim/lua/plugins/barbar.lua
+++ b/nvim/lua/plugins/barbar.lua
@@ -7,12 +7,6 @@ return {
   init = function () vim.g.barbar_auto_setup = false end,
   opts = {
     animation = true,
-    auto_hide = 0,
-
-    preset = 'slanted',
-
-    sidebar_filetypes = {
-      ['neo-tree'] = true
-    }
+    auto_hide = 0
   }
 }
diff --git a/nvim/lua/plugins/lazydev.lua b/nvim/lua/plugins/lazydev.lua
new file mode 100644
index 0000000..806263c
--- /dev/null
+++ b/nvim/lua/plugins/lazydev.lua
@@ -0,0 +1,14 @@
+return {
+  {
+    "folke/lazydev.nvim",
+    ft = "lua", -- only load on lua files
+    opts = {
+      library = {
+        -- See the configuration section for more details
+        -- Load luvit types when the `vim.uv` word is found
+        { path = "luvit-meta/library", words = { "vim%.uv" } },
+      },
+    },
+  },
+  { "Bilal2453/luvit-meta", lazy = true }, -- optional `vim.uv` typings
+}
diff --git a/nvim/lua/plugins/neo-tree.lua b/nvim/lua/plugins/neo-tree.lua
index fe674de..1110123 100644
--- a/nvim/lua/plugins/neo-tree.lua
+++ b/nvim/lua/plugins/neo-tree.lua
@@ -12,6 +12,15 @@ return {
         enable_git_status = true,
         enable_diagnostics = true,
 
+	sources = {
+	  "filesystem",
+	  "git_status",
+	},
+
+	source_selector = {
+	  winbar = true
+	},
+
         filesystem = {
           follow_current_file = {
             enabled = true
diff --git a/nvim/lua/plugins/neogit.lua b/nvim/lua/plugins/neogit.lua
new file mode 100644
index 0000000..d3e69e9
--- /dev/null
+++ b/nvim/lua/plugins/neogit.lua
@@ -0,0 +1,14 @@
+return {
+  "NeogitOrg/neogit",
+  dependencies = {
+    "nvim-lua/plenary.nvim",         -- required
+    "sindrets/diffview.nvim",        -- optional - Diff integration
+
+    "nvim-telescope/telescope.nvim", -- optional
+  },
+  config = function()
+    require('neogit').setup {
+      kind = "split"
+    }
+  end
+}
diff --git a/nvim/lua/plugins/nvim-cmp.lua b/nvim/lua/plugins/nvim-cmp.lua
index db0c728..2449e23 100644
--- a/nvim/lua/plugins/nvim-cmp.lua
+++ b/nvim/lua/plugins/nvim-cmp.lua
@@ -23,6 +23,7 @@ return {
         sources = cmp.config.sources({
           {name = 'nvim_lsp'},
           {name = 'luasnip'},
+	  {name = 'lazydev'},
           {name = 'buffer'}
         }),
       })
@@ -31,6 +32,7 @@ return {
       {'hrsh7th/cmp-nvim-lsp'},
       {'saadparwaiz1/cmp_luasnip'},
       {'rafamadriz/friendly-snippets'},
+      {'folke/lazydev.nvim'},
       {'L3MON4D3/LuaSnip'}
     }
   }
diff --git a/nvim/lua/plugins/symbol-usage.lua b/nvim/lua/plugins/symbol-usage.lua
new file mode 100644
index 0000000..7d10279
--- /dev/null
+++ b/nvim/lua/plugins/symbol-usage.lua
@@ -0,0 +1,7 @@
+return {
+  'wansmer/symbol-usage.nvim',
+  event = 'LspAttach',
+  config = function()
+    require('symbol-usage').setup()
+  end
+}