diff --git a/nix/base-system/flake.nix b/nix/base-system/flake.nix
index 193f31b..a340352 100644
--- a/nix/base-system/flake.nix
+++ b/nix/base-system/flake.nix
@@ -62,18 +62,9 @@
                 nvim-web-devicons
                 nvim-lspconfig
                 packer-nvim
-                nvim-cmp
                 vim-lsp
-                cmp-nvim-lua
-                cmp-nvim-lsp
-                cmp-nvim-lsp-signature-help
-                cmp-path
-                cmp-buffer
-                cmp-vsnip
                 vim-vsnip
-                mason-nvim
-                mason-lspconfig-nvim
-                rust-tools-nvim
+                coq_nvim
                 vimspector
                 vimagit
                 hoon-vim
diff --git a/nix/base-system/init.lua b/nix/base-system/init.lua
index 655268b..b51ed96 100644
--- a/nix/base-system/init.lua
+++ b/nix/base-system/init.lua
@@ -13,18 +13,6 @@ require('nightfox').setup({
 })
 vim.cmd("colorscheme carbonfox")
 
--- Mason setup for lsp management
-require("mason").setup({
-    ui = {
-        icons = {
-            package_installed = "*",
-            package_pending = ".";
-    	    package_uninstalled = "-",
-        },
-    }
-})
-require("mason-lspconfig").setup()
-
 --https://github.com/neovim/nvim-lspconfig/blob/master/doc/server_configurations.md
 
 local lsconfig = require("lspconfig")
@@ -46,12 +34,17 @@ lsconfig.rust_analyzer.setup{}
 -- lsp configuration
 vim.api.nvim_create_autocmd('LspAttach', {
   callback = function(args)
-    vim.keymap.set('n', '<C-space>', vim.lsp.buf.hover, { buffer = args.buf })
-    vim.keymap.set({"n", "v"}, "<Leader>a", vim.lsp.buf.code_action, { buffer = args.buf })
-    vim.keymap.set("n", "<M-f>", vim.lsp.buf.references, { buffer = args.buf })
-    vim.keymap.set("n", "<Leader>f", vim.lsp.buf.format, { buffer = args.buf })
+  	local opts = { buffer = args.buf }
+    vim.keymap.set("n", '<C-Space>', function()
+		vim.notify("triggering hover")
+		vim.lsp.buf.hover()
+	end, opts)
+    vim.keymap.set({"n", "v"}, "<Leader>a", vim.lsp.buf.code_action, opts)
+    vim.keymap.set("n", "gr", vim.lsp.buf.references, opts)
+    vim.keymap.set("n", "gd", vim.lsp.buf.definition, opts)
+    vim.keymap.set("n", "<Leader>f", vim.lsp.buf.format, opts)
     -- We use F2 to rename things
-    vim.keymap.set("n", "<F2>", vim.lsp.buf.rename, { buffer = args.buf })
+    vim.keymap.set("n", "<F2>", vim.lsp.buf.rename, opts)
     --vim.keymap.set("n", "", vim.lsp.buf.implementation, { buffer = args.buf })
   end,
 })
@@ -110,59 +103,6 @@ set signcolumn=yes
 autocmd CursorHold * lua vim.diagnostic.open_float(nil, { focusable = false })
 ]])
 
--- Completion Plugin Setup
-local cmp = require'cmp'
-cmp.setup({
-  -- Enable LSP snippets
-  snippet = {
-    expand = function(args)
-        vim.fn["vsnip#anonymous"](args.body)
-    end,
-  },
-  mapping = {
-    ['<C-p>'] = cmp.mapping.select_prev_item(),
-    ['<C-n>'] = cmp.mapping.select_next_item(),
-    -- Add tab support
-    ['<S-Tab>'] = cmp.mapping.select_prev_item(),
-    ['<Tab>'] = cmp.mapping.select_next_item(),
-    ['<C-S-f>'] = cmp.mapping.scroll_docs(-4),
-    ['<C-f>'] = cmp.mapping.scroll_docs(4),
-    ['<C-Space>'] = cmp.mapping.complete(),
-    ['<C-e>'] = cmp.mapping.close(),
-    ['<CR>'] = cmp.mapping.confirm({
-      behavior = cmp.ConfirmBehavior.Insert,
-      select = true,
-    })
-  },
-  -- Installed sources:
-  sources = {
-    { name = 'path' },                              -- file paths
-    { name = 'nvim_lsp', keyword_length = 3 },      -- from language server
-    { name = 'nvim_lsp_signature_help'},            -- display function signatures with current parameter emphasized
-    { name = 'nvim_lua', keyword_length = 2},       -- complete neovim's Lua runtime API such vim.lsp.*
-    { name = 'buffer', keyword_length = 2 },        -- source current buffer
-    { name = 'vsnip', keyword_length = 2 },         -- nvim-cmp source for vim-vsnip 
-    { name = 'calc'},                               -- source for math calculation
-  },
-  window = {
-      completion = cmp.config.window.bordered(),
-      documentation = cmp.config.window.bordered(),
-  },
-  formatting = {
-      fields = {'menu', 'abbr', 'kind'},
-      format = function(entry, item)
-          local menu_icon ={
-              nvim_lsp = 'λ',
-              vsnip = '⋗',
-              buffer = 'Ω',
-              path = '🖫',
-          }
-          item.menu = menu_icon[entry.source.name]
-          return item
-      end,
-  },
-})
-
 -- Treesitter Plugin Setup 
 require('nvim-treesitter.configs').setup {
   highlight = {
@@ -205,4 +145,9 @@ vim.keymap.set("n", "<C-p>", function()
     require("nvim-tree.api").tree.toggle()
 end)
 
-require("nvim-tree.api").tree.toggle()
+vim.keymap.set("i", "<C-j>", function()
+    print("Handling C-J")
+    vim.notify("Handling C-J")
+end)
+
+--require("nvim-tree.api").tree.toggle()
diff --git a/nix/darwin/flake.lock b/nix/darwin/flake.lock
index f0e5a79..0261478 100644
--- a/nix/darwin/flake.lock
+++ b/nix/darwin/flake.lock
@@ -34,12 +34,12 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-SbQ+XfMrqzNICok/PcnjciXYRQPQYtfEuFTKGlKg0c0=",
-        "path": "/nix/store/9y1n15br996sqsh4s4q3j3n16217cnny-source/nix/base-system",
+        "narHash": "sha256-0RGMuP82J/U0JfCVuTlsNat4vIfjNQv9dw+qpGA8EWY=",
+        "path": "/nix/store/wi3k5hsf1ibbasdap31wbprp7f78bsjx-source/nix/base-system",
         "type": "path"
       },
       "original": {
-        "path": "/nix/store/9y1n15br996sqsh4s4q3j3n16217cnny-source/nix/base-system",
+        "path": "/nix/store/wi3k5hsf1ibbasdap31wbprp7f78bsjx-source/nix/base-system",
         "type": "path"
       }
     },