diff --git a/alacritty/.config/alacritty/alacritty.yml b/alacritty/.config/alacritty/alacritty.yml
index 965b4e9..fb64d24 100644
--- a/alacritty/.config/alacritty/alacritty.yml
+++ b/alacritty/.config/alacritty/alacritty.yml
@@ -1,5 +1,5 @@
 window:
-  opacity: 0.8
+  opacity: 0.9
 
 font:
   size: 14
diff --git a/nvim/.config/nvim/after/plugin/possession.lua b/nvim/.config/nvim/after/plugin/possession.lua
index 0c59246..14262ea 100644
--- a/nvim/.config/nvim/after/plugin/possession.lua
+++ b/nvim/.config/nvim/after/plugin/possession.lua
@@ -1,9 +1,9 @@
-require('possession').setup{
-autosave = {
-	current = false,  -- or fun(name): boolean
-	tmp = true,  -- or fun(): boolean
-	tmp_name = 'tmp',
-	on_load = true,
-	on_quit = true,
-}
-}
+-- require('possession').setup{
+-- autosave = {
+-- 	current = false,  -- or fun(name): boolean
+-- 	tmp = true,  -- or fun(): boolean
+-- 	tmp_name = 'tmp',
+-- 	on_load = true,
+-- 	on_quit = true,
+-- }
+-- }
diff --git a/nvim/.config/nvim/after/plugin/telescope.lua b/nvim/.config/nvim/after/plugin/telescope.lua
index 478904f..417fb91 100644
--- a/nvim/.config/nvim/after/plugin/telescope.lua
+++ b/nvim/.config/nvim/after/plugin/telescope.lua
@@ -12,5 +12,5 @@ require("telescope").setup{
 require("telescope").load_extension("fzf")
 require("telescope").load_extension("file_browser")
 require("telescope").load_extension("neoclip")
-require("telescope").load_extension("possession")
-require("telescope").load_extension("repo")
+-- require("telescope").load_extension("possession")
+-- require("telescope").load_extension("repo")
diff --git a/nvim/.config/nvim/lua/clint/plugins.lua b/nvim/.config/nvim/lua/clint/plugins.lua
index a64df3b..a4cab82 100644
--- a/nvim/.config/nvim/lua/clint/plugins.lua
+++ b/nvim/.config/nvim/lua/clint/plugins.lua
@@ -28,26 +28,22 @@ return require('packer').startup(function(use)
 	use('ajmwagar/vim-deus')
 
 	-- airline
-	use('vim-airline/vim-airline')
-	use('vim-airline/vim-airline-themes')
+	use('nvim-lualine/lualine.nvim')
 
 	-- Git
-	use('tpope/vim-fugitive')
+	use('kdheepak/lazygit.nvim')
 
 	-- Sessions
-	-- use('tpope/vim-obsession')
 	use {
     'jedrzejboczar/possession.nvim',
     requires = { 'nvim-lua/plenary.nvim' },
 	}
 
-	-- NerdTree stuff
-	use('preservim/nerdtree')
-	use('Xuyuanp/nerdtree-git-plugin')
-	use('ryanoasis/vim-devicons')
-
 	-- SuperTab
 	use('ervandew/supertab')
+	
+	-- Vim-surround
+	use('tpope/vim-surround')
 
  	-- Slime, for tmux repl-ing
 	use('jpalardy/vim-slime')
diff --git a/nvim/.config/nvim/plugin/packer_compiled.lua b/nvim/.config/nvim/plugin/packer_compiled.lua
index 475005f..41a08c3 100644
--- a/nvim/.config/nvim/plugin/packer_compiled.lua
+++ b/nvim/.config/nvim/plugin/packer_compiled.lua
@@ -74,10 +74,11 @@ end
 time([[try_loadstring definition]], false)
 time([[Defining packer_plugins]], true)
 _G.packer_plugins = {
-  ["ayu-vim"] = {
+  ["Comment.nvim"] = {
+    config = { "\27LJ\2\n5\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\fComment\frequire\0" },
     loaded = true,
-    path = "/Users/clintmccay/.local/share/nvim/site/pack/packer/start/ayu-vim",
-    url = "https://github.com/ayu-theme/ayu-vim"
+    path = "/Users/clintmccay/.local/share/nvim/site/pack/packer/start/Comment.nvim",
+    url = "https://github.com/numToStr/Comment.nvim"
   },
   ["cmp-buffer"] = {
     loaded = true,
@@ -109,20 +110,35 @@ _G.packer_plugins = {
     path = "/Users/clintmccay/.local/share/nvim/site/pack/packer/start/gruvbox",
     url = "https://github.com/morhetz/gruvbox"
   },
+  ["lazygit.nvim"] = {
+    loaded = true,
+    path = "/Users/clintmccay/.local/share/nvim/site/pack/packer/start/lazygit.nvim",
+    url = "https://github.com/kdheepak/lazygit.nvim"
+  },
+  ["lualine.nvim"] = {
+    loaded = true,
+    path = "/Users/clintmccay/.local/share/nvim/site/pack/packer/start/lualine.nvim",
+    url = "https://github.com/nvim-lualine/lualine.nvim"
+  },
+  melange = {
+    loaded = true,
+    path = "/Users/clintmccay/.local/share/nvim/site/pack/packer/start/melange",
+    url = "https://github.com/savq/melange"
+  },
   minimalist = {
     loaded = true,
     path = "/Users/clintmccay/.local/share/nvim/site/pack/packer/start/minimalist",
     url = "https://github.com/dikiaap/minimalist"
   },
-  nerdtree = {
+  ["neovim-ayu"] = {
     loaded = true,
-    path = "/Users/clintmccay/.local/share/nvim/site/pack/packer/start/nerdtree",
-    url = "https://github.com/preservim/nerdtree"
+    path = "/Users/clintmccay/.local/share/nvim/site/pack/packer/start/neovim-ayu",
+    url = "https://github.com/Shatur/neovim-ayu"
   },
-  ["nerdtree-git-plugin"] = {
+  nvim = {
     loaded = true,
-    path = "/Users/clintmccay/.local/share/nvim/site/pack/packer/start/nerdtree-git-plugin",
-    url = "https://github.com/Xuyuanp/nerdtree-git-plugin"
+    path = "/Users/clintmccay/.local/share/nvim/site/pack/packer/start/nvim",
+    url = "https://github.com/catppuccin/nvim"
   },
   ["nvim-cmp"] = {
     loaded = true,
@@ -135,11 +151,16 @@ _G.packer_plugins = {
     url = "https://github.com/neovim/nvim-lspconfig"
   },
   ["nvim-neoclip.lua"] = {
-    config = { "\27LJ\2\n5\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\fneoclip\frequire\0" },
+    config = { "\27LJ\2\nh\0\0\3\0\4\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0005\2\3\0B\0\2\1K\0\1\0\1\0\2\20continuous_sync\2\30enable_persistent_history\2\nsetup\fneoclip\frequire\0" },
     loaded = true,
     path = "/Users/clintmccay/.local/share/nvim/site/pack/packer/start/nvim-neoclip.lua",
     url = "https://github.com/AckslD/nvim-neoclip.lua"
   },
+  ["nvim-treesitter"] = {
+    loaded = true,
+    path = "/Users/clintmccay/.local/share/nvim/site/pack/packer/start/nvim-treesitter",
+    url = "https://github.com/nvim-treesitter/nvim-treesitter"
+  },
   ["nvim-web-devicons"] = {
     loaded = true,
     path = "/Users/clintmccay/.local/share/nvim/site/pack/packer/start/nvim-web-devicons",
@@ -155,6 +176,18 @@ _G.packer_plugins = {
     path = "/Users/clintmccay/.local/share/nvim/site/pack/packer/start/plenary.nvim",
     url = "https://github.com/nvim-lua/plenary.nvim"
   },
+  ["sqlite.lua"] = {
+    loaded = false,
+    needs_bufread = false,
+    only_cond = false,
+    path = "/Users/clintmccay/.local/share/nvim/site/pack/packer/opt/sqlite.lua",
+    url = "https://github.com/kkharji/sqlite.lua"
+  },
+  ["srcery-vim"] = {
+    loaded = true,
+    path = "/Users/clintmccay/.local/share/nvim/site/pack/packer/start/srcery-vim",
+    url = "https://github.com/srcery-colors/srcery-vim"
+  },
   supertab = {
     loaded = true,
     path = "/Users/clintmccay/.local/share/nvim/site/pack/packer/start/supertab",
@@ -180,16 +213,6 @@ _G.packer_plugins = {
     path = "/Users/clintmccay/.local/share/nvim/site/pack/packer/start/tender.vim",
     url = "https://github.com/jacoborus/tender.vim"
   },
-  ["vim-airline"] = {
-    loaded = true,
-    path = "/Users/clintmccay/.local/share/nvim/site/pack/packer/start/vim-airline",
-    url = "https://github.com/vim-airline/vim-airline"
-  },
-  ["vim-airline-themes"] = {
-    loaded = true,
-    path = "/Users/clintmccay/.local/share/nvim/site/pack/packer/start/vim-airline-themes",
-    url = "https://github.com/vim-airline/vim-airline-themes"
-  },
   ["vim-desert-warm-256"] = {
     loaded = true,
     path = "/Users/clintmccay/.local/share/nvim/site/pack/packer/start/vim-desert-warm-256",
@@ -200,16 +223,16 @@ _G.packer_plugins = {
     path = "/Users/clintmccay/.local/share/nvim/site/pack/packer/start/vim-deus",
     url = "https://github.com/ajmwagar/vim-deus"
   },
-  ["vim-devicons"] = {
-    loaded = true,
-    path = "/Users/clintmccay/.local/share/nvim/site/pack/packer/start/vim-devicons",
-    url = "https://github.com/ryanoasis/vim-devicons"
-  },
   ["vim-fugitive"] = {
     loaded = true,
     path = "/Users/clintmccay/.local/share/nvim/site/pack/packer/start/vim-fugitive",
     url = "https://github.com/tpope/vim-fugitive"
   },
+  ["vim-moonfly-colors"] = {
+    loaded = true,
+    path = "/Users/clintmccay/.local/share/nvim/site/pack/packer/start/vim-moonfly-colors",
+    url = "https://github.com/bluz71/vim-moonfly-colors"
+  },
   ["vim-railscasts-theme"] = {
     loaded = true,
     path = "/Users/clintmccay/.local/share/nvim/site/pack/packer/start/vim-railscasts-theme",
@@ -219,13 +242,55 @@ _G.packer_plugins = {
     loaded = true,
     path = "/Users/clintmccay/.local/share/nvim/site/pack/packer/start/vim-slime",
     url = "https://github.com/jpalardy/vim-slime"
+  },
+  ["vim-surround"] = {
+    loaded = true,
+    path = "/Users/clintmccay/.local/share/nvim/site/pack/packer/start/vim-surround",
+    url = "https://github.com/tpope/vim-surround"
+  },
+  ["vim-virtualenv"] = {
+    loaded = true,
+    path = "/Users/clintmccay/.local/share/nvim/site/pack/packer/start/vim-virtualenv",
+    url = "https://github.com/jmcantrell/vim-virtualenv"
   }
 }
 
 time([[Defining packer_plugins]], false)
+local module_lazy_loads = {
+  ["^sqlite"] = "sqlite.lua"
+}
+local lazy_load_called = {['packer.load'] = true}
+local function lazy_load_module(module_name)
+  local to_load = {}
+  if lazy_load_called[module_name] then return nil end
+  lazy_load_called[module_name] = true
+  for module_pat, plugin_name in pairs(module_lazy_loads) do
+    if not _G.packer_plugins[plugin_name].loaded and string.match(module_name, module_pat) then
+      to_load[#to_load + 1] = plugin_name
+    end
+  end
+
+  if #to_load > 0 then
+    require('packer.load')(to_load, {module = module_name}, _G.packer_plugins)
+    local loaded_mod = package.loaded[module_name]
+    if loaded_mod then
+      return function(modname) return loaded_mod end
+    end
+  end
+end
+
+if not vim.g.packer_custom_loader_enabled then
+  table.insert(package.loaders, 1, lazy_load_module)
+  vim.g.packer_custom_loader_enabled = true
+end
+
+-- Config for: Comment.nvim
+time([[Config for Comment.nvim]], true)
+try_loadstring("\27LJ\2\n5\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\fComment\frequire\0", "config", "Comment.nvim")
+time([[Config for Comment.nvim]], false)
 -- Config for: nvim-neoclip.lua
 time([[Config for nvim-neoclip.lua]], true)
-try_loadstring("\27LJ\2\n5\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\fneoclip\frequire\0", "config", "nvim-neoclip.lua")
+try_loadstring("\27LJ\2\nh\0\0\3\0\4\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0005\2\3\0B\0\2\1K\0\1\0\1\0\2\20continuous_sync\2\30enable_persistent_history\2\nsetup\fneoclip\frequire\0", "config", "nvim-neoclip.lua")
 time([[Config for nvim-neoclip.lua]], false)
 
 _G._packer.inside_compile = false