diff --git a/.config/nvim/lua/config/treesitter-context.lua b/.config/nvim/lua/config/treesitter-context.lua
new file mode 100644
index 0000000..d2d2b43
--- /dev/null
+++ b/.config/nvim/lua/config/treesitter-context.lua
@@ -0,0 +1,12 @@
+require('treesitter-context').setup{
+    enable = true,
+    max_lines = 0,
+    min_window_height = 0,
+    line_numbers = true,
+    multiline_threshold = 20,
+    trim_scope = 'outer',
+    mode = 'cursor',
+    separator = nil,
+    zindex = 20,
+    on_attach = nil,
+}
diff --git a/.config/nvim/lua/packer-plugins.lua b/.config/nvim/lua/packer-plugins.lua
index 78c153f..b4e6d7b 100644
--- a/.config/nvim/lua/packer-plugins.lua
+++ b/.config/nvim/lua/packer-plugins.lua
@@ -57,6 +57,13 @@ return require('packer').startup(function()
 
     use { 'nvim-treesitter/nvim-treesitter' }
 
+    use {
+        'nvim-treesitter/nvim-treesitter-context',
+        config = function ()
+            require('config.treesitter-context')
+        end
+    }
+
     use {
         'theprimeagen/harpoon',
         config = function ()
@@ -147,6 +154,16 @@ return require('packer').startup(function()
         end
     }
 
+    use {
+        'rcarriga/nvim-notify',
+        config = function ()
+            require('notify').setup({
+                background_color = '#000000',
+                timeout = 3
+            })
+        end
+    }
+
     -- CMD and search at the top
     use {
         'folke/noice.nvim',
@@ -159,15 +176,6 @@ return require('packer').startup(function()
         end
     }
 
-    use {
-        'rcarriga/nvim-notify',
-        config = function ()
-            require('notify').setup({
-                background_color = '#000000'
-            })
-        end
-    }
-
     -- DB manager
     use {
         'kristijanhusak/vim-dadbod-ui',