diff --git a/config/lvim/lua/user/options.lua b/config/lvim/lua/user/options.lua
index 085b0c5..8628daf 100644
--- a/config/lvim/lua/user/options.lua
+++ b/config/lvim/lua/user/options.lua
@@ -84,7 +84,6 @@ require("lvim.lsp.null-ls.formatters").setup {
 
 require("lvim.lsp.null-ls.linters").setup {
   { name = "cmakelint" },
-  { name = "cpplint" },
   { name = "cpptools" },
   { name = "flake8" },
   { name = "markdownlint" },
diff --git a/config/lvim/lua/user/plugins.lua b/config/lvim/lua/user/plugins.lua
index 5d036c8..290d680 100644
--- a/config/lvim/lua/user/plugins.lua
+++ b/config/lvim/lua/user/plugins.lua
@@ -156,6 +156,27 @@ lvim.plugins = {
     end
   },
 
+  -- treesitter plugins
+  {
+    "nvim-treesitter/nvim-treesitter-context",
+    config = function()
+      require'treesitter-context'.setup {
+        enable = true, -- Enable this plugin (Can be enabled/disabled later via commands)
+        max_lines = 0, -- How many lines the window should span. Values <= 0 mean no limit.
+        min_window_height = 0, -- Minimum editor window height to enable context. Values <= 0 mean no limit.
+        line_numbers = true,
+        multiline_threshold = 10, -- Maximum number of lines to show for a single context
+        trim_scope = 'outer', -- Which context lines to discard if `max_lines` is exceeded. Choices: 'inner', 'outer'
+        mode = 'cursor',  -- Line used to calculate context. Choices: 'cursor', 'topline'
+        -- Separator between context and content. Should be a single character string, like '-'.
+        -- When separator is set, the context will only show up when there are at least 2 lines above cursorline.
+        separator = nil,
+        zindex = 20, -- The Z-index of the context window
+        on_attach = nil, -- (fun(buf: integer): boolean) return false to disable attaching
+      }
+    end
+  },
+
   -- rainbow brackets
   { "mrjones2014/nvim-ts-rainbow", },
 }
diff --git a/config/lvim/lua/user/which-key.lua b/config/lvim/lua/user/which-key.lua
index 1f302ba..7199885 100644
--- a/config/lvim/lua/user/which-key.lua
+++ b/config/lvim/lua/user/which-key.lua
@@ -6,6 +6,7 @@ local vmappings = lvim.builtin.which_key.vmappings
 mappings["/"] = {}      -- comment
 mappings[";"] = {}      -- Dashboard
 mappings["b"]["b"] = {} -- previous buffer
+mappings["b"]["L"] = {} -- sort by language
 mappings["g"]["b"] = {} -- git new branch
 mappings["g"]["l"] = {} -- git blame
 mappings["bf"] = {}     -- buffer find