diff --git a/nvim/.config/nvim/lua/lsp.lua b/nvim/.config/nvim/lua/lsp.lua
index fb5c841..3dc7d65 100644
--- a/nvim/.config/nvim/lua/lsp.lua
+++ b/nvim/.config/nvim/lua/lsp.lua
@@ -1,5 +1,4 @@
 local nvim_lsp   = require('lspconfig')
-local lsp_status = require('lsp-status')
 local lsp_fuzzy  = require('lspfuzzy')
 local protocol   = require('vim.lsp.protocol')
 
@@ -47,7 +46,6 @@ end
 
 local on_attach = function(client, bufnr)
   vim.api.nvim_buf_set_option(bufnr, 'omnifunc', 'v:lua.vim.lsp.omnifunc')
-  lsp_status.on_attach(client, bufnr)
 
   if client.config.flags then
     client.config.flags.allow_incremental_sync = true
@@ -105,22 +103,7 @@ end
 local servers = { 'hls', 'rust_analyzer' }
 for _, lsp in ipairs(servers) do
   lsp_fuzzy.setup {}
-  lsp_status.register_progress()
-  lsp_status.config({
-    kind_labels = {},
-    current_function = true,
-    indicator_separator = ' ',
-    indicator_errors = '  ',
-    indicator_warnings = '  ',
-    indicator_info = ' 🛈 ',
-    indicator_hint = '❗',
-    indicator_ok = '  ',
-    spinner_frames = { '⣾', '⣽', '⣻', '⢿', '⡿', '⣟', '⣯', '⣷' },
-    status_symbol = ' 🇻 ',
-    select_symbol = nil
-  })
   nvim_lsp[lsp].setup {
     on_attach = on_attach,
-    capabilities = lsp_status.capabilities
   }
 end
diff --git a/nvim/.config/nvim/lua/modules/statusline.lua b/nvim/.config/nvim/lua/modules/statusline.lua
index 194153c..a1e16ae 100644
--- a/nvim/.config/nvim/lua/modules/statusline.lua
+++ b/nvim/.config/nvim/lua/modules/statusline.lua
@@ -1,4 +1,3 @@
-local lsp_status = require('lsp-status')
 local gl         = require('galaxyline')
 local gls        = gl.section
 
@@ -128,25 +127,24 @@ gls.left[11] = {
   }
 }
 gls.left[12] = {
-  Space = {
-    provider = function () return ' ' end
-  }
-}
-gls.left[13] = {
   DiagnosticWarn = {
     provider  = 'DiagnosticWarn',
     icon      = '  ',
-    highlight = { colors.blue, colors.bg },
+    highlight = { colors.yellow, colors.bg },
+  }
+}
+gls.left[13] = {
+  DiagnosticHint = {
+    provider = 'DiagnosticHint',
+    icon = '  ',
+    highlight = {colors.orange,colors.bg},
   }
 }
 gls.left[14] = {
-  LspStatus = {
-    provider = function()
-      if #vim.lsp.buf_get_clients() > 0 then
-        return lsp_status.status()
-      end
-    end,
-    highlight = { colors.orange, colors.bg,'bold' },
+  DiagnosticInfo = {
+    provider = 'DiagnosticInfo',
+    icon = '  ',
+    highlight = {colors.cyan,colors.bg},
   }
 }
 
diff --git a/nvim/.config/nvim/lua/plugins.lua b/nvim/.config/nvim/lua/plugins.lua
index e5eaf0b..c1efa1c 100644
--- a/nvim/.config/nvim/lua/plugins.lua
+++ b/nvim/.config/nvim/lua/plugins.lua
@@ -117,7 +117,6 @@ local init = function ()
   use {
     'neovim/nvim-lspconfig',
     'ojroques/nvim-lspfuzzy',
-    'nvim-lua/lsp-status.nvim'
   }
   -- Language support & syntax highlighting
   -- Haskell