diff --git a/home/config/nvim/init.lua b/home/config/nvim/init.lua
index a10eace..2b94ce6 100644
--- a/home/config/nvim/init.lua
+++ b/home/config/nvim/init.lua
@@ -22,4 +22,127 @@ return require('packer').startup(function(use)
   if packer_bootstrap then
     require('packer').sync()
   end
+
+  require("mason").setup()
+
+  local rt = require("rust-tools")
+  rt.setup({
+    server = {
+      on_attach = function(_, bufnr)
+        -- Hover actions
+        vim.keymap.set("n", "<C-space>", rt.hover_actions.hover_actions, { buffer = bufnr })
+        -- Code action groups
+        vim.keymap.set("n", "<Leader>a", rt.code_action_group.code_action_group, { buffer = bufnr })
+      end,
+    },
+  })
+  -- LSP Diagnostics Options Setup 
+  local sign = function(opts)
+    vim.fn.sign_define(opts.name, {
+      texthl = opts.name,
+      text = opts.text,
+      numhl = ''
+    })
+  end
+  
+  sign({name = 'DiagnosticSignError', text = ''})
+  sign({name = 'DiagnosticSignWarn', text = ''})
+  sign({name = 'DiagnosticSignHint', text = ''})
+  sign({name = 'DiagnosticSignInfo', text = ''})
+  
+  vim.diagnostic.config({
+      virtual_text = false,
+      signs = true,
+      update_in_insert = true,
+      underline = true,
+      severity_sort = false,
+      float = {
+          border = 'rounded',
+          source = 'always',
+          header = '',
+          prefix = '',
+      },
+  })
+  
+  vim.cmd([[
+  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,
+    },
+  })
+
+
+  require('nvim-treesitter.configs').setup {
+    ensure_installed = {
+      "bash", "c", "c_sharp", "cmake", "cpp", "css", "diff", "dockerfile", "fish", "git_rebase",
+      "gitattributes", "gitcommit", "gitignore", "go", "gomod", "html", "htmldjango", "http", "ini",
+      "java", "javascript", "jq", "jsdoc", "json", "json5", "jsonc", "llvm", "lua", "m68k", "make", 
+      "markdown", "markdown_inline", "nix", "python", "rst", "ruby", "rust", "scss", "sql", "terraform",
+      "toml", "tsx", "typescript", "vim", "vue", "yaml"
+    },
+    auto_install = true,
+    highlight = {
+      enable = true,
+      additional_vim_regex_highlighting=false,
+    },
+    ident = { enable = true }, 
+    rainbow = {
+      enable = true,
+      extended_mode = true,
+      max_file_lines = nil,
+    }
+  }
+  
 end)
diff --git a/home/config/nvim/lua/opts.lua b/home/config/nvim/lua/opts.lua
new file mode 100644
index 0000000..f5e2537
--- /dev/null
+++ b/home/config/nvim/lua/opts.lua
@@ -0,0 +1,13 @@
+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 0700576..0054434 100644
--- a/home/config/nvim/lua/plugins.lua
+++ b/home/config/nvim/lua/plugins.lua
@@ -12,6 +12,23 @@ return function(use)
   -- require("nvim-treesitter.configs").setup({
   --   parser_install_dir = parser_install_dir,
   -- })
+  
+  use({"williamboman/mason.nvim"})
+  use({'williamboman/mason-lspconfig.nvim'})
+  use({'neovim/nvim-lspconfig'})
+  use({'simrat39/rust-tools.nvim'})
+  use({'hrsh7th/nvim-cmp'})
+  -- LSP completion source:
+  use({'hrsh7th/cmp-nvim-lsp'})
+  -- Useful completion sources:
+  use({'hrsh7th/cmp-nvim-lua'})
+  use({'hrsh7th/cmp-nvim-lsp-signature-help'})
+  use({'hrsh7th/cmp-vsnip'})
+  use({'hrsh7th/cmp-path'})
+  use({'hrsh7th/cmp-buffer'})
+  use({'hrsh7th/vim-vsnip'})
+  use({'nvim-treesitter/nvim-treesitter'})
+
 
   use({'atelierbram/vim-colors_atelier-schemes'})
   use({'robertmeta/nofrils'})
