diff --git a/home/config/nvim/init.lua b/home/config/nvim/init.lua
index 2b94ce6..5dec9e3 100644
--- a/home/config/nvim/init.lua
+++ b/home/config/nvim/init.lua
@@ -145,4 +145,43 @@ return require('packer').startup(function(use)
     }
   }
   
+
+  -- KEYS
+  -- Vimspector
+  vim.cmd([[
+    nmap <Leader><F6> <cmd>call vimspector#Launch()<cr>
+    nmap <Leader><F7> <cmd>call vimspector#StepOver()<cr>
+    nmap <Leader><F4> <cmd>call vimspector#Reset()<cr>
+    nmap <Leader><F11> <cmd>call vimspector#StepOver()<cr>")
+    nmap <Leader><F12> <cmd>call vimspector#StepOut()<cr>")
+    nmap <Leader><F10> <cmd>call vimspector#StepInto()<cr>")
+    map('n', "Db", ":call vimspector#ToggleBreakpoint()<cr>")
+    map('n', "Dw", ":call vimspector#AddWatch()<cr>")
+    map('n', "De", ":call vimspector#Evaluate()<cr>")
+  ]])
+
+  -- OPTS
+  vim.opt.completeopt = {'menuone', 'noselect', 'noinsert'}
+  vim.opt.shortmess = vim.opt.shortmess + { c = true}
+  vim.api.nvim_set_option('updatetime', 300) 
+  
+  -- Fixed column for diagnostics to appear
+  -- Show autodiagnostic popup on cursor hover_range
+  -- Goto previous / next diagnostic warning / error 
+  -- Show inlay_hints more frequently 
+  vim.cmd([[
+    set signcolumn=yes
+    autocmd CursorHold * lua vim.diagnostic.open_float(nil, { focusable = false })
+  ]])
+  
+  
+  
+  vim.cmd([[
+  let g:vimspector_sidebar_width = 85
+  let g:vimspector_bottombar_height = 15
+  let g:vimspector_terminal_maxwidth = 70
+  ]])
+
+
+
 end)
diff --git a/home/config/nvim/keys.lua b/home/config/nvim/keys.lua
new file mode 100644
index 0000000..e69de29
diff --git a/home/config/nvim/lua/opts.lua b/home/config/nvim/lua/opts.lua
deleted file mode 100644
index f5e2537..0000000
--- a/home/config/nvim/lua/opts.lua
+++ /dev/null
@@ -1,13 +0,0 @@
-vim.opt.completeopt = {'menuone', 'noselect', 'noinsert'}
-vim.opt.shortmess = vim.opt.shortmess + { c = true}
-vim.api.nvim_set_option('updatetime', 300) 
-
--- Fixed column for diagnostics to appear
--- Show autodiagnostic popup on cursor hover_range
--- Goto previous / next diagnostic warning / error 
--- Show inlay_hints more frequently 
-vim.cmd([[
-set signcolumn=yes
-autocmd CursorHold * lua vim.diagnostic.open_float(nil, { focusable = false })
-]])
-
diff --git a/home/config/nvim/lua/plugins.lua b/home/config/nvim/lua/plugins.lua
index 0054434..f1ae7a5 100644
--- a/home/config/nvim/lua/plugins.lua
+++ b/home/config/nvim/lua/plugins.lua
@@ -66,4 +66,7 @@ return function(use)
     config = function () require('telescope').setup{ file_ignore_patterns = {"node_modules","./venv/"} } end
   })
 
+
+  use({'puremourning/vimspector'})
+
 end
diff --git a/home/config/nvim/plugin/packer_compiled.lua b/home/config/nvim/plugin/packer_compiled.lua
index 106a2d7..8fd2671 100644
--- a/home/config/nvim/plugin/packer_compiled.lua
+++ b/home/config/nvim/plugin/packer_compiled.lua
@@ -79,6 +79,36 @@ _G.packer_plugins = {
     path = "/home/tyrel/.local/share/nvim/site/pack/packer/start/auto-session",
     url = "https://github.com/rmagatti/auto-session"
   },
