From d77d0f2e358a562af3487e2a0ada2c5e4803f3ae Mon Sep 17 00:00:00 2001
From: Jacob Bohanon <jacobbohanon@gmail.com>
Date: Tue, 16 May 2023 15:31:46 -0400
Subject: [PATCH] modify lua init

---
 nvim/init.lua                                 |   4 +-
 nvim/lua/keymaps.lua                          |  41 ++
 nvim/lua/lsp.lua                              |  63 ++++
 nvim/lua/{remaps.lua => plugins/floaterm.lua} |   0
 nvim/lua/plugins/harpoon.lua                  |  29 ++
 nvim/lua/plugins/init.lua                     |   4 +
 nvim/lua/plugins/nvim-cmp.lua                 |  73 ++++
 nvim/lua/plugins/telescope.lua                |  21 ++
 nvim/lua/sets.lua                             |   6 +-
 nvim/not_init.vim                             | 350 +++++++++---------
 zsh/config.d/gcloud.zsh                       |   3 +
 11 files changed, 411 insertions(+), 183 deletions(-)
 create mode 100644 nvim/lua/keymaps.lua
 rename nvim/lua/{remaps.lua => plugins/floaterm.lua} (100%)
 create mode 100644 nvim/lua/plugins/harpoon.lua
 create mode 100644 nvim/lua/plugins/nvim-cmp.lua
 create mode 100644 nvim/lua/plugins/telescope.lua

diff --git a/nvim/init.lua b/nvim/init.lua
index 3367bd4..6edef01 100644
--- a/nvim/init.lua
+++ b/nvim/init.lua
@@ -1,6 +1,8 @@
+vim.g.mapleader = " "
+
 require("sets")
 require("plugins")
-require("remaps")
+require("keymaps")
 require("lsp")
 require("theme")
 
