diff --git a/nvim/lazy-lock.json b/nvim/lazy-lock.json
index 2bcf3a4..b100bc2 100644
--- a/nvim/lazy-lock.json
+++ b/nvim/lazy-lock.json
@@ -3,6 +3,7 @@
   "barbar.nvim": { "branch": "master", "commit": "d181f2cfd4b828f9c6f1e10e69c68241de59f54f" },
   "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" },
   "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
+  "conform.nvim": { "branch": "master", "commit": "9a06e83527407a7600a2fe4e0d10adf432b6215e" },
   "dashboard-nvim": { "branch": "master", "commit": "b88c997f468a1bacb1e9b13ff3b567638caa06e6" },
   "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" },
   "dracula.nvim": { "branch": "master", "commit": "194f10d0312236164f3865d404b4bcdcfd41deb7" },
diff --git a/nvim/lua/plugins/conform.lua b/nvim/lua/plugins/conform.lua
new file mode 100644
index 0000000..fbd50ca
--- /dev/null
+++ b/nvim/lua/plugins/conform.lua
@@ -0,0 +1,9 @@
+return {
+  'stevearc/conform.nvim',
+  opts = {
+    format_on_save = {
+      timeout_ms = 500,
+      lsp_format = "fallback"
+    }
+  }
+}
diff --git a/nvim/lua/plugins/gitsigns.lua b/nvim/lua/plugins/gitsigns.lua
new file mode 100644
index 0000000..7c18ac6
--- /dev/null
+++ b/nvim/lua/plugins/gitsigns.lua
@@ -0,0 +1,8 @@
+return {
+  'lewis6991/gitsigns.nvim',
+  config = function ()
+    require('gitsigns').setup {
+      current_line_blame = false
+    }
+  end
+}
diff --git a/nvim/lua/plugins/neo-tree.lua b/nvim/lua/plugins/neo-tree.lua
index 1110123..6b13937 100644
--- a/nvim/lua/plugins/neo-tree.lua
+++ b/nvim/lua/plugins/neo-tree.lua
@@ -14,11 +14,10 @@ return {
 
 	sources = {
 	  "filesystem",
-	  "git_status",
 	},
 
 	source_selector = {
-	  winbar = true
+	  winbar = false
 	},
 
         filesystem = {