+  ["cmp-buffer"] = {
+    loaded = true,
+    path = "/home/tyrel/.local/share/nvim/site/pack/packer/start/cmp-buffer",
+    url = "https://github.com/hrsh7th/cmp-buffer"
+  },
+  ["cmp-nvim-lsp"] = {
+    loaded = true,
+    path = "/home/tyrel/.local/share/nvim/site/pack/packer/start/cmp-nvim-lsp",
+    url = "https://github.com/hrsh7th/cmp-nvim-lsp"
+  },
+  ["cmp-nvim-lsp-signature-help"] = {
+    loaded = true,
+    path = "/home/tyrel/.local/share/nvim/site/pack/packer/start/cmp-nvim-lsp-signature-help",
+    url = "https://github.com/hrsh7th/cmp-nvim-lsp-signature-help"
+  },
+  ["cmp-nvim-lua"] = {
+    loaded = true,
+    path = "/home/tyrel/.local/share/nvim/site/pack/packer/start/cmp-nvim-lua",
+    url = "https://github.com/hrsh7th/cmp-nvim-lua"
+  },
+  ["cmp-path"] = {
+    loaded = true,
+    path = "/home/tyrel/.local/share/nvim/site/pack/packer/start/cmp-path",
+    url = "https://github.com/hrsh7th/cmp-path"
+  },
+  ["cmp-vsnip"] = {
+    loaded = true,
+    path = "/home/tyrel/.local/share/nvim/site/pack/packer/start/cmp-vsnip",
+    url = "https://github.com/hrsh7th/cmp-vsnip"
+  },
   fzf = {
     loaded = true,
     path = "/home/tyrel/.local/share/nvim/site/pack/packer/start/fzf",
@@ -119,6 +149,21 @@ _G.packer_plugins = {
     path = "/home/tyrel/.local/share/nvim/site/pack/packer/start/nofrils",
     url = "https://github.com/robertmeta/nofrils"
   },
+  ["nvim-cmp"] = {
+    loaded = true,
+    path = "/home/tyrel/.local/share/nvim/site/pack/packer/start/nvim-cmp",
+    url = "https://github.com/hrsh7th/nvim-cmp"
+  },
+  ["nvim-lspconfig"] = {
+    loaded = true,
+    path = "/home/tyrel/.local/share/nvim/site/pack/packer/start/nvim-lspconfig",
+    url = "https://github.com/neovim/nvim-lspconfig"
+  },
+  ["nvim-treesitter"] = {
+    loaded = true,
+    path = "/home/tyrel/.local/share/nvim/site/pack/packer/start/nvim-treesitter",
+    url = "https://github.com/nvim-treesitter/nvim-treesitter"
+  },
   ["nvim-web-devicons"] = {
     loaded = false,
     needs_bufread = false,
@@ -140,6 +185,11 @@ _G.packer_plugins = {
     path = "/home/tyrel/.local/share/nvim/site/pack/packer/start/plenary.nvim",
     url = "https://github.com/nvim-lua/plenary.nvim"
   },
+  ["rust-tools.nvim"] = {
+    loaded = true,
+    path = "/home/tyrel/.local/share/nvim/site/pack/packer/start/rust-tools.nvim",
+    url = "https://github.com/simrat39/rust-tools.nvim"
+  },
   ["space-vim-dark"] = {
     loaded = true,
     path = "/home/tyrel/.local/share/nvim/site/pack/packer/start/space-vim-dark",
@@ -225,6 +275,11 @@ _G.packer_plugins = {
     loaded = true,
     path = "/home/tyrel/.local/share/nvim/site/pack/packer/start/vim-test",
     url = "https://github.com/vim-test/vim-test"
+  },
+  ["vim-vsnip"] = {
+    loaded = true,
+    path = "/home/tyrel/.local/share/nvim/site/pack/packer/start/vim-vsnip",
+    url = "https://github.com/hrsh7th/vim-vsnip"
   }
 }