diff --git a/home/config/nvim/lua/settings.lua b/home/config/nvim/lua/settings.lua
index b3f8993..13c0226 100644
--- a/home/config/nvim/lua/settings.lua
+++ b/home/config/nvim/lua/settings.lua
@@ -40,7 +40,7 @@ vim.opt.undofile = true
 vim.opt.number = true
 vim.opt.relativenumber = true
 
-vim.cmd 'colorscheme Atelier_SulphurpoolDark'
+vim.cmd 'colorscheme jellybeans'
 vim.g.floaterm_keymap_toggle = '<F9>'
 vim.g.floaterm_width = 0.9
 vim.g.floaterm_height = 0.9
diff --git a/home/config/nvim/plugin/packer_compiled.lua b/home/config/nvim/plugin/packer_compiled.lua
new file mode 100644
index 0000000..106a2d7
--- /dev/null
+++ b/home/config/nvim/plugin/packer_compiled.lua
@@ -0,0 +1,250 @@
+-- Automatically generated packer.nvim plugin loader code
+
+if vim.api.nvim_call_function('has', {'nvim-0.5'}) ~= 1 then
+  vim.api.nvim_command('echohl WarningMsg | echom "Invalid Neovim version for packer.nvim! | echohl None"')
+  return
+end
+
+vim.api.nvim_command('packadd packer.nvim')
+
+local no_errors, error_msg = pcall(function()
+
+_G._packer = _G._packer or {}
+_G._packer.inside_compile = true
+
+local time
+local profile_info
+local should_profile = false
+if should_profile then
+  local hrtime = vim.loop.hrtime
+  profile_info = {}
+  time = function(chunk, start)
+    if start then
+      profile_info[chunk] = hrtime()
+    else
+      profile_info[chunk] = (hrtime() - profile_info[chunk]) / 1e6
+    end
+  end
+else
+  time = function(chunk, start) end
+end
+
+local function save_profiles(threshold)
+  local sorted_times = {}
+  for chunk_name, time_taken in pairs(profile_info) do
+    sorted_times[#sorted_times + 1] = {chunk_name, time_taken}
+  end
+  table.sort(sorted_times, function(a, b) return a[2] > b[2] end)
+  local results = {}
+  for i, elem in ipairs(sorted_times) do
+    if not threshold or threshold and elem[2] > threshold then
+      results[i] = elem[1] .. ' took ' .. elem[2] .. 'ms'
+    end
+  end
+  if threshold then
+    table.insert(results, '(Only showing plugins that took longer than ' .. threshold .. ' ms ' .. 'to load)')
+  end
+
+  _G._packer.profile_output = results
+end
+
+time([[Luarocks path setup]], true)
+local package_path_str = "/home/tyrel/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?.lua;/home/tyrel/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?/init.lua;/home/tyrel/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?.lua;/home/tyrel/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?/init.lua"
+local install_cpath_pattern = "/home/tyrel/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/lua/5.1/?.so"
+if not string.find(package.path, package_path_str, 1, true) then
+  package.path = package.path .. ';' .. package_path_str
+end
+
+if not string.find(package.cpath, install_cpath_pattern, 1, true) then
+  package.cpath = package.cpath .. ';' .. install_cpath_pattern
+end
+
+time([[Luarocks path setup]], false)
+time([[try_loadstring definition]], true)
+local function try_loadstring(s, component, name)
+  local success, result = pcall(loadstring(s), name, _G.packer_plugins[name])
+  if not success then
+    vim.schedule(function()
+      vim.api.nvim_notify('packer.nvim: Error running ' .. component .. ' for ' .. name .. ': ' .. result, vim.log.levels.ERROR, {})
+    end)
+  end
+  return result
+end
+
+time([[try_loadstring definition]], false)
+time([[Defining packer_plugins]], true)
+_G.packer_plugins = {
+  ["auto-session"] = {
+    loaded = true,
+    path = "/home/tyrel/.local/share/nvim/site/pack/packer/start/auto-session",
+    url = "https://github.com/rmagatti/auto-session"
+  },
+  fzf = {
+    loaded = true,
+    path = "/home/tyrel/.local/share/nvim/site/pack/packer/start/fzf",
+    url = "https://github.com/junegunn/fzf"
+  },
+  ["fzf.vim"] = {
+    loaded = true,
+    path = "/home/tyrel/.local/share/nvim/site/pack/packer/start/fzf.vim",
+    url = "https://github.com/junegunn/fzf.vim"
+  },
+  ["jellybeans.vim"] = {
+    loaded = true,
+    path = "/home/tyrel/.local/share/nvim/site/pack/packer/start/jellybeans.vim",
+    url = "https://github.com/nanotech/jellybeans.vim"
+  },
+  ["lualine.nvim"] = {
+    loaded = true,
+    path = "/home/tyrel/.local/share/nvim/site/pack/packer/start/lualine.nvim",
+    url = "https://github.com/nvim-lualine/lualine.nvim"
+  },
+  ["mason-lspconfig.nvim"] = {
+    loaded = true,
+    path = "/home/tyrel/.local/share/nvim/site/pack/packer/start/mason-lspconfig.nvim",
+    url = "https://github.com/williamboman/mason-lspconfig.nvim"
+  },
+  ["mason.nvim"] = {
+    loaded = true,
+    path = "/home/tyrel/.local/share/nvim/site/pack/packer/start/mason.nvim",
+    url = "https://github.com/williamboman/mason.nvim"
+  },
+  nerdtree = {
+    loaded = true,
+    path = "/home/tyrel/.local/share/nvim/site/pack/packer/start/nerdtree",
+    url = "https://github.com/preservim/nerdtree"
+  },
+  nofrils = {
+    loaded = true,
+    path = "/home/tyrel/.local/share/nvim/site/pack/packer/start/nofrils",
+    url = "https://github.com/robertmeta/nofrils"
+  },
+  ["nvim-web-devicons"] = {
+    loaded = false,
+    needs_bufread = false,
+    path = "/home/tyrel/.local/share/nvim/site/pack/packer/opt/nvim-web-devicons",
+    url = "https://github.com/kyazdani42/nvim-web-devicons"
+  },
+  ["packer.nvim"] = {
+    loaded = true,
+    path = "/home/tyrel/.local/share/nvim/site/pack/packer/start/packer.nvim",
+    url = "https://github.com/wbthomason/packer.nvim"
+  },
+  ["peg.vim"] = {
+    loaded = true,
+    path = "/home/tyrel/.local/share/nvim/site/pack/packer/start/peg.vim",
+    url = "https://github.com/gf3/peg.vim"
+  },
+  ["plenary.nvim"] = {
+    loaded = true,
+    path = "/home/tyrel/.local/share/nvim/site/pack/packer/start/plenary.nvim",
+    url = "https://github.com/nvim-lua/plenary.nvim"
+  },
+  ["space-vim-dark"] = {
+    loaded = true,
+    path = "/home/tyrel/.local/share/nvim/site/pack/packer/start/space-vim-dark",
+    url = "https://github.com/liuchengxu/space-vim-dark"
+  },
+  tagbar = {
+    loaded = true,
+    path = "/home/tyrel/.local/share/nvim/site/pack/packer/start/tagbar",
+    url = "https://github.com/majutsushi/tagbar"
+  },
+  ["telescope.nvim"] = {
+    config = { "\27LJ\2\nt\0\0\4\0\6\0\t6\0\0\0'\2\1\0B\0\2\0029\0\2\0005\2\4\0005\3\3\0=\3\5\2B\0\2\1K\0\1\0\25file_ignore_patterns\1\0\0\1\3\0\0\17node_modules\f./venv/\nsetup\14telescope\frequire\0" },
+    loaded = true,
+    path = "/home/tyrel/.local/share/nvim/site/pack/packer/start/telescope.nvim",
+    url = "https://github.com/nvim-telescope/telescope.nvim"
+  },
+  ["vim-buffergator"] = {
+    loaded = true,
+    path = "/home/tyrel/.local/share/nvim/site/pack/packer/start/vim-buffergator",
+    url = "https://github.com/jeetsukumaran/vim-buffergator"
+  },
+  ["vim-buftabline"] = {
+    loaded = true,
+    path = "/home/tyrel/.local/share/nvim/site/pack/packer/start/vim-buftabline",
+    url = "https://github.com/ap/vim-buftabline"
+  },
+  ["vim-colors_atelier-schemes"] = {
+    loaded = true,
+    path = "/home/tyrel/.local/share/nvim/site/pack/packer/start/vim-colors_atelier-schemes",
+    url = "https://github.com/atelierbram/vim-colors_atelier-schemes"
+  },
+  ["vim-floaterm"] = {
+    loaded = true,
+    path = "/home/tyrel/.local/share/nvim/site/pack/packer/start/vim-floaterm",
+    url = "https://github.com/voldikss/vim-floaterm"
+  },
+  ["vim-fugitive"] = {
+    loaded = true,
+    path = "/home/tyrel/.local/share/nvim/site/pack/packer/start/vim-fugitive",
+    url = "https://github.com/tpope/vim-fugitive"
+  },
+  ["vim-gitgutter"] = {
+    loaded = true,
+    path = "/home/tyrel/.local/share/nvim/site/pack/packer/start/vim-gitgutter",
+    url = "https://github.com/airblade/vim-gitgutter"
+  },
+  ["vim-go"] = {
+    loaded = true,
+    path = "/home/tyrel/.local/share/nvim/site/pack/packer/start/vim-go",
+    url = "https://github.com/fatih/vim-go"
+  },
+  ["vim-gotham"] = {
+    loaded = true,
+    path = "/home/tyrel/.local/share/nvim/site/pack/packer/start/vim-gotham",
+    url = "https://github.com/whatyouhide/vim-gotham"
+  },
+  ["vim-gutentags"] = {
+    loaded = true,
+    path = "/home/tyrel/.local/share/nvim/site/pack/packer/start/vim-gutentags",
+    url = "https://github.com/ludovicchabant/vim-gutentags"
+  },
+  ["vim-monokai"] = {
+    loaded = true,
+    path = "/home/tyrel/.local/share/nvim/site/pack/packer/start/vim-monokai",
+    url = "https://github.com/sickill/vim-monokai"
+  },
+  ["vim-rhubarb"] = {
+    loaded = true,
+    path = "/home/tyrel/.local/share/nvim/site/pack/packer/start/vim-rhubarb",
+    url = "https://github.com/tpope/vim-rhubarb"
+  },
+  ["vim-startify"] = {
+    loaded = true,
+    path = "/home/tyrel/.local/share/nvim/site/pack/packer/start/vim-startify",
+    url = "https://github.com/mhinz/vim-startify"
+  },
+  ["vim-terraform"] = {
+    loaded = true,
+    path = "/home/tyrel/.local/share/nvim/site/pack/packer/start/vim-terraform",
+    url = "https://github.com/hashivim/vim-terraform"
+  },
+  ["vim-test"] = {
+    loaded = true,
+    path = "/home/tyrel/.local/share/nvim/site/pack/packer/start/vim-test",
+    url = "https://github.com/vim-test/vim-test"
+  }
+}
+
+time([[Defining packer_plugins]], false)
+-- Config for: telescope.nvim
+time([[Config for telescope.nvim]], true)
+try_loadstring("\27LJ\2\nt\0\0\4\0\6\0\t6\0\0\0'\2\1\0B\0\2\0029\0\2\0005\2\4\0005\3\3\0=\3\5\2B\0\2\1K\0\1\0\25file_ignore_patterns\1\0\0\1\3\0\0\17node_modules\f./venv/\nsetup\14telescope\frequire\0", "config", "telescope.nvim")
+time([[Config for telescope.nvim]], false)
+
+_G._packer.inside_compile = false
+if _G._packer.needs_bufread == true then
+  vim.cmd("doautocmd BufRead")
+end
+_G._packer.needs_bufread = false
+
+if should_profile then save_profiles() end
+
+end)
+
+if not no_errors then
+  error_msg = error_msg:gsub('"', '\\"')
+  vim.api.nvim_command('echohl ErrorMsg | echom "Error in packer_compiled: '..error_msg..'" | echom "Please check your config for correctness" | echohl None')
+end