diff --git a/vim/.vimrc b/vim/.vimrc
index eadd787..17c7af9 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -61,7 +61,7 @@ Plug 'terryma/vim-expand-region'
 Plug 'mg979/vim-visual-multi'
 Plug 'bogado/file-line'
 Plug 'vim-utils/vim-interruptless'
-Plug 'w0rp/ale'
+" Plug 'w0rp/ale'
 
 " ======== Snippets & Autocomplete ======================
 
@@ -93,6 +93,7 @@ Plug 'nvim-lua/plenary.nvim'
 Plug 'nvim-telescope/telescope.nvim'
 
 Plug 'nvim-treesitter/nvim-treesitter', {'do': ':TSUpdate'}
+Plug 'neovim/nvim-lspconfig'
 
 call plug#end()
 
@@ -203,22 +204,22 @@ let g:gitgutter_sign_removed_first_line = '│'
 
 " --- ale
 
-let g:ale_sign_error = 'x'
-let g:ale_sign_warning = '│'
-let g:ale_echo_msg_format = '[%severity%] %s'
-let g:ale_lint_on_text_changed = 'never'
-let g:ale_lint_on_insert_leave = 0
-let g:ale_lint_delay = 0
+" let g:ale_sign_error = 'x'
+" let g:ale_sign_warning = '│'
+" let g:ale_echo_msg_format = '[%severity%] %s'
+" let g:ale_lint_on_text_changed = 'never'
+" let g:ale_lint_on_insert_leave = 0
+" let g:ale_lint_delay = 0
 
-let g:ale_linters = {
-\   'typescriptreact': ['tslint'],
-\   'javascript': ['tslint'],
-\   'typescript': ['tslint'],
-\}
+" let g:ale_linters = {
+" \   'typescriptreact': ['tslint'],
+" \   'javascript': ['tslint'],
+" \   'typescript': ['tslint'],
+" \}
 
-let g:ale_fixers = {
-\   'ruby': ['rubocop'],
-\}
+" let g:ale_fixers = {
+" \   'ruby': ['rubocop'],
+" \}
 
 " --- fzf
 
@@ -572,3 +573,52 @@ require'nvim-treesitter.configs'.setup {
   autopairs = { enable = true },
 }
 EOF
+
+lua << EOF
+local nvim_lsp = require('lspconfig')
+
+-- Use an on_attach function to only map the following keys
+-- after the language server attaches to the current buffer
+local on_attach = function(client, bufnr)
+  local function buf_set_keymap(...) vim.api.nvim_buf_set_keymap(bufnr, ...) end
+  local function buf_set_option(...) vim.api.nvim_buf_set_option(bufnr, ...) end
+
+  -- Enable completion triggered by <c-x><c-o>
+  buf_set_option('omnifunc', 'v:lua.vim.lsp.omnifunc')
+
+  -- Mappings.
+  local opts = { noremap=true, silent=true }
+
+  -- See `:help vim.lsp.*` for documentation on any of the below functions
+  buf_set_keymap('n', 'gD', '<cmd>lua vim.lsp.buf.declaration()<CR>', opts)
+  buf_set_keymap('n', 'gd', '<cmd>lua vim.lsp.buf.definition()<CR>', opts)
+  buf_set_keymap('n', 'K', '<cmd>lua vim.lsp.buf.hover()<CR>', opts)
+  buf_set_keymap('n', 'gi', '<cmd>lua vim.lsp.buf.implementation()<CR>', opts)
+  buf_set_keymap('n', '<C-k>', '<cmd>lua vim.lsp.buf.signature_help()<CR>', opts)
+  buf_set_keymap('n', '<space>wa', '<cmd>lua vim.lsp.buf.add_workspace_folder()<CR>', opts)
+  buf_set_keymap('n', '<space>wr', '<cmd>lua vim.lsp.buf.remove_workspace_folder()<CR>', opts)
+  buf_set_keymap('n', '<space>wl', '<cmd>lua print(vim.inspect(vim.lsp.buf.list_workspace_folders()))<CR>', opts)
+  buf_set_keymap('n', '<space>D', '<cmd>lua vim.lsp.buf.type_definition()<CR>', opts)
+  buf_set_keymap('n', '<space>rn', '<cmd>lua vim.lsp.buf.rename()<CR>', opts)
+  buf_set_keymap('n', '<space>ca', '<cmd>lua vim.lsp.buf.code_action()<CR>', opts)
+  buf_set_keymap('n', 'gr', '<cmd>lua vim.lsp.buf.references()<CR>', opts)
+  buf_set_keymap('n', '<space>e', '<cmd>lua vim.lsp.diagnostic.show_line_diagnostics()<CR>', opts)
+  buf_set_keymap('n', '[d', '<cmd>lua vim.lsp.diagnostic.goto_prev()<CR>', opts)
+  buf_set_keymap('n', ']d', '<cmd>lua vim.lsp.diagnostic.goto_next()<CR>', opts)
+  buf_set_keymap('n', '<space>q', '<cmd>lua vim.lsp.diagnostic.set_loclist()<CR>', opts)
+  -- buf_set_keymap('n', '<space>f', '<cmd>lua vim.lsp.buf.formatting()<CR>', opts)
+
+end
+
+-- Use a loop to conveniently call 'setup' on multiple servers and
+-- map buffer local keybindings when the language server attaches
+local servers = { 'solargraph' }
+for _, lsp in ipairs(servers) do
+  nvim_lsp[lsp].setup {
+    on_attach = on_attach,
+    flags = {
+      debounce_text_changes = 150,
+    }
+  }
+end
+EOF