diff --git a/alacritty/.config/alacritty/alacritty.config b/alacritty/.config/alacritty/alacritty.config
index 31e0ce2..ad3e9b0 100644
--- a/alacritty/.config/alacritty/alacritty.config
+++ b/alacritty/.config/alacritty/alacritty.config
@@ -1 +1 @@
-background_opacity: 1.0
+background_opacity: 0.5
diff --git a/alacritty/.config/alacritty/alacritty.yml b/alacritty/.config/alacritty/alacritty.yml
index 175ea01..cea7e26 100644
--- a/alacritty/.config/alacritty/alacritty.yml
+++ b/alacritty/.config/alacritty/alacritty.yml
@@ -1,7 +1,8 @@
 window:
-  opacity: 0.9
+  opacity: 0.8
 
 font:
+  size: 14
   normal:
     family: FiraCode Nerd Font
     style: Regular
diff --git a/i3/.config/i3/config b/i3/.config/i3/config
deleted file mode 100644
index 2aab87a..0000000
--- a/i3/.config/i3/config
+++ /dev/null
@@ -1,148 +0,0 @@
-######################################
-# Includes
-######################################
-
-include $HOME/.config/i3/workspaces.conf
-include $HOME/.config/i3/scratchpads.conf
-include $HOME/.config/i3/themes/current.conf
-
-######################################
-# Basic Set up
-######################################
-
-set $mod Mod4
-floating_modifier $mod
-font pango:monospace 8
-
-# Start XDG autostart .desktop files using dex. See also
-# https://wiki.archlinux.org/index.php/XDG_Autostart
-exec --no-startup-id dex --autostart --environment i3
-
-# xss-lock grabs a logind suspend inhibit lock and will use i3lock to lock the
-# screen before suspend. Use loginctl lock-session to lock your screen.
-exec --no-startup-id xss-lock --transfer-sleep-lock -- i3lock --nofork
-
-# Use pactl to adjust volume in PulseAudio.
-set $refresh_i3status killall -SIGUSR1 i3status
-bindsym F11 exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ +10% && $refresh_i3status
-bindsym F10 exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ -10% && $refresh_i3status
-bindsym F9 exec --no-startup-id pactl set-sink-mute @DEFAULT_SINK@ toggle && $refresh_i3status
-
-# Fix monitor setup on bootup
-exec ~/scripts/xrandr_dual_monitor.sh
-
-# turn picom on on start up
-exec_always --no-startup-id picom &
-
-# turn off borders (required for i3-gaps)
-for_window [class=".*"] border pixel 2
-
-# gaps
-gaps inner 12
-
-# polybar
-exec_always --no-startup-id $HOME/.config/polybar/launch.sh
-
-# set background on startup
-set $wallpaper /home/clint/Pictures/wallpapers/_current_wallpaper.jpg
-exec --no-startup-id feh --bg-fill $wallpaper
-
-
-######################################
-# Key Bindings
-######################################
-
-# start a terminal
-bindsym $mod+Return exec --no-startup-id alacritty
-
-# kill focused window
-bindsym $mod+Shift+q kill
-bindsym $mod+q kill
-
-# start dmenu (a program launcher)
-bindsym $mod+d exec --no-startup-id rofi -show run
-
-# you can use the cursor keys:
-bindsym $mod+Left focus left
-bindsym $mod+Down focus down
-bindsym $mod+Up focus up
-bindsym $mod+Right focus right
-
-# you can use the cursor keys:
-bindsym $mod+Shift+Left move left
-bindsym $mod+Shift+Down move down
-bindsym $mod+Shift+Up move up
-bindsym $mod+Shift+Right move right
-
-# split in horizontal orientation
-bindsym $mod+h split h
-
-# split in vertical orientation
-bindsym $mod+v split v
-
-# enter fullscreen mode for the focused container
-bindsym $mod+f fullscreen toggle
-
-# toggle tiling / floating
-bindsym $mod+Shift+space floating toggle
-
-# change focus between tiling / floating windows
-bindsym $mod+space focus mode_toggle
-
-# focus the parent container
-bindsym $mod+a focus parent
-
-# lock screen
-bindsym $mod+l exec ~/scripts/lock.sh
-
-# dmenu stuff
-bindsym $mod+c exec ~/scripts/dmenu_configs.sh
-bindsym $mod+p exec ~/scripts/dmenu_images.sh
-bindsym $mod+x exec ~/scripts/dmenu_shutdown.sh
-
-# common programs
-bindsym $mod+Shift+w exec firefox
-bindsym $mod+Shift+p exec pycharm
-
-# reload the configuration file
-bindsym $mod+Shift+c reload
-# restart i3 inplace (preserves your layout/session, can be used to upgrade i3)
-bindsym $mod+Shift+r restart
-# exit i3 (logs you out of your X session)
-bindsym $mod+Shift+e exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -B 'Yes, exit i3' 'i3-msg exit'"
-
-# Volume controls
-#bindsym F9 exec pactl set-sink-mute @DEFAULT_SINK@ toggle
-#bindsym F11 exec pactl set-sink-volume 0 +10%
-#bindsym F10 exec pactl set-sink-volume 0 -10%
-
-# set which programs open in which workspaces
-# to find the class, run xprop in a terminal and click on a program
-#assign [class="firefox"] $ws2
-
-# these programs will float
-for_window [class="kcalc"] floating enable
-
-######################################
-# Resizing Windows
-######################################
-
-bindsym $mod+r mode "resize"
-
-mode "resize" {
-        bindsym j resize shrink width 10 px or 10 ppt
-        bindsym k resize grow height 10 px or 10 ppt
-        bindsym l resize shrink height 10 px or 10 ppt
-        bindsym semicolon resize grow width 10 px or 10 ppt
-
-        bindsym Left resize shrink width 10 px or 10 ppt
-        bindsym Down resize grow height 10 px or 10 ppt
-        bindsym Up resize shrink height 10 px or 10 ppt
-        bindsym Right resize grow width 10 px or 10 ppt
-
-        # back to normal: Enter or Escape or $mod+r
-        bindsym Return mode "default"
-        bindsym Escape mode "default"
-        bindsym $mod+r mode "default"
-}
-
diff --git a/i3/.config/i3/scratchpads.conf b/i3/.config/i3/scratchpads.conf
deleted file mode 100644
index eb30699..0000000
--- a/i3/.config/i3/scratchpads.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-# Calculator
-exec --no-startup-id kcalc 
-for_window [class="kcalc"] , move scratchpad
-bindsym $mod+g [class="kcalc"] scratchpad show
-
-# Task Manager
-exec_always --no-startup-id pgrep -f '^alacritty -t TaskManager --class taskman,taskman' || alacritty -t TaskManager --class taskman,taskman -e btm
-for_window [class="taskman"] , move scratchpad
-bindsym $mod+F1 [class="taskman"] scratchpad show
-
-# Pacman Updates - used in Polybar
-for_window [class="update"] , move window to scratchpad, scratchpad show
-
-# Spotify
-exec_always --no-startup-id pgrep -f '^alacritty -t Spotify --class spotify,spotify' || alacritty -t Spotify --class spotify,spotify -e spt
-for_window [class="spotify"] , move scratchpad
-bindsym $mod+m [class="spotify"] scratchpad show 
diff --git a/i3/.config/i3/themes/current.conf b/i3/.config/i3/themes/current.conf
deleted file mode 100644
index 9b011f3..0000000
--- a/i3/.config/i3/themes/current.conf
+++ /dev/null
@@ -1,20 +0,0 @@
-# messin with colors
-#set $bd-color #1de071
-#set $bd-indicator #d42069
-
-set $bd-color #76b5c5
-set $bd-indicator #ffffff
-
-# colorclass 		border 	  bg 	  text 		indicator 	child_border
-client.focused 		$bd-color #111111 #ffffff 	$bd-indicator 	$bd-color
-client.focused_inactive $bd-color #111111 #ffffff 	#333333 	#111111
-client.unfocused 	$bd-color #111111 #ffffff 	#333333 	#333333
-
-# bar color definitions
-set $bar-text #ADF1D2
-set $bar-background #231c1c
-set $bar-statusline #eeeeee
-set $bar-separator #eeeeee
-set $bar-focused_workspace #553555
-
-
diff --git a/i3/.config/i3/workspaces.conf b/i3/.config/i3/workspaces.conf
deleted file mode 100644
index ed3807f..0000000
--- a/i3/.config/i3/workspaces.conf
+++ /dev/null
@@ -1,45 +0,0 @@
-# i3 workspace conf
-
-set $ws1 "1"
-set $ws2 "2"
-set $ws3 "3"
-set $ws4 "4"
-set $ws5 "5"
-set $ws6 "6"
-set $ws7 "7"
-set $ws8 "8"
-set $ws9 "9"
-set $ws10 "0"
-
-# switch to workspace
-bindsym $mod+1 workspace number $ws1
-bindsym $mod+2 workspace number $ws2
-bindsym $mod+3 workspace number $ws3
-bindsym $mod+4 workspace number $ws4
-bindsym $mod+5 workspace number $ws5
-bindsym $mod+6 workspace number $ws6
-bindsym $mod+7 workspace number $ws7
-bindsym $mod+8 workspace number $ws8
-bindsym $mod+9 workspace number $ws9
-bindsym $mod+0 workspace number $ws10
-
-# move focused container to workspace
-bindsym $mod+Shift+1 move container to workspace number $ws1
-bindsym $mod+Shift+2 move container to workspace number $ws2
-bindsym $mod+Shift+3 move container to workspace number $ws3
-bindsym $mod+Shift+4 move container to workspace number $ws4
-bindsym $mod+Shift+5 move container to workspace number $ws5
-bindsym $mod+Shift+6 move container to workspace number $ws6
-bindsym $mod+Shift+7 move container to workspace number $ws7
-bindsym $mod+Shift+8 move container to workspace number $ws8
-bindsym $mod+Shift+9 move container to workspace number $ws9
-bindsym $mod+Shift+0 move container to workspace number $ws10
-
-# tryin some stuff, not sure if this is what i want
-workspace $ws1 output HDMI-0
-workspace $ws2 output HDMI-1
-workspace $ws3 output HDMI-0
-workspace $ws4 output HDMI-1
-
-# Programs default workspace
-assign [class="firefox"] $ws2
diff --git a/i3blocks/.config/i3blocks/config b/i3blocks/.config/i3blocks/config
deleted file mode 100644
index 844d591..0000000
--- a/i3blocks/.config/i3blocks/config
+++ /dev/null
@@ -1,40 +0,0 @@
-[pacman]
-command=~/.scripts/i3_pacman.sh
-interval=3600
-
-[spotifyd]
-command=ps aux | grep spotifyd | wc -l
-interval=5
-
-[finance]
-command=~/.scripts/i3_finance.sh
-interval=3000
-color=#00b7ff
-
-[cpu]
-command=~/.scripts/i3_cpu.sh
-interval=3600
-color=#A4C2F4
-
-[mem]
-command=~/.scripts/i3_mem.sh
-interval=3600
-color=#A4C2F4
-
-[ip]
-command=~/.scripts/i3_ip.sh
-interval=once
-color=#91E78B
-
-[wifi]
-command=~/.scripts/i3_wifi.sh
-interval=3600
-
-[weather]
-command=~/.scripts/i3_weather.sh
-interval=3600
-color=#C9E42E
-
-[time]
-command=~/.scripts/i3_cal.sh
-interval=5
diff --git a/i3status/.config/i3status/config b/i3status/.config/i3status/config
deleted file mode 100644
index cf185ec..0000000
--- a/i3status/.config/i3status/config
+++ /dev/null
@@ -1,53 +0,0 @@
-# i3status configuration file.
-# see "man i3status" for documentation.
-
-# It is important that this file is edited as UTF-8.
-# The following line should contain a sharp s:
-# ß
-# If the above line is not correctly displayed, fix your editor first!
-
-general {
-        colors = false
-        interval = 5
-}
-
-#order += "ipv6"
-order += "wireless _first_"
-#order += "ethernet _first_"
-#order += "battery all"
-#order += "disk /"
-#order += "load"
-order += "memory"
-order += "tztime local"
-
-wireless _first_ {
-        format_up = "W:%quality at %essid %ip"
-        format_down = "W: down"
-}
-
-ethernet _first_ {
-        format_up = "E: %ip (%speed)"
-        format_down = "E: down"
-}
-
-battery all {
-        format = "%status %percentage %remaining"
-}
-
-disk "/" {
-        format = "%avail"
-}
-
-load {
-        format = "%1min"
-}
-
-memory {
-        format = "%used | %available"
-        threshold_degraded = "1G"
-        format_degraded = "MEMORY < %available"
-}
-
-tztime local {
-        format = "%A %b %d, %Y %I:%M:%S%p  "
-
diff --git a/nvim/.config/nvim/lua/clint/colorscheme.lua b/nvim/.config/nvim/lua/clint/colorscheme.lua
index 419fdc9..6e8b3f5 100644
--- a/nvim/.config/nvim/lua/clint/colorscheme.lua
+++ b/nvim/.config/nvim/lua/clint/colorscheme.lua
@@ -1,12 +1,8 @@
--- vim.cmd("colorscheme minimalist")
--- vim.cmd("colorscheme ayu")
--- vim.cmd("let ayucolor='mirage'")
--- vim.cmd("colorscheme gruvbox")
-vim.cmd("colorscheme deus")
--- vim.cmd("colorscheme railscasts")
--- vim.cmd("colorscheme desert-warm-256")
--- vim.cmd("colorscheme deus")
+-- general theme
+vim.cmd("colorscheme gruvbox")
 
--- Ignore background color for transparency
+-- ignore background color for transparency
+vim.cmd("highlight Normal guibg=none")
+vim.cmd("highlight NonText guibg=none")
 vim.cmd("highlight Normal ctermbg=none")
 vim.cmd("highlight NonText ctermbg=none")
diff --git a/nvim/.config/nvim/lua/clint/settings.lua b/nvim/.config/nvim/lua/clint/settings.lua
index dd977a1..5202b91 100644
--- a/nvim/.config/nvim/lua/clint/settings.lua
+++ b/nvim/.config/nvim/lua/clint/settings.lua
@@ -24,10 +24,10 @@ settings.foldnestmax = 99
 settings.foldlevelstart = 99
 
 -- slime
-vim.g.slime_target = 'tmux'
+vim.g.slime_target = "tmux"
 vim.g.slime_default_config = {
   socket_name = vim.api.nvim_eval('get(split($TMUX, ","), 0)'),
-  target_pane = '{bottom}',
+  target_pane = "{bottom}",
 }
 
 -- Airline
diff --git a/nvim/.config/nvim/lua/completion.lua b/nvim/.config/nvim/lua/completion.lua
new file mode 100644
index 0000000..cd04840
--- /dev/null
+++ b/nvim/.config/nvim/lua/completion.lua
@@ -0,0 +1,57 @@
+local cmp = require'cmp'
+local capabilities = require('cmp_nvim_lsp').default_capabilities()
+
+  cmp.setup({
+    snippet = {
+      -- REQUIRED - you must specify a snippet engine
+      expand = function(args)
+        vim.fn["vsnip#anonymous"](args.body) -- For `vsnip` users.
+        require('luasnip').lsp_expand(args.body) -- For `luasnip` users.
+      end,
+    },
+    window = {
+      -- completion = cmp.config.window.bordered(),
+      -- documentation = cmp.config.window.bordered(),
+    },
+    mapping = cmp.mapping.preset.insert({
+      ['<C-b>'] = cmp.mapping.scroll_docs(-4),
+      ['<C-f>'] = cmp.mapping.scroll_docs(4),
+      ['<C-Space>'] = cmp.mapping.complete(),
+      ['<C-e>'] = cmp.mapping.abort(),
+      ['<CR>'] = cmp.mapping.confirm({ select = true }), -- Accept currently selected item. Set `select` to `false` to only confirm explicitly selected items.
+    }),
+    sources = cmp.config.sources({
+      { name = 'nvim_lsp' },
+      { name = 'luasnip' }, -- For luasnip users.
+    }, {
+      { name = 'buffer' },
+    })
+  })
+
+  -- Set configuration for specific filetype.
+  cmp.setup.filetype('gitcommit', {
+    sources = cmp.config.sources({
+      { name = 'cmp_git' }, -- You can specify the `cmp_git` source if you were installed it.
+    }, {
+      { name = 'buffer' },
+    })
+  })
+
+  -- Use buffer source for `/` and `?` (if you enabled `native_menu`, this won't work anymore).
+  cmp.setup.cmdline({ '/', '?' }, {
+    mapping = cmp.mapping.preset.cmdline(),
+    sources = {
+      { name = 'buffer' }
+    }
+  })
+
+  -- Use cmdline & path source for ':' (if you enabled `native_menu`, this won't work anymore).
+  cmp.setup.cmdline(':', {
+    mapping = cmp.mapping.preset.cmdline(),
+    sources = cmp.config.sources({
+      { name = 'path' }
+    }, {
+      { name = 'cmdline' }
+    })
+  })
+
diff --git a/nvim/.config/nvim/lua/keybindings.lua b/nvim/.config/nvim/lua/keybindings.lua
new file mode 100644
index 0000000..3a42a8b
--- /dev/null
+++ b/nvim/.config/nvim/lua/keybindings.lua
@@ -0,0 +1,47 @@
+-- Generic Keybindings for all files
+--
+--
+
+local keymap = vim.api.nvim_set_keymap
+local default_ops = { noremap = true, silent = true }
+
+-- Quick escape insert mode
+keymap("i", "jk", "<Esc>", default_ops)
+
+-- Delete single character without copying into register
+keymap("n", "x", '"_x', default_ops)
+
+-- Window management
+keymap("n", "<leader>sv", "<C-w>v", default_ops) 
+keymap("n", "<leader>sh", "<C-w>s", default_ops) 
+keymap("n", "<leader>se", "<C-w>=", default_ops) 
+keymap("n", "<leader>sw", "<C-w>w", default_ops) 
+keymap("n", "<leader>sx", ":close<CR>", default_ops) 
+
+-- Save, Save/Quit
+keymap("n", "<F1>", ":w<CR>", default_ops)
+keymap("n", "<F2>", ":wq<CR>", default_ops)
+
+-- Tab through open buffers
+keymap("n", "[b", ":bp<CR>", default_ops)
+keymap("n", "]b", ":bn<CR>", default_ops)
+
+-- Enter lines
+keymap("n", "<Enter>", "o<Esc>", default_ops)
+keymap("n", "<s-Enter>", "O<Esc>", default_ops)
+
+-- Folding
+keymap("n", "<space>", "za", default_ops)
+
+-- Telescope stuff
+keymap("n", "<Leader>ff", ":Telescope find_files hidden=true<CR>", default_ops)
+keymap("n", "<Leader>gf", ":Telescope git_files<CR>", default_ops)
+keymap("n", "<Leader>s", ":Telescope live_grep<CR>", default_ops)
+keymap("n", "<Leader>d", ":Telescope diagnostics<CR>", default_ops)
+keymap("n", "<Leader>h", ":Telescope neoclip<CR>", default_ops)
+keymap("n", "<Leader>b", ":Telescope buffers<CR>", default_ops)
+keymap("n", "<Leader>c", ":Telescope colorscheme<CR>", default_ops)
+keymap("n", "<Leader>fb", ":Telescope file_browser hidden=true theme=dropdown<CR>", default_ops)
+
+-- Git
+keymap("n", "<Leader>gg", ":LazyGit<CR>", default_ops)
diff --git a/nvim/.config/nvim/lua/lsp.lua b/nvim/.config/nvim/lua/lsp.lua
new file mode 100644
index 0000000..c58146f
--- /dev/null
+++ b/nvim/.config/nvim/lua/lsp.lua
@@ -0,0 +1,66 @@
+local cmp = require'cmp'
+local capabilities = require('cmp_nvim_lsp').default_capabilities()
+
+require'lspconfig'.jedi_language_server.setup{
+	on_attach =
+	function()
+		vim.keymap.set("n", "K", vim.lsp.buf.hover, {buffer=0})
+		vim.keymap.set("n", "gd", vim.lsp.buf.definition, {buffer=0})
+		vim.keymap.set("n", "<Leader>r", vim.lsp.buf.rename, {buffer=0})
+	end
+}
+
+  cmp.setup({
+    snippet = {
+      -- REQUIRED - you must specify a snippet engine
+      expand = function(args)
+        vim.fn["vsnip#anonymous"](args.body) -- For `vsnip` users.
+        require('luasnip').lsp_expand(args.body) -- For `luasnip` users.
+      end,
+    },
+    window = {
+      -- completion = cmp.config.window.bordered(),
+      -- documentation = cmp.config.window.bordered(),
+    },
+    mapping = cmp.mapping.preset.insert({
+      ['<C-b>'] = cmp.mapping.scroll_docs(-4),
+      ['<C-f>'] = cmp.mapping.scroll_docs(4),
+      ['<C-Space>'] = cmp.mapping.complete(),
+      ['<C-e>'] = cmp.mapping.abort(),
+      ['<CR>'] = cmp.mapping.confirm({ select = true }), -- Accept currently selected item. Set `select` to `false` to only confirm explicitly selected items.
+    }),
+    sources = cmp.config.sources({
+      { name = 'nvim_lsp' },
+      { name = 'luasnip' }, -- For luasnip users.
+    }, {
+      { name = 'buffer' },
+    })
+  })
+
+  -- Set configuration for specific filetype.
+  cmp.setup.filetype('gitcommit', {
+    sources = cmp.config.sources({
+      { name = 'cmp_git' }, -- You can specify the `cmp_git` source if you were installed it.
+    }, {
+      { name = 'buffer' },
+    })
+  })
+
+  -- Use buffer source for `/` and `?` (if you enabled `native_menu`, this won't work anymore).
+  cmp.setup.cmdline({ '/', '?' }, {
+    mapping = cmp.mapping.preset.cmdline(),
+    sources = {
+      { name = 'buffer' }
+    }
+  })
+
+  -- Use cmdline & path source for ':' (if you enabled `native_menu`, this won't work anymore).
+  cmp.setup.cmdline(':', {
+    mapping = cmp.mapping.preset.cmdline(),
+    sources = cmp.config.sources({
+      { name = 'path' }
+    }, {
+      { name = 'cmdline' }
+    })
+  })
+
diff --git a/nvim/.config/nvim/lua/plugins.lua b/nvim/.config/nvim/lua/plugins.lua
new file mode 100644
index 0000000..4d3c95a
--- /dev/null
+++ b/nvim/.config/nvim/lua/plugins.lua
@@ -0,0 +1,86 @@
+vim.cmd [[packadd packer.nvim]]
+
+return require('packer').startup(function(use)
+	-- Packer can manage itself
+	use('wbthomason/packer.nvim')
+
+	-- LSP
+	use('neovim/nvim-lspconfig')
+	use('hrsh7th/cmp-nvim-lsp')
+	use('hrsh7th/cmp-nvim-lua')
+	use('hrsh7th/cmp-buffer')
+	use('hrsh7th/cmp-path')
+	use('hrsh7th/nvim-cmp')
+	use('saadparwaiz1/cmp_luasnip')
+
+	-- colorschemes
+	-- use('ayu-theme/ayu-vim')
+	use('Shatur/neovim-ayu')
+	use('morhetz/gruvbox')
+	use('dikiaap/minimalist')
+	use('jacoborus/tender.vim')
+	use('jpo/vim-railscasts-theme')
+	use('rainux/vim-desert-warm-256')
+	use('ajmwagar/vim-deus')
+	use('catppuccin/nvim')
+	use('bluz71/vim-moonfly-colors')
+	use('savq/melange')
+	use('srcery-colors/srcery-vim')
+
+	-- 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')
+
+	-- SuperTab
+	use('ervandew/supertab')
+
+	-- Vim-surround
+	use('tpope/vim-surround')
+
+ 	-- Slime, for tmux repl-ing
+	use('jpalardy/vim-slime')
+
+	-- Telescope, fuzzy finding
+	use('nvim-lua/plenary.nvim')
+	use('nvim-telescope/telescope.nvim')
+	use{'nvim-telescope/telescope-fzf-native.nvim', run = 'make' }
+	use( "nvim-telescope/telescope-file-browser.nvim")
+
+	-- Treesitter
+	use{'nvim-treesitter/nvim-treesitter', run = ':TSUpdate' }
+
+	-- Devicons
+	use('kyazdani42/nvim-web-devicons')
+
+	-- Registry history
+	use {
+	  "AckslD/nvim-neoclip.lua",
+	  requires = {
+		{'kkharji/sqlite.lua', module = 'sqlite'},
+		{'nvim-telescope/telescope.nvim'},
+	  },
+	  config = function()
+		require('neoclip').setup({
+			enable_persistent_history = true,
+			continuous_sync = true
+		}
+		)
+	  end,
+	}
+
+	-- Comments
+	use {
+    'numToStr/Comment.nvim',
+    config = function()
+        require('Comment').setup()
+    end
+	}
+
+	-- Virtual Env
+	use('jmcantrell/vim-virtualenv')
+	end)
diff --git a/nvim/.config/nvim/lua/statusline.lua b/nvim/.config/nvim/lua/statusline.lua
new file mode 100644
index 0000000..8c13907
--- /dev/null
+++ b/nvim/.config/nvim/lua/statusline.lua
@@ -0,0 +1,42 @@
+require('lualine').setup {
+  options = {
+    icons_enabled = true,
+    theme = 'auto',
+    component_separators = { left = '', right = ''},
+    section_separators = { left = '', right = ''},
+    disabled_filetypes = {
+      statusline = {},
+      winbar = {},
+    },
+    ignore_focus = {},
+    always_divide_middle = true,
+    globalstatus = false,
+    refresh = {
+      statusline = 1000,
+      tabline = 1000,
+      winbar = 1000,
+    }
+  },
+  sections = {
+    lualine_a = {'mode'},
+    lualine_b = {'branch', 'diff', 'diagnostics'},
+    lualine_c = {'filename'},
+    lualine_x = {'encoding', 'fileformat', 'filetype'},
+    lualine_y = {'progress'},
+    lualine_z = {'location'}
+  },
+  inactive_sections = {
+    lualine_a = {},
+    lualine_b = {},
+    lualine_c = {'filename'},
+    lualine_x = {'location'},
+    lualine_y = {},
+    lualine_z = {}
+  },
+  tabline = {
+	  lualine_a = {'buffers'}
+  },
+  winbar = {},
+  inactive_winbar = {},
+  extensions = {}
+}
diff --git a/nvim/.config/nvim/plugin/packer_compiled.lua b/nvim/.config/nvim/plugin/packer_compiled.lua
index 3e89b6b..475005f 100644
--- a/nvim/.config/nvim/plugin/packer_compiled.lua
+++ b/nvim/.config/nvim/plugin/packer_compiled.lua
@@ -49,8 +49,8 @@ local function save_profiles(threshold)
 end
 
 time([[Luarocks path setup]], true)
-local package_path_str = "/Users/clint/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?.lua;/Users/clint/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?/init.lua;/Users/clint/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?.lua;/Users/clint/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?/init.lua"
-local install_cpath_pattern = "/Users/clint/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/lua/5.1/?.so"
+local package_path_str = "/Users/clintmccay/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?.lua;/Users/clintmccay/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?/init.lua;/Users/clintmccay/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?.lua;/Users/clintmccay/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?/init.lua"
+local install_cpath_pattern = "/Users/clintmccay/.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
@@ -74,224 +74,159 @@ end
 time([[try_loadstring definition]], false)
 time([[Defining packer_plugins]], true)
 _G.packer_plugins = {
-  ["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/clint/.local/share/nvim/site/pack/packer/start/Comment.nvim",
-    url = "https://github.com/numToStr/Comment.nvim"
-  },
-  ["JABS.nvim"] = {
-    loaded = true,
-    path = "/Users/clint/.local/share/nvim/site/pack/packer/start/JABS.nvim",
-    url = "https://github.com/matbme/JABS.nvim"
-  },
   ["ayu-vim"] = {
     loaded = true,
-    path = "/Users/clint/.local/share/nvim/site/pack/packer/start/ayu-vim",
+    path = "/Users/clintmccay/.local/share/nvim/site/pack/packer/start/ayu-vim",
     url = "https://github.com/ayu-theme/ayu-vim"
   },
   ["cmp-buffer"] = {
     loaded = true,
-    path = "/Users/clint/.local/share/nvim/site/pack/packer/start/cmp-buffer",
+    path = "/Users/clintmccay/.local/share/nvim/site/pack/packer/start/cmp-buffer",
     url = "https://github.com/hrsh7th/cmp-buffer"
   },
   ["cmp-nvim-lsp"] = {
     loaded = true,
-    path = "/Users/clint/.local/share/nvim/site/pack/packer/start/cmp-nvim-lsp",
+    path = "/Users/clintmccay/.local/share/nvim/site/pack/packer/start/cmp-nvim-lsp",
     url = "https://github.com/hrsh7th/cmp-nvim-lsp"
   },
   ["cmp-nvim-lua"] = {
     loaded = true,
-    path = "/Users/clint/.local/share/nvim/site/pack/packer/start/cmp-nvim-lua",
+    path = "/Users/clintmccay/.local/share/nvim/site/pack/packer/start/cmp-nvim-lua",
     url = "https://github.com/hrsh7th/cmp-nvim-lua"
   },
   ["cmp-path"] = {
     loaded = true,
-    path = "/Users/clint/.local/share/nvim/site/pack/packer/start/cmp-path",
+    path = "/Users/clintmccay/.local/share/nvim/site/pack/packer/start/cmp-path",
     url = "https://github.com/hrsh7th/cmp-path"
   },
   cmp_luasnip = {
     loaded = true,
-    path = "/Users/clint/.local/share/nvim/site/pack/packer/start/cmp_luasnip",
+    path = "/Users/clintmccay/.local/share/nvim/site/pack/packer/start/cmp_luasnip",
     url = "https://github.com/saadparwaiz1/cmp_luasnip"
   },
   gruvbox = {
     loaded = true,
-    path = "/Users/clint/.local/share/nvim/site/pack/packer/start/gruvbox",
+    path = "/Users/clintmccay/.local/share/nvim/site/pack/packer/start/gruvbox",
     url = "https://github.com/morhetz/gruvbox"
   },
   minimalist = {
     loaded = true,
-    path = "/Users/clint/.local/share/nvim/site/pack/packer/start/minimalist",
+    path = "/Users/clintmccay/.local/share/nvim/site/pack/packer/start/minimalist",
     url = "https://github.com/dikiaap/minimalist"
   },
   nerdtree = {
     loaded = true,
-    path = "/Users/clint/.local/share/nvim/site/pack/packer/start/nerdtree",
+    path = "/Users/clintmccay/.local/share/nvim/site/pack/packer/start/nerdtree",
     url = "https://github.com/preservim/nerdtree"
   },
   ["nerdtree-git-plugin"] = {
     loaded = true,
-    path = "/Users/clint/.local/share/nvim/site/pack/packer/start/nerdtree-git-plugin",
+    path = "/Users/clintmccay/.local/share/nvim/site/pack/packer/start/nerdtree-git-plugin",
     url = "https://github.com/Xuyuanp/nerdtree-git-plugin"
   },
   ["nvim-cmp"] = {
     loaded = true,
-    path = "/Users/clint/.local/share/nvim/site/pack/packer/start/nvim-cmp",
+    path = "/Users/clintmccay/.local/share/nvim/site/pack/packer/start/nvim-cmp",
     url = "https://github.com/hrsh7th/nvim-cmp"
   },
   ["nvim-lspconfig"] = {
     loaded = true,
-    path = "/Users/clint/.local/share/nvim/site/pack/packer/start/nvim-lspconfig",
+    path = "/Users/clintmccay/.local/share/nvim/site/pack/packer/start/nvim-lspconfig",
     url = "https://github.com/neovim/nvim-lspconfig"
   },
   ["nvim-neoclip.lua"] = {
-    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" },
+    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" },
     loaded = true,
-    path = "/Users/clint/.local/share/nvim/site/pack/packer/start/nvim-neoclip.lua",
+    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/clint/.local/share/nvim/site/pack/packer/start/nvim-treesitter",
-    url = "https://github.com/nvim-treesitter/nvim-treesitter"
-  },
   ["nvim-web-devicons"] = {
     loaded = true,
-    path = "/Users/clint/.local/share/nvim/site/pack/packer/start/nvim-web-devicons",
+    path = "/Users/clintmccay/.local/share/nvim/site/pack/packer/start/nvim-web-devicons",
     url = "https://github.com/kyazdani42/nvim-web-devicons"
   },
   ["packer.nvim"] = {
     loaded = true,
-    path = "/Users/clint/.local/share/nvim/site/pack/packer/start/packer.nvim",
+    path = "/Users/clintmccay/.local/share/nvim/site/pack/packer/start/packer.nvim",
     url = "https://github.com/wbthomason/packer.nvim"
   },
   ["plenary.nvim"] = {
     loaded = true,
-    path = "/Users/clint/.local/share/nvim/site/pack/packer/start/plenary.nvim",
+    path = "/Users/clintmccay/.local/share/nvim/site/pack/packer/start/plenary.nvim",
     url = "https://github.com/nvim-lua/plenary.nvim"
   },
-  ["possession.nvim"] = {
-    loaded = true,
-    path = "/Users/clint/.local/share/nvim/site/pack/packer/start/possession.nvim",
-    url = "https://github.com/jedrzejboczar/possession.nvim"
-  },
-  ["sqlite.lua"] = {
-    loaded = false,
-    needs_bufread = false,
-    only_cond = false,
-    path = "/Users/clint/.local/share/nvim/site/pack/packer/opt/sqlite.lua",
-    url = "https://github.com/kkharji/sqlite.lua"
-  },
   supertab = {
     loaded = true,
-    path = "/Users/clint/.local/share/nvim/site/pack/packer/start/supertab",
+    path = "/Users/clintmccay/.local/share/nvim/site/pack/packer/start/supertab",
     url = "https://github.com/ervandew/supertab"
   },
   ["telescope-file-browser.nvim"] = {
     loaded = true,
-    path = "/Users/clint/.local/share/nvim/site/pack/packer/start/telescope-file-browser.nvim",
+    path = "/Users/clintmccay/.local/share/nvim/site/pack/packer/start/telescope-file-browser.nvim",
     url = "https://github.com/nvim-telescope/telescope-file-browser.nvim"
   },
   ["telescope-fzf-native.nvim"] = {
     loaded = true,
-    path = "/Users/clint/.local/share/nvim/site/pack/packer/start/telescope-fzf-native.nvim",
+    path = "/Users/clintmccay/.local/share/nvim/site/pack/packer/start/telescope-fzf-native.nvim",
     url = "https://github.com/nvim-telescope/telescope-fzf-native.nvim"
   },
-  ["telescope-repo.nvim"] = {
-    loaded = true,
-    path = "/Users/clint/.local/share/nvim/site/pack/packer/start/telescope-repo.nvim",
-    url = "https://github.com/cljoly/telescope-repo.nvim"
-  },
   ["telescope.nvim"] = {
     loaded = true,
-    path = "/Users/clint/.local/share/nvim/site/pack/packer/start/telescope.nvim",
+    path = "/Users/clintmccay/.local/share/nvim/site/pack/packer/start/telescope.nvim",
     url = "https://github.com/nvim-telescope/telescope.nvim"
   },
   ["tender.vim"] = {
     loaded = true,
-    path = "/Users/clint/.local/share/nvim/site/pack/packer/start/tender.vim",
+    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/clint/.local/share/nvim/site/pack/packer/start/vim-airline",
+    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/clint/.local/share/nvim/site/pack/packer/start/vim-airline-themes",
+    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/clint/.local/share/nvim/site/pack/packer/start/vim-desert-warm-256",
+    path = "/Users/clintmccay/.local/share/nvim/site/pack/packer/start/vim-desert-warm-256",
     url = "https://github.com/rainux/vim-desert-warm-256"
   },
   ["vim-deus"] = {
     loaded = true,
-    path = "/Users/clint/.local/share/nvim/site/pack/packer/start/vim-deus",
+    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/clint/.local/share/nvim/site/pack/packer/start/vim-devicons",
+    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/clint/.local/share/nvim/site/pack/packer/start/vim-fugitive",
+    path = "/Users/clintmccay/.local/share/nvim/site/pack/packer/start/vim-fugitive",
     url = "https://github.com/tpope/vim-fugitive"
   },
   ["vim-railscasts-theme"] = {
     loaded = true,
-    path = "/Users/clint/.local/share/nvim/site/pack/packer/start/vim-railscasts-theme",
+    path = "/Users/clintmccay/.local/share/nvim/site/pack/packer/start/vim-railscasts-theme",
     url = "https://github.com/jpo/vim-railscasts-theme"
   },
   ["vim-slime"] = {
     loaded = true,
-    path = "/Users/clint/.local/share/nvim/site/pack/packer/start/vim-slime",
+    path = "/Users/clintmccay/.local/share/nvim/site/pack/packer/start/vim-slime",
     url = "https://github.com/jpalardy/vim-slime"
   }
 }
 
 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: nvim-neoclip.lua
 time([[Config for nvim-neoclip.lua]], true)
-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")
+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")
 time([[Config for nvim-neoclip.lua]], false)
--- 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)
 
 _G._packer.inside_compile = false
 if _G._packer.needs_bufread == true then
diff --git a/tmux/.config/tmux/statusline.conf b/tmux/.config/tmux/statusline.conf
index 66d457b..03acf66 100644
--- a/tmux/.config/tmux/statusline.conf
+++ b/tmux/.config/tmux/statusline.conf
@@ -3,7 +3,7 @@
 set -g default-terminal "screen-256color"
 
 # left status
-set-window-option -g status-left " (( #S )) "
+set-window-option -g status-left " [ #S ] "
 set-window-option -g status-left-style "fg=blue bg=black"
 set-window-option -g status-left-length 30