diff --git a/nvim/lua/keymaps.lua b/nvim/lua/keymaps.lua
new file mode 100644
index 0000000..f9a95e3
--- /dev/null
+++ b/nvim/lua/keymaps.lua
@@ -0,0 +1,41 @@
+local map = vim.api.nvim_set_keymap
+
+local noremap = function(ctx, keys, cmd, opts)
+    opts = opts or {}
+    opts['noremap'] = true
+    opts['silent'] = true
+    map(ctx, keys, cmd, opts)
+end
+
+local nnoremap = function(keys, cmd)
+    noremap('n', keys, cmd, nil)
+end
+local tnoremap = function(keys, cmd)
+    noremap('t', keys, cmd, nil)
+end
+local vnoremap = function(keys, cmd)
+    noremap('v', keys, cmd, nil)
+end
+
+-- For plugin-specific keymaps, see that plugin's file in lua/plugins/
+
+map('i', 'jj', '<Esc>', {})
+
+nnoremap('<Leader>q', ':bp|bd #<CR>')
+nnoremap('<Leader>w', ':w<CR>')
+nnoremap('<Leader>n', ':bn<CR>')
+nnoremap('<Leader>b', ':bp<CR>')
+
+nnoremap('<c-j>', '<c-w><c-j>')
+nnoremap('<c-k>', '<c-w><c-k>')
+nnoremap('<c-h>', '<c-w><c-h>')
+nnoremap('<c-l>', '<c-w><c-l>')
+
+tnoremap('<c-j>', '<c-\\><c-n><c-w><c-j>')
+tnoremap('<c-k>', '<c-\\><c-n><c-w><c-k>')
+tnoremap('<c-h>', '<c-\\><c-n><c-w><c-h>')
+tnoremap('<c-l>', '<c-\\><c-n><c-w><c-l>')
+tnoremap('<Esc>', '<c-\\><c-n>')
+
+vnoremap('J', ':m \'>+1<CR>gv=gv')
+vnoremap('K', ':m \'<-2<CR>gv=gv')
diff --git a/nvim/lua/lsp.lua b/nvim/lua/lsp.lua
index e69de29..df6833b 100644
--- a/nvim/lua/lsp.lua
+++ b/nvim/lua/lsp.lua
@@ -0,0 +1,63 @@
+-- Mappings.
+-- See `:help vim.diagnostic.*` for documentation on any of the below functions
+local opts = { noremap=true, silent=true }
+vim.keymap.set('n', '<space>d', vim.diagnostic.open_float, opts)
+vim.keymap.set('n', '<space>dd', require'telescope.builtin'.diagnostics, opts)
+vim.keymap.set('n', '[d', vim.diagnostic.goto_prev, opts)
+vim.keymap.set('n', ']d', vim.diagnostic.goto_next, opts)
+vim.keymap.set('n', '<space>dl', vim.diagnostic.setloclist, opts)
+
+-- 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)
+  -- Enable completion triggered by <c-x><c-o>
+  vim.api.nvim_buf_set_option(bufnr, 'omnifunc', 'v:lua.vim.lsp.omnifunc')
+
+  -- Mappings.
+  -- See `:help vim.lsp.*` for documentation on any of the below functions
+  local bufopts = { noremap=true, silent=true, buffer=bufnr }
+  --vim.keymap.set('n', 'gD', vim.lsp.buf.declaration, bufopts)
+  vim.keymap.set('n', 'gD', require'telescope.builtin'.lsp_type_definitions, bufopts)
+  --vim.keymap.set('n', 'gd', vim.lsp.buf.definition, bufopts)
+  vim.keymap.set('n', 'gd', require'telescope.builtin'.lsp_definitions, bufopts)
+  vim.keymap.set('n', 'K', vim.lsp.buf.hover, bufopts)
+  vim.keymap.set('n', 'gi', require'telescope.builtin'.lsp_implementations, bufopts)
+  vim.keymap.set('n', '<C-k>', vim.lsp.buf.signature_help, bufopts)
+  vim.keymap.set('n', '<space>D', vim.lsp.buf.type_definition, bufopts)
+  vim.keymap.set('n', '<space>rn', vim.lsp.buf.rename, bufopts)
+  vim.keymap.set('n', '<space>ca', vim.lsp.buf.code_action, bufopts)
+  --vim.keymap.set('n', 'gr', vim.lsp.buf.references, bufopts)
+  vim.keymap.set('n', 'gr', require'telescope.builtin'.lsp_references, bufopts)
+  vim.keymap.set('n', '<space>f', vim.lsp.buf.format, bufopts)
+end
+local capabilities = require('cmp_nvim_lsp').default_capabilities(vim.lsp.protocol.make_client_capabilities())
+require('lspconfig')['gopls'].setup{
+    settings = {
+        gopls = {
+            templateExtensions = {'gotmpl', 'gohtml'},
+        }
+    },
+    filetypes = { "go", "gomod", "gowork", "gotmpl", "gohtml", "gohtmltmpl" },
+    on_attach = on_attach,
+    capabilities = capabilities,
+}
+require('lspconfig')['pyright'].setup{
+    on_attach = on_attach,
+    capabilities = capabilities,
+}
+require('lspconfig')['tsserver'].setup{
+    on_attach = on_attach,
+    capabilities = capabilities,
+}
+require('lspconfig')['clangd'].setup{
+    on_attach = on_attach,
+    capabilities = capabilities,
+}
+require('lspconfig')['rust_analyzer'].setup{
+    on_attach = on_attach,
+    capabilities = capabilities,
+}
+require('lspconfig')['bashls'].setup{
+    on_attach = on_attach,
+    capabilities = capabilities,
+}
diff --git a/nvim/lua/remaps.lua b/nvim/lua/plugins/floaterm.lua
similarity index 100%
rename from nvim/lua/remaps.lua
rename to nvim/lua/plugins/floaterm.lua
diff --git a/nvim/lua/plugins/harpoon.lua b/nvim/lua/plugins/harpoon.lua
new file mode 100644
index 0000000..f601683
--- /dev/null
+++ b/nvim/lua/plugins/harpoon.lua
@@ -0,0 +1,29 @@
+local map = vim.api.nvim_set_keymap
+
+local harp = require('harpoon.ui')
+
+local harpmap = function(cmd, cb)
+    map('n', cmd, '', {
+        noremap = true,
+        silent = true,
+        callback = cb,
+    })
+end
+
+local nav_file = function(n)
+    return function()
+        harp.nav_file(n)
+    end
+end
+
+harpmap('<Leader>ee', require('harpoon.mark').add_file)
+harpmap('<Leader>fh', harp.toggle_quick_menu)
+harpmap('<Leader>1', nav_file(1))
+harpmap('<Leader>2', nav_file(2))
+harpmap('<Leader>3', nav_file(3))
+harpmap('<Leader>4', nav_file(4))
+harpmap('<Leader>5', nav_file(5))
+harpmap('<Leader>6', nav_file(6))
+harpmap('<Leader>7', nav_file(7))
+harpmap('<Leader>8', nav_file(8))
+harpmap('<Leader>9', nav_file(9))
diff --git a/nvim/lua/plugins/init.lua b/nvim/lua/plugins/init.lua
index f9686a9..5c70f1e 100644
--- a/nvim/lua/plugins/init.lua
+++ b/nvim/lua/plugins/init.lua
@@ -58,4 +58,8 @@ Plug 'tpope/vim-dispatch'
 
 vim.call('plug#end')
 
