diff --git a/vim/.vim/lua/config/lsp.lua b/vim/.vim/lua/config/lsp.lua
index 396c0a3..fa47384 100644
--- a/vim/.vim/lua/config/lsp.lua
+++ b/vim/.vim/lua/config/lsp.lua
@@ -1,6 +1,6 @@
 local use_google = require("utils").use_google
-local tprint = require("utils").tprint
-local dump = require("utils").dump
+-- local tprint = require("utils").tprint
+-- local dump = require("utils").dump
 local log = require("utils").log
 local notify = require 'notify'
 
@@ -349,17 +349,7 @@ cmp.setup({
             cmp.config.compare.offset,
             cmp.config.compare.exact,
             cmp.config.compare.score,
-            function(entry1, entry2)
-                local _, entry1_under = entry1.completion_item.label:find("^_+")
-                local _, entry2_under = entry2.completion_item.label:find("^_+")
-                entry1_under = entry1_under or 0
-                entry2_under = entry2_under or 0
-                if entry1_under > entry2_under then
-                    return false
-                elseif entry1_under < entry2_under then
-                    return true
-                end
-            end,
+            require "cmp-under-comparator".under,
             cmp.config.compare.kind,
             cmp.config.compare.sort_text,
             cmp.config.compare.length,
diff --git a/vim/.vim/lua/config/trouble.lua b/vim/.vim/lua/config/trouble.lua
index 2ed22c5..9286d9d 100644
--- a/vim/.vim/lua/config/trouble.lua
+++ b/vim/.vim/lua/config/trouble.lua
@@ -1,3 +1,18 @@
+vim.diagnostic.config({
+  virtual_text = {
+    prefix = '■', -- Could be '●', '▎', 'x'
+  },
+  virtual_lines = false,
+  severity_sort = true,
+})
+
+vim.keymap.set(
+  "",
+  "<Leader>l",
+  require("lsp_lines").toggle,
+  { desc = "Toggle lsp_lines" }
+)
+
 -- Diagnostics
 require("trouble").setup({
   signs = {
diff --git a/vim/.vim/lua/plugins.lua b/vim/.vim/lua/plugins.lua
index e793969..e421be9 100644
--- a/vim/.vim/lua/plugins.lua
+++ b/vim/.vim/lua/plugins.lua
@@ -76,6 +76,7 @@ require('packer').startup(function(use)
         "tzachar/cmp-tabnine", run = "./install.sh",
         disable = use_google(),
     }
+    use { 'ErichDonGubler/lsp_lines.nvim', config = [[ require("lsp_lines").setup() ]] }
     use {
         "williamboman/mason.nvim",
         "williamboman/mason-lspconfig.nvim",
@@ -100,7 +101,6 @@ require('packer').startup(function(use)
     use 'hrsh7th/vim-vsnip'
     use 'kosayoda/nvim-lightbulb'
     use {'andymass/vim-matchup', event = 'VimEnter'}
-    use { 'ErichDonGubler/lsp_lines.nvim', config = [[ require("lsp_lines").setup() ]] }
 
     use 'jghauser/mkdir.nvim'
     use { 'simrat39/symbols-outline.nvim', config = [[ require("config.symbols-outline") ]]  }
@@ -250,8 +250,3 @@ vim.opt.shortmess:append("c")
 
 vim.opt.spell = true
 vim.opt.spelllang = { 'en_us' }
-
--- redundant w/ lsp_lines
-vim.diagnostic.config({
-    virtual_text = false,
-})