move everything into 1 file

7 files changed, 301 insertions, 293 deletions

diff --git a/init.lua.backup b/init.lua.backup
index 8dbeee2..0323dd8 100644
--- a/init.lua.backup
+++ b/init.lua.backup
@@ -1,9 +1,15 @@
--- How to install
---
--- 1. Run `PackerSync`
--- 2. Run TSInstall <langauge> for treesitter grammar
--- 3. LspInfo to check if the language servers are working
+--[[
+How to install
+
+1. Run `PackerSync`
+2. Run TSInstall <langauge> for treesitter grammar
+3. LspInfo to check if the language servers are working
+
+Todo
 
+https://dev.to/voyeg3r/writing-useful-lua-functions-to-my-neovim-14ki
+function to remove whitespace and preserve spot on save
+]]--
 
 -- Bootstrap packer if not installed
 local fn = vim.fn
@@ -13,15 +19,164 @@ if fn.empty(fn.glob(install_path)) > 0 then
     vim.cmd 'packadd packer.nvim'
 end
 
--- Install My Stuff
-require('settings')
 
-vim.cmd "nnoremap <space>ps <cmd>PackerSync<cr>"
 
-vim.cmd "nnoremap <space>ff <cmd>Telescope find_files<cr>"
-vim.cmd "nnoremap <space>/ <cmd>Telescope live_grep<cr>"
-vim.cmd "nnoremap <space>fb <cmd>Telescope buffers<cr>"
-vim.cmd "nnoremap <space>fg <cmd>lua require('telescope.builtin').git_status()<cr>"
+local o = vim.o
+local g = vim.g
+local cmd = vim.cmd
+local map = vim.api.nvim_set_keymap
+
+
+-- https://old.reddit.com/r/neovim/comments/lrz18i/how_to_change_colorscheme_in_lua_without_any/ 
+g.colors_name = "nord"
+
+
+-- Set up spacebar as leader
+-- https://icyphox.sh/blog/nvim-lua/
+map('n', '<Space>', '', {})
+vim.g.mapleader = ' '
+
+-- Set spaces > tabs, 4 as default
+o.expandtab = true
+o.tabstop = 4
+o.shiftwidth = 0
+
+o.wrap = false
+o.history = 1000
+-- Wildmode show list, complete to first result
+o.wildignore = "*/app/cache,*/vendor,*/env,*.pyc,*/venv,*/__pycache__,*/venv"
+o.splitright = true
+o.splitbelow = true
+o.spelllang = "en_ca"
+
+
+local highlights = {
+    "Search ctermfg=166",
+    "DiffAdd    cterm=BOLD ctermfg=NONE ctermbg=22",
+    "DiffDelete cterm=BOLD ctermfg=NONE ctermbg=52",
+    "DiffChange cterm=BOLD ctermfg=NONE ctermbg=23",
+    "DiffText   cterm=BOLD ctermfg=NONE ctermbg=23",
+    "Normal guibg=NONE ctermbg=NONE",
+    "Search ctermbg=None ctermfg=166",
+    "PrimaryBlock   ctermfg=06 ctermbg=NONE",
+    "SecondaryBlock ctermfg=06 ctermbg=NONE",
+    "Blanks   ctermfg=07 ctermbg=NONE",
+    "ColorColumn ctermbg=cyan",
+}
+for i, highlight in ipairs(highlights) do
+    cmd('au VimEnter * hi ' .. highlight)
+end
+
+-- Along with the highlight definition for ColorColumn above, these options
+-- will set colored marks at certain line lengths
+cmd([[au BufEnter *.py let w:m1=matchadd('ColorColumn', '\%81v', 100)]])
+cmd([[au BufEnter *.py let w:m2=matchadd('Error', '\%121v', 100)]])
+cmd([[au BufLeave *.py call clearmatches()"]])
+
+
+
+options = { noremap = true }
+
+map('n', '<leader><leader>', ':noh<cr>', options)
+map('i', 'jj', '<esc>', options)
+
+-- Visually select last copied text
+map('n', 'gp', "`[v`]", options)
+map('n', '<leader>ps', '<cmd>PackerSync<cr>', options)
+map('n', '<leader>ff', '<cmd>Telescope find_files<cr>', options)
+map('n', '<leader>fb', '<cmd>Telescope buffers<cr>', options) 
+map('n', '<leader>fj', '<cmd>Telescope jumplist<cr>', options) 
+map('n', '<leader>f/', '<cmd>Telescope live_grep<cr>', options)
+map('n', '<leader>fa', '<cmd>Telescope grep_string<cr>', options)
+map('n', '<leader>fg', "<cmd>lua require('telescope.builtin').git_status()<cr>", options)
+
+map('n', '<leader>du', '<cmd>diffupdate<cr>', options)
+map('n', '<leader>dd', '<cmd>diffget<cr>', options)
+map('n', '<leader>df', '<cmd>diffput<cr>', options)
+map('n', '_', '[c', options)
+map('n', '=', ']c', options)
+-- Visually select line without ending
+map('n', '<leader>v', '^v$h', options)
+
+-- Ledger Shortcuts
+-- Copy the last entry
+map('n', '<leader>ll', 'G{jV}y}p10l', options)
+-- Copy the current entry to the bottom, copy date from last entry
+map('n', '<leader>lb', '{jV}yGp10l{{jvEy}jvEpl', options)
+-- Copy the current entry to the next position
+map('n', '<leader>ln', '{jV}y}p10l', options)
+-- Jump down from line to replace dollar ammount
+map('n', '<leader>ld', 'j^f$lC', options)
+-- After searching pull entry to current position
+map('n', '<leader>ly', 'vapy<C-o>p{{jvEy}jvEpl', options)
+
+
+map('n', '<leader>ep', 'ofrom pudb import set_trace; set_trace()<esc>', options)
+
+
+
+
+map('n', '<c-w>t', "<cmd>tabnew<cr>", options)
+map('n', '<c-w><c-f>', '<c-w>f<c-w>T', options)
+map('n', '<c-w><c-]>', '<c-w>v<c-]><c-w>T', options)
+map('n', '<c-w><c-t>', '<c-w>v<c-w>T', options)
+map('n', '<leader>ee', '<cmd>e!<cr>', options)
+map('n', '<expr> k', [[(v:count > 1 ? "m'" . v:count : '') . 'k']], options)
+map('n', '<expr> j', [[(v:count > 1 ? "m'" . v:count : '') . 'j']], options)
+
+
+map('n', '<leader>co', '<cmd>copen<cr>', options)
+map('n', '<leader>cc', '<cmd>cclose<cr>', options)
+
+
+
+
+
+-- Status Line
+-- https://icyphox.sh/blog/nvim-lua/
+local mode_map = {
+    ['n'] = 'normal',
+    ['no'] = 'n·operator pending',
+    ['v'] = 'visual',
+    ['V'] = 'v·line',
+    [''] = 'v·block',
+    ['s'] = 'select',
+    ['S'] = 's·line',
+    [''] = 's·block',
+    ['i'] = 'insert',
+    ['R'] = 'replace',
+    ['Rv'] = 'v·replace',
+    ['c'] = 'command',
+    ['cv'] = 'vim ex',
+    ['ce'] = 'ex',
+    ['r'] = 'prompt',
+    ['rm'] = 'more',
+    ['r?'] = 'confirm',
+    ['!'] = 'shell',
+    ['t'] = 'terminal'
+}
+
+local function mode()
+    local m = vim.api.nvim_get_mode().mode
+    if mode_map[m] == nil then return m end
+    return '[' .. mode_map[m] .. '] '
+end
+
+local stl = {
+    '%#PrimaryBlock#',
+    mode(),
+    '%#SecondaryBlock#',
+    '%#Blanks#',
+    '%f',
+    '%m',
+    '%=',
+    '%#SecondaryBlock#',
+    '%l,%c ',
+    '%#PrimaryBlock#',
+    '%{&filetype}',
+}
+
+o.statusline = table.concat(stl)
 
 --[[
 vim.cmd "let g:python3_host_prog = expand('~/venv/bin/python3')"
@@ -41,13 +196,79 @@ return require('packer').startup(function()
         'nvim-treesitter/nvim-treesitter',
         run = ':TSUpdate',
         config = function()
-            require "treesitterconf"
+            local present, ts_config = pcall(require, "nvim-treesitter.configs")
+            if not present then
+                return
+            end
+
+            ts_config.setup {
+                ensure_installed = {
+                    "python",
+                    "lua",
+                    "nix",
+                },
+                highlight = {
+                    enable = true,
+                },
+                indent = {
+                    enable = true, 
+                }
+            }
         end,
     }
     use {
         "neovim/nvim-lspconfig",
         config = function()
-            require "lspconfigconf"
+            local present, nvim_lsp = pcall(require, "lspconfig")
+            if not present then
+                return
+            end
+
+            -- Use an on_attach function to only map the following keys
+            -- after the language server attaches to the current buffer
+            local on_attach = function(client, bufnr)
+              local function buf_set_keymap(...) vim.api.nvim_buf_set_keymap(bufnr, ...) end
+              local function buf_set_option(...) vim.api.nvim_buf_set_option(bufnr, ...) end
+
+              -- Enable completion triggered by <c-x><c-o>
+              buf_set_option('omnifunc', 'v:lua.vim.lsp.omnifunc')
+
+              -- Mappings.
+              local opts = { noremap=true, silent=true }
+
+              -- See `:help vim.lsp.*` for documentation on any of the below functions
+              buf_set_keymap('n', 'gD', '<cmd>lua vim.lsp.buf.declaration()<CR>', opts)
+              buf_set_keymap('n', 'gd', '<cmd>lua vim.lsp.buf.definition()<CR>', opts)
+              buf_set_keymap('n', 'K', '<cmd>lua vim.lsp.buf.hover()<CR>', opts)
+              buf_set_keymap('n', 'gi', '<cmd>lua vim.lsp.buf.implementation()<CR>', opts)
+              buf_set_keymap('n', '<C-k>', '<cmd>lua vim.lsp.buf.signature_help()<CR>', opts)
+              buf_set_keymap('n', '<space>wa', '<cmd>lua vim.lsp.buf.add_workspace_folder()<CR>', opts)
+              buf_set_keymap('n', '<space>wr', '<cmd>lua vim.lsp.buf.remove_workspace_folder()<CR>', opts)
+              buf_set_keymap('n', '<space>wl', '<cmd>lua print(vim.inspect(vim.lsp.buf.list_workspace_folders()))<CR>', opts)
+              buf_set_keymap('n', '<space>D', '<cmd>lua vim.lsp.buf.type_definition()<CR>', opts)
+              buf_set_keymap('n', '<space>rn', '<cmd>lua vim.lsp.buf.rename()<CR>', opts)
+              buf_set_keymap('n', '<space>ca', '<cmd>lua vim.lsp.buf.code_action()<CR>', opts)
+              buf_set_keymap('n', 'gr', '<cmd>lua vim.lsp.buf.references()<CR>', opts)
+              buf_set_keymap('n', '<space>e', '<cmd>lua vim.lsp.diagnostic.show_line_diagnostics()<CR>', opts)
+              buf_set_keymap('n', '[d', '<cmd>lua vim.lsp.diagnostic.goto_prev()<CR>', opts)
+              buf_set_keymap('n', ']d', '<cmd>lua vim.lsp.diagnostic.goto_next()<CR>', opts)
+              buf_set_keymap('n', '<space>q', '<cmd>lua vim.lsp.diagnostic.set_loclist()<CR>', opts)
+              buf_set_keymap('n', '<space>f', '<cmd>lua vim.lsp.buf.formatting()<CR>', opts)
+
+            end
+
+            -- Use a loop to conveniently call 'setup' on multiple servers and
+            -- map buffer local keybindings when the language server attaches
+            -- local servers = { 'pyls', 'rust_analyzer', 'tsserver' }
+            local servers = { 'pylsp' }
+            for _, lsp in ipairs(servers) do
+              nvim_lsp[lsp].setup {
+                on_attach = on_attach,
+                flags = {
+                  debounce_text_changes = 150,
+                }
+              }
+            end
         end,
     }
     use 'nvim-treesitter/playground'
@@ -55,7 +276,66 @@ return require('packer').startup(function()
         'nvim-telescope/telescope.nvim',
         requires = { {'nvim-lua/plenary.nvim'} },
         config = function()
-            require "telescopeconf"
+            local present, actions = pcall(require, "telescope.actions")
+            if not present then
+                return
+            end
+
+            local present, tele_config = pcall(require, "telescope")
+            if not present then
+                return
+            end
+
+            tele_config.setup{
+              defaults = {
+               mappings = {
+                  i = {
+                    ["<esc>"] = actions.close,
+                    ['<C-u>'] = false,
+                  },
+                },
+                vimgrep_arguments = {
+                  'rg',
+                  '--color=never',
+                  '--no-heading',
+                  '--with-filename',
+                  '--line-number',
+                  '--column',
+                  '--smart-case'
+                },
+                prompt_prefix = "> ",
+                selection_caret = "> ",
+                entry_prefix = "  ",
+                initial_mode = "insert",
+                selection_strategy = "reset",
+                sorting_strategy = "descending",
+                layout_strategy = "horizontal",
+                layout_config = {
+                  horizontal = {
+                    mirror = false,
+                  },
+                  vertical = {
+                    mirror = false,
+                  },
+                },
+                file_sorter =  require'telescope.sorters'.get_fuzzy_file,
+                file_ignore_patterns = {},
+                generic_sorter =  require'telescope.sorters'.get_generic_fuzzy_sorter,
+                winblend = 0,
+                border = {},
+                borderchars = { '─', '│', '─', '│', '╭', '╮', '╯', '╰' },
+                color_devicons = true,
+                use_less = true,
+                path_display = {},
+                set_env = { ['COLORTERM'] = 'truecolor' }, -- default = nil,
+                file_previewer = require'telescope.previewers'.vim_buffer_cat.new,
+                grep_previewer = require'telescope.previewers'.vim_buffer_vimgrep.new,
+                qflist_previewer = require'telescope.previewers'.vim_buffer_qflist.new,
+
+                -- Developer configurations: Not meant for general override
+                buffer_previewer_maker = require'telescope.previewers'.buffer_previewer_maker
+              }
+            }
         end,
     }
     -- use 'kevinhwang91/rnvimr'
diff --git a/lua/lspconfigconf.lua b/lua/lspconfigconf.lua
deleted file mode 100644
index 2272bf0..0000000
--- a/lua/lspconfigconf.lua
+++ /dev/null
@@ -1,53 +0,0 @@
-local nvim_lsp = require('lspconfig')
-
---nvim_lsp.pylsp.setup{}
-local present, ts_config = pcall(require, "nvim-treesitter.configs")
-if not present then
-	return
-end
-
--- Use an on_attach function to only map the following keys
--- after the language server attaches to the current buffer
-local on_attach = function(client, bufnr)
-  local function buf_set_keymap(...) vim.api.nvim_buf_set_keymap(bufnr, ...) end
-  local function buf_set_option(...) vim.api.nvim_buf_set_option(bufnr, ...) end
-
-  -- Enable completion triggered by <c-x><c-o>
-  buf_set_option('omnifunc', 'v:lua.vim.lsp.omnifunc')
-
-  -- Mappings.
-  local opts = { noremap=true, silent=true }
-
-  -- See `:help vim.lsp.*` for documentation on any of the below functions
-  buf_set_keymap('n', 'gD', '<cmd>lua vim.lsp.buf.declaration()<CR>', opts)
-  buf_set_keymap('n', 'gd', '<cmd>lua vim.lsp.buf.definition()<CR>', opts)
-  buf_set_keymap('n', 'K', '<cmd>lua vim.lsp.buf.hover()<CR>', opts)
-  buf_set_keymap('n', 'gi', '<cmd>lua vim.lsp.buf.implementation()<CR>', opts)
-  buf_set_keymap('n', '<C-k>', '<cmd>lua vim.lsp.buf.signature_help()<CR>', opts)
-  buf_set_keymap('n', '<space>wa', '<cmd>lua vim.lsp.buf.add_workspace_folder()<CR>', opts)
-  buf_set_keymap('n', '<space>wr', '<cmd>lua vim.lsp.buf.remove_workspace_folder()<CR>', opts)
-  buf_set_keymap('n', '<space>wl', '<cmd>lua print(vim.inspect(vim.lsp.buf.list_workspace_folders()))<CR>', opts)
-  buf_set_keymap('n', '<space>D', '<cmd>lua vim.lsp.buf.type_definition()<CR>', opts)
-  buf_set_keymap('n', '<space>rn', '<cmd>lua vim.lsp.buf.rename()<CR>', opts)
-  buf_set_keymap('n', '<space>ca', '<cmd>lua vim.lsp.buf.code_action()<CR>', opts)
-  buf_set_keymap('n', 'gr', '<cmd>lua vim.lsp.buf.references()<CR>', opts)
-  buf_set_keymap('n', '<space>e', '<cmd>lua vim.lsp.diagnostic.show_line_diagnostics()<CR>', opts)
-  buf_set_keymap('n', '[d', '<cmd>lua vim.lsp.diagnostic.goto_prev()<CR>', opts)
-  buf_set_keymap('n', ']d', '<cmd>lua vim.lsp.diagnostic.goto_next()<CR>', opts)
-  buf_set_keymap('n', '<space>q', '<cmd>lua vim.lsp.diagnostic.set_loclist()<CR>', opts)
-  buf_set_keymap('n', '<space>f', '<cmd>lua vim.lsp.buf.formatting()<CR>', opts)
-
-end
-
--- Use a loop to conveniently call 'setup' on multiple servers and
--- map buffer local keybindings when the language server attaches
--- local servers = { 'pyls', 'rust_analyzer', 'tsserver' }
-local servers = { 'pylsp' }
-for _, lsp in ipairs(servers) do
-  nvim_lsp[lsp].setup {
-    on_attach = on_attach,
-    flags = {
-      debounce_text_changes = 150,
-    }
-  }
-end
diff --git a/lua/nvimlintconf.lua b/lua/nvimlintconf.lua
deleted file mode 100644
index 026ebe1..0000000
--- a/lua/nvimlintconf.lua
+++ /dev/null
@@ -1,34 +0,0 @@
-local null_ls = require("null-ls")
-local helpers = require("null-ls.helpers")
-
-local blacklint = {
-    method = null_ls.methods.DIAGNOSTICS,
-    filetypes = { "python" },
-    -- null_ls.generator creates an async source
-    -- that spawns the command with the given arguments and options
-    generator = null_ls.generator({
-        command = "black",
-        args = { "--stdin" },
-        to_stdin = true,
-        from_stderr = true,
-        -- choose an output format (raw, json, or line)
-        format = "line",
-        check_exit_code = function(code)
-            return code <= 1
-        end,
-        -- use helpers to parse the output from string matchers,
-        -- or parse it manually with a function
-        on_output = helpers.diagnostics.from_patterns({
-            {
-                pattern = [[:(%d+):(%d+) [%w-/]+ (.*)]],
-                groups = { "row", "col", "message" },
-            },
-            {
-                pattern = [[:(%d+) [%w-/]+ (.*)]],
-                groups = { "row", "message" },
-            },
-        }),
-    }),
-}
-
-null_ls.register(blacklint)
diff --git a/lua/settings.lua b/lua/settings.lua
deleted file mode 100644
index 4e0b209..0000000
--- a/lua/settings.lua
+++ /dev/null
@@ -1,115 +0,0 @@
---[[
-Todo
-
-https://dev.to/voyeg3r/writing-useful-lua-functions-to-my-neovim-14ki
-function to remove whitespace and preserve spot on save
-
-
-
-
-
-]]--
-local o = vim.o
-local g = vim.g
-local cmd = vim.cmd
-local map = vim.api.nvim_set_keymap
-
--- https://old.reddit.com/r/neovim/comments/lrz18i/how_to_change_colorscheme_in_lua_without_any/ 
-g.colors_name = "nord"
-
--- Set up spacebar as leader
-map('n', '<Space>', '', {})
-vim.g.mapleader = ' '
-
--- Set spaces > tabs, 4 as default
-o.expandtab = true
-o.tabstop = 4
-o.shiftwidth = 0
-
-o.wrap = false
-o.history = 1000
--- Wildmode show list, complete to first result
-o.wildignore = "*/app/cache,*/vendor,*/env,*.pyc,*/venv,*/__pycache__,*/venv"
-o.splitright = true
-o.splitbelow = true
-o.spelllang = "en_ca"
-
-
-local highlights = {
-    "Search ctermfg=166",
-    "DiffAdd    cterm=BOLD ctermfg=NONE ctermbg=22",
-    "DiffDelete cterm=BOLD ctermfg=NONE ctermbg=52",
-    "DiffChange cterm=BOLD ctermfg=NONE ctermbg=23",
-    "DiffText   cterm=BOLD ctermfg=NONE ctermbg=23",
-    "Normal guibg=NONE ctermbg=NONE",
-    "Search ctermbg=None ctermfg=166",
-    "PrimaryBlock   ctermfg=06 ctermbg=NONE",
-    "SecondaryBlock ctermfg=06 ctermbg=NONE",
-    "Blanks   ctermfg=07 ctermbg=NONE",
-    "ColorColumn ctermbg=cyan",
-}
-for i, highlight in ipairs(highlights) do
-    cmd('au VimEnter * hi ' .. highlight)
-end
-
--- Along with the highlight definition for ColorColumn above, these options
--- will set colored marks at certain line lengths
-cmd([[au BufEnter *.py let w:m1=matchadd('ColorColumn', '\%81v', 100)]])
-cmd([[au BufEnter *.py let w:m2=matchadd('Error', '\%121v', 100)]])
-cmd([[au BufLeave *.py call clearmatches()"]])
-
-
-
-options = { noremap = true }
-
-map('n', '<leader>y', ':let @+=@0<cr>', options)
-map('n', '<leader><leader>', ':noh<cr>', options)
-map('i', 'jj', '<esc>', options)
-map('n', 'gp', "`[v`]", options)
-
-
-
--- Status Line
-local mode_map = {
-    ['n'] = 'normal',
-    ['no'] = 'n·operator pending',
-    ['v'] = 'visual',
-    ['V'] = 'v·line',
-    [''] = 'v·block',
-    ['s'] = 'select',
-    ['S'] = 's·line',
-    [''] = 's·block',
-    ['i'] = 'insert',
-    ['R'] = 'replace',
-    ['Rv'] = 'v·replace',
-    ['c'] = 'command',
-    ['cv'] = 'vim ex',
-    ['ce'] = 'ex',
-    ['r'] = 'prompt',
-    ['rm'] = 'more',
-    ['r?'] = 'confirm',
-    ['!'] = 'shell',
-    ['t'] = 'terminal'
-}
-
-local function mode()
-    local m = vim.api.nvim_get_mode().mode
-    if mode_map[m] == nil then return m end
-    return '[' .. mode_map[m] .. '] '
-end
-
-local stl = {
-    '%#PrimaryBlock#',
-    mode(),
-    '%#SecondaryBlock#',
-    '%#Blanks#',
-    '%f',
-    '%m',
-    '%=',
-    '%#SecondaryBlock#',
-    '%l,%c ',
-    '%#PrimaryBlock#',
-    '%{&filetype}',
-}
-
-o.statusline = table.concat(stl)
diff --git a/lua/telescopeconf.lua b/lua/telescopeconf.lua
deleted file mode 100644
index a589d4f..0000000
--- a/lua/telescopeconf.lua
+++ /dev/null
@@ -1,52 +0,0 @@
-local actions = require "telescope.actions"
-
-require('telescope').setup{
-  defaults = {
-   mappings = {
-      i = {
-        ["<esc>"] = actions.close,
-        ['<C-u>'] = false,
-      },
-    },
-    vimgrep_arguments = {
-      'rg',
-      '--color=never',
-      '--no-heading',
-      '--with-filename',
-      '--line-number',
-      '--column',
-      '--smart-case'
-    },
-    prompt_prefix = "> ",
-    selection_caret = "> ",
-    entry_prefix = "  ",
-    initial_mode = "insert",
-    selection_strategy = "reset",
-    sorting_strategy = "descending",
-    layout_strategy = "horizontal",
-    layout_config = {
-      horizontal = {
-        mirror = false,
-      },
-      vertical = {
-        mirror = false,
-      },
-    },
-    file_sorter =  require'telescope.sorters'.get_fuzzy_file,
-    file_ignore_patterns = {},
-    generic_sorter =  require'telescope.sorters'.get_generic_fuzzy_sorter,
-    winblend = 0,
-    border = {},
-    borderchars = { '─', '│', '─', '│', '╭', '╮', '╯', '╰' },
-    color_devicons = true,
-    use_less = true,
-    path_display = {},
-    set_env = { ['COLORTERM'] = 'truecolor' }, -- default = nil,
-    file_previewer = require'telescope.previewers'.vim_buffer_cat.new,
-    grep_previewer = require'telescope.previewers'.vim_buffer_vimgrep.new,
-    qflist_previewer = require'telescope.previewers'.vim_buffer_qflist.new,
-
-    -- Developer configurations: Not meant for general override
-    buffer_previewer_maker = require'telescope.previewers'.buffer_previewer_maker
-  }
-}
diff --git a/lua/treesitterconf.lua b/lua/treesitterconf.lua
deleted file mode 100644
index ae491bb..0000000
--- a/lua/treesitterconf.lua
+++ /dev/null
@@ -1,18 +0,0 @@
-local present, ts_config = pcall(require, "nvim-treesitter.configs")
-if not present then
-	return
-end
-
-ts_config.setup {
-	ensure_installed = {
-		"python",
-		"lua",
-		"nix",
-	},
-	highlight = {
-		enable = true,
-	},
-	indent = {
-		enable = true, 
-	}
-}
diff --git a/plugin/packer_compiled.lua b/plugin/packer_compiled.lua
index e344373..e93d62c 100644
--- a/plugin/packer_compiled.lua
+++ b/plugin/packer_compiled.lua
@@ -74,12 +74,12 @@ _G.packer_plugins = {
     path = "/home/thorny/.local/share/nvim/site/pack/packer/start/nord-vim"
   },
   ["nvim-lspconfig"] = {
-    config = { "\27LJ\2\n-\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\18lspconfigconf\frequire\0" },
+    config = { "\27LJ\2\nA\2\0\4\1\3\0\a6\0\0\0009\0\1\0009\0\2\0-\2\0\0G\3\0\0A\0\1\1K\0\1\0\1À\24nvim_buf_set_keymap\bapi\bvimA\2\0\4\1\3\0\a6\0\0\0009\0\1\0009\0\2\0-\2\0\0G\3\0\0A\0\1\1K\0\1\0\1À\24nvim_buf_set_option\bapi\bvimÔ\n\1\2\v\0(\0o3\2\0\0003\3\1\0\18\4\3\0'\6\2\0'\a\3\0B\4\3\0015\4\4\0\18\5\2\0'\a\5\0'\b\6\0'\t\a\0\18\n\4\0B\5\5\1\18\5\2\0'\a\5\0'\b\b\0'\t\t\0\18\n\4\0B\5\5\1\18\5\2\0'\a\5\0'\b\n\0'\t\v\0\18\n\4\0B\5\5\1\18\5\2\0'\a\5\0'\b\f\0'\t\r\0\18\n\4\0B\5\5\1\18\5\2\0'\a\5\0'\b\14\0'\t\15\0\18\n\4\0B\5\5\1\18\5\2\0'\a\5\0'\b\16\0'\t\17\0\18\n\4\0B\5\5\1\18\5\2\0'\a\5\0'\b\18\0'\t\19\0\18\n\4\0B\5\5\1\18\5\2\0'\a\5\0'\b\20\0'\t\21\0\18\n\4\0B\5\5\1\18\5\2\0'\a\5\0'\b\22\0'\t\23\0\18\n\4\0B\5\5\1\18\5\2\0'\a\5\0'\b\24\0'\t\25\0\18\n\4\0B\5\5\1\18\5\2\0'\a\5\0'\b\26\0'\t\27\0\18\n\4\0B\5\5\1\18\5\2\0'\a\5\0'\b\28\0'\t\29\0\18\n\4\0B\5\5\1\18\5\2\0'\a\5\0'\b\30\0'\t\31\0\18\n\4\0B\5\5\1\18\5\2\0'\a\5\0'\b \0'\t!\0\18\n\4\0B\5\5\1\18\5\2\0'\a\5\0'\b\"\0'\t#\0\18\n\4\0B\5\5\1\18\5\2\0'\a\5\0'\b$\0'\t%\0\18\n\4\0B\5\5\1\18\5\2\0'\a\5\0'\b&\0'\t'\0\18\n\4\0B\5\5\0012\0\0€K\0\1\0*<cmd>lua vim.lsp.buf.formatting()<CR>\r<space>f2<cmd>lua vim.lsp.diagnostic.set_loclist()<CR>\r<space>q0<cmd>lua vim.lsp.diagnostic.goto_next()<CR>\a]d0<cmd>lua vim.lsp.diagnostic.goto_prev()<CR>\a[d<<cmd>lua vim.lsp.diagnostic.show_line_diagnostics()<CR>\r<space>e*<cmd>lua vim.lsp.buf.references()<CR>\agr+<cmd>lua vim.lsp.buf.code_action()<CR>\14<space>ca&<cmd>lua vim.lsp.buf.rename()<CR>\14<space>rn/<cmd>lua vim.lsp.buf.type_definition()<CR>\r<space>DJ<cmd>lua print(vim.inspect(vim.lsp.buf.list_workspace_folders()))<CR>\14<space>wl7<cmd>lua vim.lsp.buf.remove_workspace_folder()<CR>\14<space>wr4<cmd>lua vim.lsp.buf.add_workspace_folder()<CR>\14<space>wa.<cmd>lua vim.lsp.buf.signature_help()<CR>\n<C-k>.<cmd>lua vim.lsp.buf.implementation()<CR>\agi%<cmd>lua vim.lsp.buf.hover()<CR>\6K*<cmd>lua vim.lsp.buf.definition()<CR>\agd+<cmd>lua vim.lsp.buf.declaration()<CR>\agD\6n\1\0\2\vsilent\2\fnoremap\2\27v:lua.vim.lsp.omnifunc\romnifunc\0\0Æ\1\1\0\r\0\v\0\0246\0\0\0006\2\1\0'\3\2\0B\0\3\3\14\0\0\0X\2\1€2\0\16€3\2\3\0005\3\4\0006\4\5\0\18\6\3\0B\4\2\4X\a\a€8\t\b\0019\t\6\t5\v\a\0=\2\b\v5\f\t\0=\f\n\vB\t\2\1E\a\3\3R\a÷K\0\1\0K\0\1\0\nflags\1\0\1\26debounce_text_changes\3–\1\14on_attach\1\0\0\nsetup\vipairs\1\2\0\0\npylsp\0\14lspconfig\frequire\npcall\0" },
     loaded = true,
     path = "/home/thorny/.local/share/nvim/site/pack/packer/start/nvim-lspconfig"
   },
   ["nvim-treesitter"] = {
-    config = { "\27LJ\2\n.\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\19treesitterconf\frequire\0" },
+    config = { "\27LJ\2\nÅ\1\0\0\6\0\v\0\0176\0\0\0006\2\1\0'\3\2\0B\0\3\3\14\0\0\0X\2\1€K\0\1\0009\2\3\0015\4\5\0005\5\4\0=\5\6\0045\5\a\0=\5\b\0045\5\t\0=\5\n\4B\2\2\1K\0\1\0\vindent\1\0\1\venable\2\14highlight\1\0\1\venable\2\21ensure_installed\1\0\0\1\4\0\0\vpython\blua\bnix\nsetup\28nvim-treesitter.configs\frequire\npcall\0" },
     loaded = true,
     path = "/home/thorny/.local/share/nvim/site/pack/packer/start/nvim-treesitter"
   },
@@ -96,7 +96,7 @@ _G.packer_plugins = {
     path = "/home/thorny/.local/share/nvim/site/pack/packer/start/plenary.nvim"
   },
   ["telescope.nvim"] = {
-    config = { "\27LJ\2\n-\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\18telescopeconf\frequire\0" },
+    config = { "\27LJ\2\nÞ\b\0\0\v\0+\0M6\0\0\0006\2\1\0'\3\2\0B\0\3\3\14\0\0\0X\2\1€K\0\1\0006\2\0\0006\4\1\0'\5\3\0B\2\3\3\14\0\2\0X\4\1€K\0\1\0009\4\4\0035\6)\0005\a\n\0005\b\b\0005\t\6\0009\n\5\1=\n\a\t=\t\t\b=\b\v\a5\b\f\0=\b\r\a5\b\15\0005\t\14\0=\t\16\b5\t\17\0=\t\18\b=\b\19\a6\b\1\0'\n\20\0B\b\2\0029\b\21\b=\b\22\a4\b\0\0=\b\23\a6\b\1\0'\n\20\0B\b\2\0029\b\24\b=\b\25\a4\b\0\0=\b\26\a5\b\27\0=\b\28\a4\b\0\0=\b\29\a5\b\30\0=\b\31\a6\b\1\0'\n \0B\b\2\0029\b!\b9\b\"\b=\b#\a6\b\1\0'\n \0B\b\2\0029\b$\b9\b\"\b=\b%\a6\b\1\0'\n \0B\b\2\0029\b&\b9\b\"\b=\b'\a6\b\1\0'\n \0B\b\2\0029\b(\b=\b(\a=\a*\6B\4\2\1K\0\1\0\rdefaults\1\0\0\27buffer_previewer_maker\21qflist_previewer\22vim_buffer_qflist\19grep_previewer\23vim_buffer_vimgrep\19file_previewer\bnew\19vim_buffer_cat\25telescope.previewers\fset_env\1\0\1\14COLORTERM\14truecolor\17path_display\16borderchars\1\t\0\0\b─\b│\b─\b│\bâ•­\bâ•®\b╯\bâ•°\vborder\19generic_sorter\29get_generic_fuzzy_sorter\25file_ignore_patterns\16file_sorter\19get_fuzzy_file\22telescope.sorters\18layout_config\rvertical\1\0\1\vmirror\1\15horizontal\1\0\0\1\0\1\vmirror\1\22vimgrep_arguments\1\b\0\0\arg\18--color=never\17--no-heading\20--with-filename\18--line-number\r--column\17--smart-case\rmappings\1\0\n\18prompt_prefix\a> \ruse_less\2\19color_devicons\2\rwinblend\3\0\20layout_strategy\15horizontal\21sorting_strategy\15descending\23selection_strategy\nreset\17initial_mode\vinsert\17entry_prefix\a  \20selection_caret\a> \6i\1\0\0\n<esc>\1\0\1\n<C-u>\1\nclose\nsetup\14telescope\22telescope.actions\frequire\npcall\0" },
     loaded = true,
     path = "/home/thorny/.local/share/nvim/site/pack/packer/start/telescope.nvim"
   }
@@ -105,15 +105,15 @@ _G.packer_plugins = {
 time([[Defining packer_plugins]], false)
 -- Config for: nvim-treesitter
 time([[Config for nvim-treesitter]], true)
-try_loadstring("\27LJ\2\n.\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\19treesitterconf\frequire\0", "config", "nvim-treesitter")
+try_loadstring("\27LJ\2\nÅ\1\0\0\6\0\v\0\0176\0\0\0006\2\1\0'\3\2\0B\0\3\3\14\0\0\0X\2\1€K\0\1\0009\2\3\0015\4\5\0005\5\4\0=\5\6\0045\5\a\0=\5\b\0045\5\t\0=\5\n\4B\2\2\1K\0\1\0\vindent\1\0\1\venable\2\14highlight\1\0\1\venable\2\21ensure_installed\1\0\0\1\4\0\0\vpython\blua\bnix\nsetup\28nvim-treesitter.configs\frequire\npcall\0", "config", "nvim-treesitter")
 time([[Config for nvim-treesitter]], false)
 -- Config for: nvim-lspconfig
 time([[Config for nvim-lspconfig]], true)
-try_loadstring("\27LJ\2\n-\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\18lspconfigconf\frequire\0", "config", "nvim-lspconfig")
+try_loadstring("\27LJ\2\nA\2\0\4\1\3\0\a6\0\0\0009\0\1\0009\0\2\0-\2\0\0G\3\0\0A\0\1\1K\0\1\0\1À\24nvim_buf_set_keymap\bapi\bvimA\2\0\4\1\3\0\a6\0\0\0009\0\1\0009\0\2\0-\2\0\0G\3\0\0A\0\1\1K\0\1\0\1À\24nvim_buf_set_option\bapi\bvimÔ\n\1\2\v\0(\0o3\2\0\0003\3\1\0\18\4\3\0'\6\2\0'\a\3\0B\4\3\0015\4\4\0\18\5\2\0'\a\5\0'\b\6\0'\t\a\0\18\n\4\0B\5\5\1\18\5\2\0'\a\5\0'\b\b\0'\t\t\0\18\n\4\0B\5\5\1\18\5\2\0'\a\5\0'\b\n\0'\t\v\0\18\n\4\0B\5\5\1\18\5\2\0'\a\5\0'\b\f\0'\t\r\0\18\n\4\0B\5\5\1\18\5\2\0'\a\5\0'\b\14\0'\t\15\0\18\n\4\0B\5\5\1\18\5\2\0'\a\5\0'\b\16\0'\t\17\0\18\n\4\0B\5\5\1\18\5\2\0'\a\5\0'\b\18\0'\t\19\0\18\n\4\0B\5\5\1\18\5\2\0'\a\5\0'\b\20\0'\t\21\0\18\n\4\0B\5\5\1\18\5\2\0'\a\5\0'\b\22\0'\t\23\0\18\n\4\0B\5\5\1\18\5\2\0'\a\5\0'\b\24\0'\t\25\0\18\n\4\0B\5\5\1\18\5\2\0'\a\5\0'\b\26\0'\t\27\0\18\n\4\0B\5\5\1\18\5\2\0'\a\5\0'\b\28\0'\t\29\0\18\n\4\0B\5\5\1\18\5\2\0'\a\5\0'\b\30\0'\t\31\0\18\n\4\0B\5\5\1\18\5\2\0'\a\5\0'\b \0'\t!\0\18\n\4\0B\5\5\1\18\5\2\0'\a\5\0'\b\"\0'\t#\0\18\n\4\0B\5\5\1\18\5\2\0'\a\5\0'\b$\0'\t%\0\18\n\4\0B\5\5\1\18\5\2\0'\a\5\0'\b&\0'\t'\0\18\n\4\0B\5\5\0012\0\0€K\0\1\0*<cmd>lua vim.lsp.buf.formatting()<CR>\r<space>f2<cmd>lua vim.lsp.diagnostic.set_loclist()<CR>\r<space>q0<cmd>lua vim.lsp.diagnostic.goto_next()<CR>\a]d0<cmd>lua vim.lsp.diagnostic.goto_prev()<CR>\a[d<<cmd>lua vim.lsp.diagnostic.show_line_diagnostics()<CR>\r<space>e*<cmd>lua vim.lsp.buf.references()<CR>\agr+<cmd>lua vim.lsp.buf.code_action()<CR>\14<space>ca&<cmd>lua vim.lsp.buf.rename()<CR>\14<space>rn/<cmd>lua vim.lsp.buf.type_definition()<CR>\r<space>DJ<cmd>lua print(vim.inspect(vim.lsp.buf.list_workspace_folders()))<CR>\14<space>wl7<cmd>lua vim.lsp.buf.remove_workspace_folder()<CR>\14<space>wr4<cmd>lua vim.lsp.buf.add_workspace_folder()<CR>\14<space>wa.<cmd>lua vim.lsp.buf.signature_help()<CR>\n<C-k>.<cmd>lua vim.lsp.buf.implementation()<CR>\agi%<cmd>lua vim.lsp.buf.hover()<CR>\6K*<cmd>lua vim.lsp.buf.definition()<CR>\agd+<cmd>lua vim.lsp.buf.declaration()<CR>\agD\6n\1\0\2\vsilent\2\fnoremap\2\27v:lua.vim.lsp.omnifunc\romnifunc\0\0Æ\1\1\0\r\0\v\0\0246\0\0\0006\2\1\0'\3\2\0B\0\3\3\14\0\0\0X\2\1€2\0\16€3\2\3\0005\3\4\0006\4\5\0\18\6\3\0B\4\2\4X\a\a€8\t\b\0019\t\6\t5\v\a\0=\2\b\v5\f\t\0=\f\n\vB\t\2\1E\a\3\3R\a÷K\0\1\0K\0\1\0\nflags\1\0\1\26debounce_text_changes\3–\1\14on_attach\1\0\0\nsetup\vipairs\1\2\0\0\npylsp\0\14lspconfig\frequire\npcall\0", "config", "nvim-lspconfig")
 time([[Config for nvim-lspconfig]], false)
 -- Config for: telescope.nvim
 time([[Config for telescope.nvim]], true)
-try_loadstring("\27LJ\2\n-\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\18telescopeconf\frequire\0", "config", "telescope.nvim")
+try_loadstring("\27LJ\2\nÞ\b\0\0\v\0+\0M6\0\0\0006\2\1\0'\3\2\0B\0\3\3\14\0\0\0X\2\1€K\0\1\0006\2\0\0006\4\1\0'\5\3\0B\2\3\3\14\0\2\0X\4\1€K\0\1\0009\4\4\0035\6)\0005\a\n\0005\b\b\0005\t\6\0009\n\5\1=\n\a\t=\t\t\b=\b\v\a5\b\f\0=\b\r\a5\b\15\0005\t\14\0=\t\16\b5\t\17\0=\t\18\b=\b\19\a6\b\1\0'\n\20\0B\b\2\0029\b\21\b=\b\22\a4\b\0\0=\b\23\a6\b\1\0'\n\20\0B\b\2\0029\b\24\b=\b\25\a4\b\0\0=\b\26\a5\b\27\0=\b\28\a4\b\0\0=\b\29\a5\b\30\0=\b\31\a6\b\1\0'\n \0B\b\2\0029\b!\b9\b\"\b=\b#\a6\b\1\0'\n \0B\b\2\0029\b$\b9\b\"\b=\b%\a6\b\1\0'\n \0B\b\2\0029\b&\b9\b\"\b=\b'\a6\b\1\0'\n \0B\b\2\0029\b(\b=\b(\a=\a*\6B\4\2\1K\0\1\0\rdefaults\1\0\0\27buffer_previewer_maker\21qflist_previewer\22vim_buffer_qflist\19grep_previewer\23vim_buffer_vimgrep\19file_previewer\bnew\19vim_buffer_cat\25telescope.previewers\fset_env\1\0\1\14COLORTERM\14truecolor\17path_display\16borderchars\1\t\0\0\b─\b│\b─\b│\bâ•­\bâ•®\b╯\bâ•°\vborder\19generic_sorter\29get_generic_fuzzy_sorter\25file_ignore_patterns\16file_sorter\19get_fuzzy_file\22telescope.sorters\18layout_config\rvertical\1\0\1\vmirror\1\15horizontal\1\0\0\1\0\1\vmirror\1\22vimgrep_arguments\1\b\0\0\arg\18--color=never\17--no-heading\20--with-filename\18--line-number\r--column\17--smart-case\rmappings\1\0\n\18prompt_prefix\a> \ruse_less\2\19color_devicons\2\rwinblend\3\0\20layout_strategy\15horizontal\21sorting_strategy\15descending\23selection_strategy\nreset\17initial_mode\vinsert\17entry_prefix\a  \20selection_caret\a> \6i\1\0\0\n<esc>\1\0\1\n<C-u>\1\nclose\nsetup\14telescope\22telescope.actions\frequire\npcall\0", "config", "telescope.nvim")
 time([[Config for telescope.nvim]], false)
 if should_profile then save_profiles() end