diff --git a/nvim/lua/plugins/dap.lua b/nvim/lua/plugins/dap.lua
index feed76a..f29c0cf 100644
--- a/nvim/lua/plugins/dap.lua
+++ b/nvim/lua/plugins/dap.lua
@@ -141,7 +141,7 @@ return {
             }
         }
 
-        require('dap.ext.vscode').load_launchjs('.launch.json', {})
+        -- require('dap.ext.vscode').load_launchjs('.launch.json', {})
     end,
     keys = {
         {
diff --git a/nvim/lua/plugins/lspconfig.lua b/nvim/lua/plugins/lspconfig.lua
index 5071228..6716e70 100644
--- a/nvim/lua/plugins/lspconfig.lua
+++ b/nvim/lua/plugins/lspconfig.lua
@@ -1,9 +1,6 @@
 return {
     'neovim/nvim-lspconfig',
     config = function()
-        local capabilities = vim.lsp.protocol.make_client_capabilities()
-        capabilities.textDocument.completion.completionItem.snippetSupport = true
-
         vim.diagnostic.config({
             virtual_text = {
                 source = 'always',
@@ -14,19 +11,12 @@ return {
             }
         })
 
-        vim.lsp.config('*', {
-            capabilities = capabilities, -- TODO: Does this do anything?
-        })
-
         -- Auto set keymaps and other settings on LSP attach
         vim.api.nvim_create_autocmd('LspAttach', {
             group = vim.api.nvim_create_augroup('my.lsp', {}),
             callback = function(args)
                 local bufnr = args.buf
 
-                -- TODO: Does this do anything?
-                vim.api.nvim_buf_set_option(bufnr, 'omnifunc', 'v:lua.vim.lsp.omnifunc')
-
                 -- Keyboard Mappings
                 local bufopts = { noremap = true, silent = true, buffer = bufnr }
                 vim.keymap.set('n', '<C-[>', vim.diagnostic.goto_prev, bufopts)
@@ -38,8 +28,8 @@ return {
                 vim.keymap.set('n', 'K', vim.lsp.buf.hover, bufopts)
                 vim.keymap.set('n', 'gi', vim.lsp.buf.implementation, bufopts)
                 vim.keymap.set('n', 'gs', vim.lsp.buf.signature_help, bufopts)
-                vim.keymap.set('n', '<leader>D', vim.lsp.buf.type_definition, bufopts)
                 vim.keymap.set('n', 'gr', vim.lsp.buf.references, bufopts)
+                vim.keymap.set('n', '<leader>D', vim.lsp.buf.type_definition, bufopts)
                 vim.keymap.set('n', '<leader><leader>f', function() vim.lsp.buf.format { async = true } end, bufopts)
                 vim.keymap.set('n', '<leader>r', vim.lsp.buf.rename, bufopts)
             end,
diff --git a/nvim/lua/plugins/luasnip.lua b/nvim/lua/plugins/luasnip.lua
index 035932a..00ac06c 100644
--- a/nvim/lua/plugins/luasnip.lua
+++ b/nvim/lua/plugins/luasnip.lua
@@ -1,21 +1,6 @@
 return {
     'L3MON4D3/LuaSnip',
     config = function()
-        local ls = require('luasnip')
-        local extras = require('luasnip.extras')
-        local l = extras.lambda
-        ls.setup({
-            snip_env = {
-                s = function(...)
-                    local snip = ls.s(...)
-                    table.insert(getfenv(2).ls_file_snippets, snip)
-                end,
-                parse = function(...)
-                    local snip = ls.parser.parse_snippet(...)
-                    table.insert(getfenv(2).ls_file_snippets, snip)
-                end,
-            },
-        })
         require('luasnip.loaders.from_vscode').lazy_load()
         require('luasnip.loaders.from_lua').lazy_load({ paths = "./snippets" })
     end,
@@ -23,4 +8,5 @@ return {
         'saadparwaiz1/cmp_luasnip', -- Wrapper to load snippets in nvim-cmp
         'rafamadriz/friendly-snippets',
     },
+    build = "make install_jsregexp"
 }
diff --git a/nvim/lua/plugins/nvim-cmp.lua b/nvim/lua/plugins/nvim-cmp.lua
index 437b48f..a209e2e 100644
--- a/nvim/lua/plugins/nvim-cmp.lua
+++ b/nvim/lua/plugins/nvim-cmp.lua
@@ -5,7 +5,7 @@ return {
         cmp.setup {
             snippet = {
                 expand = function(args)
-                    require('luasnip').lsp_expand(args.body)
+                    require('plugins.luasnip').lsp_expand(args.body)
                 end,
             },
             completion = {
@@ -51,9 +51,9 @@ return {
             mapping = cmp.mapping.preset.cmdline(),
             sources = cmp.config.sources({
                 { name = 'path' },
-                { name = 'buffer' },
+                -- { name = 'buffer' },
             }, {
-                { name = 'cmdline', keyword_length = 1 },
+                { name = 'cmdline' },
             })
         })
 
diff --git a/nvim/lua/plugins/twilight.lua b/nvim/lua/plugins/twilight.lua
index 19f10ba..262c64a 100644
--- a/nvim/lua/plugins/twilight.lua
+++ b/nvim/lua/plugins/twilight.lua
@@ -5,10 +5,13 @@ return {
             dimming = {
                 alpha = 0.3,
             },
+            context = 6,
+            treesitter = true,
             expand = {
                 "function",
                 "method",
                 "table",
+                "if_statement",
             }
         })
     end,
diff --git a/zsh/zshrc b/zsh/zshrc
index 80067dc..5f64495 100644
--- a/zsh/zshrc
+++ b/zsh/zshrc
@@ -63,10 +63,10 @@ zstyle ':completion:*:descriptions' format '%U%B%d%b%u'
 zstyle ':completion:*:warnings' format '%BNo matches for: %d%b'
 
 # Autoload keychain for ssh-agent handling if it is installed
-# if command -v keychain &> /dev/null
-# then
-    # eval $(keychain --eval --quiet --nogui --noask)
-# fi
+if command -v keychain &> /dev/null
+then
+    eval $(keychain --eval --quiet --nogui --noask)
+fi
 
 # TODO: Replace above with GPG agent
 # GPG Agent handling of ssh key authorization and unlocks