+require("plugins/floaterm")
+require("plugins/harpoon")
+require("plugins/telescope")
 require("plugins/treesitter")
+require("plugins/nvim-cmp")
diff --git a/nvim/lua/plugins/nvim-cmp.lua b/nvim/lua/plugins/nvim-cmp.lua
new file mode 100644
index 0000000..19f22c2
--- /dev/null
+++ b/nvim/lua/plugins/nvim-cmp.lua
@@ -0,0 +1,73 @@
+local cmp = require('cmp')
+
+cmp.setup({
+  snippet = {
+    expand = function(args)
+      vim.fn["vsnip#anonymous"](args.body)
+    end,
+  },
+  window = {
+    completion = cmp.config.window.bordered(),
+    documentation = cmp.config.window.bordered(),
+  },
+  mapping = cmp.mapping.preset.insert({
+      ["<Tab>"] = cmp.mapping(function(fallback)
+        if cmp.visible() then
+          cmp.select_next_item()
+        elseif luasnip.expand_or_jumpable() then
+          luasnip.expand_or_jump()
+        elseif has_words_before() then
+          cmp.complete()
+        else
+          fallback()
+        end
+      end, { "i", "s" }),
+      ["<S-Tab>"] = cmp.mapping(function(fallback)
+        if cmp.visible() then
+          cmp.select_prev_item()
+        elseif luasnip.jumpable(-1) then
+          luasnip.jump(-1)
+        else
+          fallback()
+        end
+      end, { "i", "s" }),
+    ['<C-b>'] = cmp.mapping.scroll_docs(-4),
+    ['<C-f>'] = cmp.mapping.scroll_docs(4),
+    ['<C-Space>'] = cmp.mapping.complete(),
+    ['<C-e>'] = cmp.mapping.abort(),
+    ['<CR>'] = cmp.mapping.confirm({ select = true }), -- Accept currently selected item. Set `select` to `false` to only confirm explicitly selected items.
+  }),
+  sources = cmp.config.sources({
+    { name = 'nvim_lsp' },
+    { name = 'vsnip' },
+  }, {
+    { name = 'buffer' },
+  })
+})
+
+-- Set configuration for specific filetype.
+cmp.setup.filetype('gitcommit', {
+  sources = cmp.config.sources({
+    { name = 'cmp_git' },
+  }, {
+    { name = 'buffer' },
+  })
+})
+
+-- Use buffer source for `/` (if you enabled `native_menu`, this won't work anymore).
+cmp.setup.cmdline('/', {
+  mapping = cmp.mapping.preset.cmdline(),
+  sources = {
+    { name = 'buffer' }
+  }
+})
+
+-- Use cmdline & path source for ':' (if you enabled `native_menu`, this won't work anymore).
+cmp.setup.cmdline(':', {
+  mapping = cmp.mapping.preset.cmdline(),
+  sources = cmp.config.sources({
+    { name = 'path' }
+  }, {
+    { name = 'cmdline' }
+  })
+})
diff --git a/nvim/lua/plugins/telescope.lua b/nvim/lua/plugins/telescope.lua
new file mode 100644
index 0000000..0ab4ada
--- /dev/null
+++ b/nvim/lua/plugins/telescope.lua
@@ -0,0 +1,21 @@
+local map = vim.api.nvim_set_keymap
+
+local tele = require('telescope.builtin')
+
+local telemap = function(cmd, cb)
+    map('n', cmd, '', {
+        noremap = true,
+        silent = true,
+        callback = cb,
+    })
+end
+
+telemap('<Leader>ff', function() tele.find_files({ hidden = true, file_ignore_patterns = {'^.git'} }) end)
+
+telemap('<Leader>fg', tele.live_grep)
+
+telemap('<Leader>fb', tele.buffers)
+
+telemap('<Leader>ft', tele.grep_string)
+
+telemap('<Leader>tr', tele.treesitter)
diff --git a/nvim/lua/sets.lua b/nvim/lua/sets.lua
index 1af2fb4..f3cba80 100644
--- a/nvim/lua/sets.lua
+++ b/nvim/lua/sets.lua
@@ -1,5 +1,5 @@
-vim.api.nvim_set_option('number', true)
-vim.api.nvim_set_option('relativenumber', true)
+vim.api.nvim_win_set_option(0, 'number', true)
+vim.api.nvim_win_set_option(0, 'relativenumber', true)
 vim.api.nvim_win_set_option(0, 'wrap', false)
 
 vim.api.nvim_set_option('tabstop', 4)
@@ -23,5 +23,5 @@ vim.api.nvim_set_option('updatetime', 50)
 vim.api.nvim_set_option('swapfile', false)
 vim.api.nvim_set_option('backup', false)
 vim.api.nvim_set_option('undofile', true)
-vim.api.nvim_set_option('undodir', '~/.vim/undodir')
+vim.api.nvim_set_option('undodir', vim.fn.expand('~')..'/.vim/undodir')
 
diff --git a/nvim/not_init.vim b/nvim/not_init.vim
index 5586aeb..dc3699c 100644
--- a/nvim/not_init.vim
+++ b/nvim/not_init.vim
@@ -1,4 +1,4 @@
-imap jj <Esc>
+" imap jj <Esc>
 
 " set number
 " set relativenumber
@@ -93,46 +93,45 @@ let $GINKGO_EDITOR_INTEGRATION = "true"
 " nnoremap ZZ zA<CR>
 
 " Find files using Telescope command-line sugar.
-let mapleader = " "
-nnoremap <Leader>ff <cmd>lua require('telescope.builtin').find_files({hidden = true, file_ignore_patterns = {"^.git"}})<cr>
-nnoremap <Leader>fg <cmd>lua require('telescope.builtin').live_grep()<cr>
-nnoremap <Leader>fb <cmd>lua require('telescope.builtin').buffers()<cr>
-nnoremap <Leader>ft <cmd>lua require('telescope.builtin').grep_string()<cr>
-nnoremap <Leader>fh <cmd>lua require('harpoon.ui').toggle_quick_menu()<cr>
-nnoremap <Leader>tr <cmd>lua require('telescope.builtin').treesitter()<cr>
+" let mapleader = \" \"
+" nnoremap <Leader>ff <cmd>lua require('telescope.builtin').find_files({hidden = true, file_ignore_patterns = {"^.git"}})<cr>
+" nnoremap <Leader>fg <cmd>lua require('telescope.builtin').live_grep()<cr>
+" nnoremap <Leader>fb <cmd>lua require('telescope.builtin').buffers()<cr>
+" nnoremap <Leader>ft <cmd>lua require('telescope.builtin').grep_string()<cr>
+" nnoremap <Leader>fh <cmd>lua require('harpoon.ui').toggle_quick_menu()<cr>
+" nnoremap <Leader>tr <cmd>lua require('telescope.builtin').treesitter()<cr>
 
 nnoremap <Leader>err oif err != nil {<CR>return nil, err<CR>}<CR><esc>kkI<esc>
-nnoremap <buffer> <silent> <C-[> :GoReferrers<cr>
 
-nnoremap <Leader>q :bp\|bd #<CR>
-nnoremap <Leader>w :w<CR>
-nnoremap <Leader>n :bn<CR>
-nnoremap <Leader>b :bp<CR>
-nnoremap <Leader>1 <cmd>lua require("harpoon.ui").nav_file(1)<CR>
-nnoremap <Leader>2 <cmd>lua require("harpoon.ui").nav_file(2)<CR>
-nnoremap <Leader>3 <cmd>lua require("harpoon.ui").nav_file(3)<CR>
-nnoremap <Leader>4 <cmd>lua require("harpoon.ui").nav_file(4)<CR>
-nnoremap <Leader>5 <cmd>lua require("harpoon.ui").nav_file(5)<CR>
-nnoremap <Leader>6 <cmd>lua require("harpoon.ui").nav_file(6)<CR>
-nnoremap <Leader>7 <cmd>lua require("harpoon.ui").nav_file(7)<CR>
-nnoremap <Leader>8 <cmd>lua require("harpoon.ui").nav_file(8)<CR>
-nnoremap <Leader>9 <cmd>lua require("harpoon.ui").nav_file(9)<CR>
-nnoremap <c-j> <c-w><c-j>
-nnoremap <c-k> <c-w><c-k>
-nnoremap <c-h> <c-w><c-h>
-nnoremap <c-l> <c-w><c-l>
-tnoremap <c-j> <c-\><c-n><c-w><c-j>
-tnoremap <c-k> <c-\><c-n><c-w><c-k>
-tnoremap <c-h> <c-\><c-n><c-w><c-h>
-tnoremap <c-l> <c-\><c-n><c-w><c-l>
-tnoremap <Esc> <C-\><C-n>
+" nnoremap <Leader>q :bp\|bd #<CR>
+" nnoremap <Leader>w :w<CR>
+" nnoremap <Leader>n :bn<CR>
+" nnoremap <Leader>b :bp<CR>
+" nnoremap <Leader>1 <cmd>lua require("harpoon.ui").nav_file(1)<CR>
+" nnoremap <Leader>2 <cmd>lua require("harpoon.ui").nav_file(2)<CR>
+" nnoremap <Leader>3 <cmd>lua require("harpoon.ui").nav_file(3)<CR>
+" nnoremap <Leader>4 <cmd>lua require("harpoon.ui").nav_file(4)<CR>
+" nnoremap <Leader>5 <cmd>lua require("harpoon.ui").nav_file(5)<CR>
+" nnoremap <Leader>6 <cmd>lua require("harpoon.ui").nav_file(6)<CR>
+" nnoremap <Leader>7 <cmd>lua require("harpoon.ui").nav_file(7)<CR>
+" nnoremap <Leader>8 <cmd>lua require("harpoon.ui").nav_file(8)<CR>
+" nnoremap <Leader>9 <cmd>lua require("harpoon.ui").nav_file(9)<CR>
+" nnoremap <c-j> <c-w><c-j>
+" nnoremap <c-k> <c-w><c-k>
+" nnoremap <c-h> <c-w><c-h>
+" nnoremap <c-l> <c-w><c-l>
+" tnoremap <c-j> <c-\><c-n><c-w><c-j>
+" tnoremap <c-k> <c-\><c-n><c-w><c-k>
+" tnoremap <c-h> <c-\><c-n><c-w><c-h>
+" tnoremap <c-l> <c-\><c-n><c-w><c-l>
+" tnoremap <Esc> <C-\><C-n>
 nnoremap <Leader>ee :NvimTreeFindFileToggle<cr>
-nnoremap <Leader>h <cmd>lua require("harpoon.mark").add_file()<cr>
+" nnoremap <Leader>h <cmd>lua require("harpoon.mark").add_file()<cr>
 nnoremap <Leader>/ :Commentary<cr>
 vnoremap <Leader>/ :Commentary<cr>
 
-vnoremap J :m '>+1<CR>gv=gv
-vnoremap K :m '<-2<CR>gv=gv
+" vnoremap J :m '>+1<CR>gv=gv
+" vnoremap K :m '<-2<CR>gv=gv
 
 let g:floaterm_wintype='split'
 let g:floaterm_height=0.2
@@ -146,8 +145,9 @@ nnoremap   <silent>   <F12>   :FloatermToggle<CR>
 tnoremap   <silent>   <F12>   <C-\><C-n>:FloatermToggle<CR>
 
 let mapleader = '\'
-nnoremap <Leader><CR> :so ~/.config/nvim/init.vim<CR>
-nnoremap <Leader><Leader> :e ~/.config/nvim/init.vim<CR>
+nnoremap <Leader><CR> :so ~/.config/nvim/init.lua<CR>
+nnoremap <Leader><Leader> :e ~/.config/nvim/init.lua<CR>
+let mapleader = ' '
 
 augroup jbohanon
     autocmd!
@@ -179,154 +179,146 @@ let g:airline#extensions#tabline#enabled = 1
 let g:airline_powerline_fonts = 1
 
 " Completion config
-set completeopt=menu,menuone,noselect
+set completeopt=menu,menuone,noselect,noinsert,preview
 
-lua << EOF
--- Mappings.
--- See `:help vim.diagnostic.*` for documentation on any of the below functions
-local opts = { noremap=true, silent=true }
-vim.keymap.set('n', '<space>d', vim.diagnostic.open_float, opts)
-vim.keymap.set('n', '<space>dd', require'telescope.builtin'.diagnostics, opts)
-vim.keymap.set('n', '[d', vim.diagnostic.goto_prev, opts)
-vim.keymap.set('n', ']d', vim.diagnostic.goto_next, opts)
-vim.keymap.set('n', '<space>dl', vim.diagnostic.setloclist, opts)
+" lua << EOF
+" -- Mappings.
+" -- See `:help vim.diagnostic.*` for documentation on any of the below functions
+" local opts = { noremap=true, silent=true }
+" vim.keymap.set('n', '<space>d', vim.diagnostic.open_float, opts)
+" vim.keymap.set('n', '<space>dd', require'telescope.builtin'.diagnostics, opts)
+" vim.keymap.set('n', '[d', vim.diagnostic.goto_prev, opts)
+" vim.keymap.set('n', ']d', vim.diagnostic.goto_next, opts)
+" vim.keymap.set('n', '<space>dl', vim.diagnostic.setloclist, opts)
 
--- 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)
-  -- Enable completion triggered by <c-x><c-o>
-  vim.api.nvim_buf_set_option(bufnr, 'omnifunc', 'v:lua.vim.lsp.omnifunc')
+" -- 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)
+"   -- Enable completion triggered by <c-x><c-o>
+"   vim.api.nvim_buf_set_option(bufnr, 'omnifunc', 'v:lua.vim.lsp.omnifunc')
 
-  -- Mappings.
-  -- See `:help vim.lsp.*` for documentation on any of the below functions
-  local bufopts = { noremap=true, silent=true, buffer=bufnr }
-  --vim.keymap.set('n', 'gD', vim.lsp.buf.declaration, bufopts)
-  vim.keymap.set('n', 'gD', require'telescope.builtin'.lsp_type_definitions, bufopts)
-  --vim.keymap.set('n', 'gd', vim.lsp.buf.definition, bufopts)
-  vim.keymap.set('n', 'gd', require'telescope.builtin'.lsp_definitions, bufopts)
-  vim.keymap.set('n', 'K', vim.lsp.buf.hover, bufopts)
-  vim.keymap.set('n', 'gi', require'telescope.builtin'.lsp_implementations, bufopts)
-  vim.keymap.set('n', '<C-k>', vim.lsp.buf.signature_help, bufopts)
-  vim.keymap.set('n', '<space>D', vim.lsp.buf.type_definition, bufopts)
-  vim.keymap.set('n', '<space>rn', vim.lsp.buf.rename, bufopts)
-  vim.keymap.set('n', '<space>ca', vim.lsp.buf.code_action, bufopts)
-  --vim.keymap.set('n', 'gr', vim.lsp.buf.references, bufopts)
-  vim.keymap.set('n', 'gr', require'telescope.builtin'.lsp_references, bufopts)
-  vim.keymap.set('n', '<space>f', vim.lsp.buf.format, bufopts)
-end
-local capabilities = require('cmp_nvim_lsp').default_capabilities(vim.lsp.protocol.make_client_capabilities())
-require('lspconfig')['gopls'].setup{
-    settings = {
-        gopls = {
-            templateExtensions = {'gotmpl', 'gohtml'},
-        }
-    },
-    filetypes = { "go", "gomod", "gowork", "gotmpl", "gohtml", "gohtmltmpl" },
-    on_attach = on_attach,
-    capabilities = capabilities,
-}
-require('lspconfig')['pyright'].setup{
-    on_attach = on_attach,
-    capabilities = capabilities,
-}
-require('lspconfig')['tsserver'].setup{
-    on_attach = on_attach,
-    capabilities = capabilities,
-}
-require('lspconfig')['clangd'].setup{
-    on_attach = on_attach,
-    capabilities = capabilities,
-}
-require('lspconfig')['rust_analyzer'].setup{
-    on_attach = on_attach,
-    capabilities = capabilities,
-}
-require('lspconfig')['bashls'].setup{
-    on_attach = on_attach,
-    capabilities = capabilities,
-}
-EOF
+"   -- Mappings.
+"   -- See `:help vim.lsp.*` for documentation on any of the below functions
+"   local bufopts = { noremap=true, silent=true, buffer=bufnr }
+"   --vim.keymap.set('n', 'gD', vim.lsp.buf.declaration, bufopts)
+"   vim.keymap.set('n', 'gD', require'telescope.builtin'.lsp_type_definitions, bufopts)
+"   --vim.keymap.set('n', 'gd', vim.lsp.buf.definition, bufopts)
+"   vim.keymap.set('n', 'gd', require'telescope.builtin'.lsp_definitions, bufopts)
+"   vim.keymap.set('n', 'K', vim.lsp.buf.hover, bufopts)
+"   vim.keymap.set('n', 'gi', require'telescope.builtin'.lsp_implementations, bufopts)
+"   vim.keymap.set('n', '<C-k>', vim.lsp.buf.signature_help, bufopts)
+"   vim.keymap.set('n', '<space>D', vim.lsp.buf.type_definition, bufopts)
+"   vim.keymap.set('n', '<space>rn', vim.lsp.buf.rename, bufopts)
+"   vim.keymap.set('n', '<space>ca', vim.lsp.buf.code_action, bufopts)
+"   --vim.keymap.set('n', 'gr', vim.lsp.buf.references, bufopts)
+"   vim.keymap.set('n', 'gr', require'telescope.builtin'.lsp_references, bufopts)
+"   vim.keymap.set('n', '<space>f', vim.lsp.buf.format, bufopts)
+" end
+" local capabilities = require('cmp_nvim_lsp').default_capabilities(vim.lsp.protocol.make_client_capabilities())
+" require('lspconfig')['gopls'].setup{
+"     settings = {
+"         gopls = {
+"             templateExtensions = {'gotmpl', 'gohtml'},
+"         }
+"     },
+"     filetypes = { "go", "gomod", "gowork", "gotmpl", "gohtml", "gohtmltmpl" },
+"     on_attach = on_attach,
+"     capabilities = capabilities,
+" }
+" require('lspconfig')['pyright'].setup{
+"     on_attach = on_attach,
+"     capabilities = capabilities,
+" }
+" require('lspconfig')['tsserver'].setup{
+"     on_attach = on_attach,
+"     capabilities = capabilities,
+" }
+" require('lspconfig')['clangd'].setup{
+"     on_attach = on_attach,
+"     capabilities = capabilities,
+" }
+" require('lspconfig')['rust_analyzer'].setup{
+"     on_attach = on_attach,
+"     capabilities = capabilities,
+" }
+" require('lspconfig')['bashls'].setup{
+"     on_attach = on_attach,
+"     capabilities = capabilities,
+" }
+" EOF
 
-lua <<EOF
-  local cmp = require'cmp'
+" lua <<EOF
+"   local cmp = require'cmp'
 
-  cmp.setup({
-    snippet = {
-      expand = function(args)
-        vim.fn["vsnip#anonymous"](args.body)
-      end,
-    },
-    window = {
-      completion = cmp.config.window.bordered(),
-      documentation = cmp.config.window.bordered(),
-    },
-    mapping = cmp.mapping.preset.insert({
-        ["<Tab>"] = cmp.mapping(function(fallback)
-          if cmp.visible() then
-            cmp.select_next_item()
-          elseif luasnip.expand_or_jumpable() then
-            luasnip.expand_or_jump()
-          elseif has_words_before() then
-            cmp.complete()
-          else
-            fallback()
-          end
-        end, { "i", "s" }),
-        ["<S-Tab>"] = cmp.mapping(function(fallback)
-          if cmp.visible() then
-            cmp.select_prev_item()
-          elseif luasnip.jumpable(-1) then
-            luasnip.jump(-1)
-          else
-            fallback()
-          end
-        end, { "i", "s" }),
-      ['<C-b>'] = cmp.mapping.scroll_docs(-4),
-      ['<C-f>'] = cmp.mapping.scroll_docs(4),
-      ['<C-Space>'] = cmp.mapping.complete(),
-      ['<C-e>'] = cmp.mapping.abort(),
-      ['<CR>'] = cmp.mapping.confirm({ select = true }), -- Accept currently selected item. Set `select` to `false` to only confirm explicitly selected items.
-    }),
-    sources = cmp.config.sources({
-      { name = 'nvim_lsp' },
-      { name = 'vsnip' },
-    }, {
-      { name = 'buffer' },
-    })
-  })
+"   cmp.setup({
+"     snippet = {
+"       expand = function(args)
+"         vim.fn["vsnip#anonymous"](args.body)
+"       end,
+"     },
+"     window = {
+"       completion = cmp.config.window.bordered(),
+"       documentation = cmp.config.window.bordered(),
+"     },
+"     mapping = cmp.mapping.preset.insert({
+"         ["<Tab>"] = cmp.mapping(function(fallback)
+"           if cmp.visible() then
+"             cmp.select_next_item()
+"           elseif luasnip.expand_or_jumpable() then
+"             luasnip.expand_or_jump()
+"           elseif has_words_before() then
+"             cmp.complete()
+"           else
+"             fallback()
+"           end
+"         end, { "i", "s" }),
+"         ["<S-Tab>"] = cmp.mapping(function(fallback)
+"           if cmp.visible() then
+"             cmp.select_prev_item()
+"           elseif luasnip.jumpable(-1) then
+"             luasnip.jump(-1)
+"           else
+"             fallback()
+"           end
+"         end, { "i", "s" }),
+"       ['<C-b>'] = cmp.mapping.scroll_docs(-4),
+"       ['<C-f>'] = cmp.mapping.scroll_docs(4),
+"       ['<C-Space>'] = cmp.mapping.complete(),
+"       ['<C-e>'] = cmp.mapping.abort(),
+"       ['<CR>'] = cmp.mapping.confirm({ select = true }), -- Accept currently selected item. Set `select` to `false` to only confirm explicitly selected items.
+"     }),
+"     sources = cmp.config.sources({
+"       { name = 'nvim_lsp' },
+"       { name = 'vsnip' },
+"     }, {
+"       { name = 'buffer' },
+"     })
+"   })
 
-  -- Set configuration for specific filetype.
-  cmp.setup.filetype('gitcommit', {
-    sources = cmp.config.sources({
-      { name = 'cmp_git' },
-    }, {
-      { name = 'buffer' },
-    })
-  })
+"   -- Set configuration for specific filetype.
+"   cmp.setup.filetype('gitcommit', {
+"     sources = cmp.config.sources({
+"       { name = 'cmp_git' },
+"     }, {
+"       { name = 'buffer' },
+"     })
+"   })
 
-  -- Use buffer source for `/` (if you enabled `native_menu`, this won't work anymore).
-  cmp.setup.cmdline('/', {
-    mapping = cmp.mapping.preset.cmdline(),
-    sources = {
-      { name = 'buffer' }
-    }
-  })
+"   -- Use buffer source for `/` (if you enabled `native_menu`, this won't work anymore).
+"   cmp.setup.cmdline('/', {
+"     mapping = cmp.mapping.preset.cmdline(),
+"     sources = {
+"       { name = 'buffer' }
+"     }
+"   })
 
-  -- Use cmdline & path source for ':' (if you enabled `native_menu`, this won't work anymore).
-  cmp.setup.cmdline(':', {
-    mapping = cmp.mapping.preset.cmdline(),
-    sources = cmp.config.sources({
-      { name = 'path' }
-    }, {
-      { name = 'cmdline' }
-    })
-  })
-EOF
-
-lua << EOF
-vim.filetype.add({
-    extension = {
-        gohtml = "gohtmltmpl"
-    }
-})
-EOF
+"   -- Use cmdline & path source for ':' (if you enabled `native_menu`, this won't work anymore).
+"   cmp.setup.cmdline(':', {
+"     mapping = cmp.mapping.preset.cmdline(),
+"     sources = cmp.config.sources({
+"       { name = 'path' }
+"     }, {
+"       { name = 'cmdline' }
+"     })
+"   })
+" EOF
diff --git a/zsh/config.d/gcloud.zsh b/zsh/config.d/gcloud.zsh
index 603c1b8..0c506d2 100644
--- a/zsh/config.d/gcloud.zsh
+++ b/zsh/config.d/gcloud.zsh
@@ -8,3 +8,6 @@ alias startenvoydev="gcloud compute instances start bohanon-envoy-dev --zone us-
 alias stopenvoydev="gcloud compute instances stop bohanon-envoy-dev --zone us-central1-c --project solo-test-236622"
 alias sshenvoydev="gcloud beta compute ssh --zone us-central1-c bohanon-envoy-dev --project solo-test-236622"
 
+alias startoldenvoydev="gcloud compute instances start bohanon-envoy-dev-old --zone us-central1-a --project solo-test-236622 && gcloud compute config-ssh --force-key-file-overwrite --project solo-test-236622"
+alias stopoldenvoydev="gcloud compute instances stop bohanon-envoy-dev-old --zone us-central1-a --project solo-test-236622"
+alias ssholdenvoydev="gcloud beta compute ssh --zone us-central1-a bohanon-envoy-dev-old --project solo-test-236622"