diff --git a/common/.config/manjaro/manjaro-settings-manager.conf b/common/.config/manjaro/manjaro-settings-manager.conf
index de06561..027564a 100644
--- a/common/.config/manjaro/manjaro-settings-manager.conf
+++ b/common/.config/manjaro/manjaro-settings-manager.conf
@@ -1,6 +1,6 @@
 [mainwindow]
-geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\x2\x94\0\0\x1|\0\0\x4\xed\0\0\x3\x35\0\0\x2\x95\0\0\x1}\0\0\x4\xec\0\0\x3\x34\0\0\0\0\0\0\0\0\a\x80\0\0\x2\x95\0\0\x1}\0\0\x4\xec\0\0\x3\x34)
+geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\x3x\0\0\x2\x39\0\0\x6\x84\0\0\x4\xd2\0\0\x3{\0\0\x2U\0\0\x6\x81\0\0\x4\xcf\0\0\0\x1\0\0\0\0\xf\0\0\0\x3{\0\0\x2U\0\0\x6\x81\0\0\x4\xcf)
 maximized=false
-pos=@Point(660 380)
-savestate=@ByteArray(\0\0\0\xff\0\0\0\0\xfd\0\0\0\0\0\0\x2X\0\0\x1\xb8\0\0\0\x4\0\0\0\x4\0\0\0\b\0\0\0\b\xfc\0\0\0\0)
-size=@Size(600 440)
+pos=@Point(888 569)
+savestate=@ByteArray(\0\0\0\xff\0\0\0\0\xfd\0\0\0\0\0\0\x3\a\0\0\x2{\0\0\0\x4\0\0\0\x4\0\0\0\b\0\0\0\b\xfc\0\0\0\0)
+size=@Size(775 635)
diff --git a/common/.config/nvim/lua/lsp-general.lua b/common/.config/nvim/lua/lsp-general.lua
index f86e18c..eddc433 100644
--- a/common/.config/nvim/lua/lsp-general.lua
+++ b/common/.config/nvim/lua/lsp-general.lua
@@ -1,4 +1,6 @@
 local lsp = require('lsp-zero')
+local cmp = require('cmp')
+local luasnip = require('luasnip')
 
 require('mason').setup({})
 require('mason-lspconfig').setup({})
@@ -7,7 +9,7 @@ lsp.preset({
     name = 'recommended',
 })
 
-local rust_lsp = lsp.build_options('rust_analyzer', {})
+
 lsp.ensure_installed({
     'tsserver',
     'clangd',
@@ -19,10 +21,18 @@ lsp.configure('clangd', {
     }
 })
 
-local cmp = require('cmp')
 local cmp_mode = { behavior = cmp.SelectBehavior.Replace }
 local cmp_mappings = lsp.defaults.cmp_mappings({
-    ["<Tab>"] = cmp.mapping.select_next_item(cmp_mode),
+    ["<Tab>"] = cmp.mapping(function(fallback)
+        if (cmp.visible()) then
+            cmp.select_next_item(cmp_mode)
+        elseif luasnip.expand_or_jumpable() then
+          luasnip.expand_or_jump()
+        else
+            fallback()
+        end
+        cmp.mapping.select_next_item(cmp_mode)
+    end, { 'i', 's'}),
     ["<S-Tab>"] = cmp.mapping.select_prev_item(cmp_mode),
 })
 
@@ -56,10 +66,12 @@ lsp.on_attach(function(_, bufnr)
     vim.keymap.set('n', '<Leader>gr', '<CMD>Glance references<CR>', opts)
 end)
 
-lsp.setup()
 
+local rust_lsp = lsp.build_options('rust_analyzer', {})
 require('rust-tools').setup({server = rust_lsp})
 
+lsp.setup()
+
 
 cmp.setup.cmdline('/', {
     sources = {
diff --git a/common/.config/nvim/lua/plugins.lua b/common/.config/nvim/lua/plugins.lua
index e0b4d6f..3b04cba 100644
--- a/common/.config/nvim/lua/plugins.lua
+++ b/common/.config/nvim/lua/plugins.lua
@@ -28,6 +28,8 @@ local packer = require('packer').startup(function(use)
     }
 
     -- git integration
+    use 'tpope/vim-fugitive'
+
     use {
         'lewis6991/gitsigns.nvim',
         requires = { 'nvim-lua/plenary.nvim' },
@@ -36,8 +38,6 @@ local packer = require('packer').startup(function(use)
         end
     }
 
-    use 'tpope/vim-fugitive'
-
     -- speedy searching
     use {
         'ggandor/leap.nvim',