diff --git a/nvim/.config/nvim/lua/clint/keybindings.lua b/nvim/.config/nvim/lua/clint/keybindings.lua
index 7112ded..179ddc1 100644
--- a/nvim/.config/nvim/lua/clint/keybindings.lua
+++ b/nvim/.config/nvim/lua/clint/keybindings.lua
@@ -38,7 +38,9 @@ keymap('n', '<Leader>gf', ':Telescope git_files<CR>', default_ops)
 keymap('n', '<Leader>lg', ':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>fb', ':Telescope file_browser hidden=true<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)
 
 -- Shift up and down
 keymap("v", "J", ":m '>+1<CR>gv=gv", default_ops)
@@ -59,4 +61,4 @@ keymap("n", "<leader>Y", [["+Y]], default_ops)
 keymap("n", "<leader>s", [[:%s/\<<C-r><C-w>\>/<C-r><C-w>/gI<Left><Left><Left>]], default_ops)
 
 -- Git
-keymap('n', '<Leader>gg', ':LazyGit', default_ops)
+keymap('n', '<Leader>gg', ':LazyGit<CR>', default_ops)
diff --git a/nvim/.config/nvim/lua/completion.lua b/nvim/.config/nvim/lua/completion.lua
deleted file mode 100644
index cd04840..0000000
--- a/nvim/.config/nvim/lua/completion.lua
+++ /dev/null
@@ -1,57 +0,0 @@
-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
deleted file mode 100644
index 3a42a8b..0000000
--- a/nvim/.config/nvim/lua/keybindings.lua
+++ /dev/null
@@ -1,47 +0,0 @@
--- 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
deleted file mode 100644
index c58146f..0000000
--- a/nvim/.config/nvim/lua/lsp.lua
+++ /dev/null
@@ -1,66 +0,0 @@
-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
deleted file mode 100644
index 4d3c95a..0000000
--- a/nvim/.config/nvim/lua/plugins.lua
+++ /dev/null
@@ -1,86 +0,0 @@
-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
deleted file mode 100644
index 8c13907..0000000
--- a/nvim/.config/nvim/lua/statusline.lua
+++ /dev/null
@@ -1,42 +0,0 @@
-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 = {}
-}