From ec2fd73bc9a72040daf471c4e51ba16a99de73aa Mon Sep 17 00:00:00 2001
From: Cody Hiar <cody@hiar.ca>
Date: Thu, 2 Mar 2023 13:53:35 -0700
Subject: Revert "testing copilot"

This reverts commit fe0e6818d1ac1d89465c94457a961b5d54436d67.
---
 flake.nix |  3 +--
 init.lua  | 92 +++++++++++++++++++++++++++++++--------------------------------
 2 files changed, 47 insertions(+), 48 deletions(-)

diff --git a/flake.nix b/flake.nix
index 3c7161c..cab6a93 100644
--- a/flake.nix
+++ b/flake.nix
@@ -68,7 +68,7 @@
                   # Autocompletes
                   nvim-lspconfig
                   nvim-cmp
-                  /* cmp-nvim-lsp */
+                  cmp-nvim-lsp
 
                   # File navigation
                   lf-vim
@@ -92,7 +92,6 @@
                   LanguageTool-nvim
                   camelcasemotion
                   vim-table-mode
-                  copilot-vim
                 ];
               };
             };
diff --git a/init.lua b/init.lua
index 6b436e9..b17b046 100644
--- a/init.lua
+++ b/init.lua
@@ -222,53 +222,53 @@ end
 -- local servers = { 'pyls', 'rust_analyzer', 'tsserver' }
 local servers = { 'jedi_language_server', 'bashls', 'terraformls' }
 -- Add additional capabilities supported by nvim-cmp
--- local capabilities = vim.lsp.protocol.make_client_capabilities()
--- capabilities = require('cmp_nvim_lsp').update_capabilities(capabilities)
--- -- Setup language servers
--- for _, lsp in ipairs(servers) do
---     nvim_lsp[lsp].setup {
---         on_attach = on_attach,
---         flags = {
---             debounce_text_changes = 150,
---         },
---         capabilities = capabilities,
---     }
--- end
--- -- Set completeopt to have a better completion experience
--- vim.o.completeopt = 'menuone,noselect'
+local capabilities = vim.lsp.protocol.make_client_capabilities()
+capabilities = require('cmp_nvim_lsp').update_capabilities(capabilities)
+-- Setup language servers
+for _, lsp in ipairs(servers) do
+    nvim_lsp[lsp].setup {
+        on_attach = on_attach,
+        flags = {
+            debounce_text_changes = 150,
+        },
+        capabilities = capabilities,
+    }
+end
+-- Set completeopt to have a better completion experience
+vim.o.completeopt = 'menuone,noselect'
 -- nvim-cmp setup
--- local cmp = require 'cmp'
--- cmp.setup {
---   mapping = {
---     ['<C-p>'] = cmp.mapping.select_prev_item(),
---     ['<C-n>'] = cmp.mapping.select_next_item(),
---     ['<C-d>'] = cmp.mapping.scroll_docs(-4),
---     ['<C-f>'] = cmp.mapping.scroll_docs(4),
---     ['<C-k>'] = cmp.mapping.complete(),
---     ['<C-e>'] = cmp.mapping.close(),
---     ['<CR>'] = cmp.mapping.confirm {
---       behavior = cmp.ConfirmBehavior.Replace,
---       select = true,
---     },
---     ['<Tab>'] = function(fallback)
---       if cmp.visible() then
---         cmp.select_next_item()
---       else
---         fallback()
---       end
---     end,
---     ['<S-Tab>'] = function(fallback)
---       if cmp.visible() then
---         cmp.select_prev_item()
---       else
---         fallback()
---       end
---     end,
---   },
---   sources = {
---     { name = 'nvim_lsp' },
---   },
--- }
+local cmp = require 'cmp'
+cmp.setup {
+  mapping = {
+    ['<C-p>'] = cmp.mapping.select_prev_item(),
+    ['<C-n>'] = cmp.mapping.select_next_item(),
+    ['<C-d>'] = cmp.mapping.scroll_docs(-4),
+    ['<C-f>'] = cmp.mapping.scroll_docs(4),
+    ['<C-k>'] = cmp.mapping.complete(),
+    ['<C-e>'] = cmp.mapping.close(),
+    ['<CR>'] = cmp.mapping.confirm {
+      behavior = cmp.ConfirmBehavior.Replace,
+      select = true,
+    },
+    ['<Tab>'] = function(fallback)
+      if cmp.visible() then
+        cmp.select_next_item()
+      else
+        fallback()
+      end
+    end,
+    ['<S-Tab>'] = function(fallback)
+      if cmp.visible() then
+        cmp.select_prev_item()
+      else
+        fallback()
+      end
+    end,
+  },
+  sources = {
+    { name = 'nvim_lsp' },
+  },
+}
 
 -- nvim-fzf
 vim.api.nvim_set_keymap('n', '<leader>ff', "<cmd>Files<cr>", { noremap = true })
-- 
cgit v1.2.3