diff --git a/neovim/lazylock-0.9.json b/neovim/lazylock-0.9.json
new file mode 100644
index 0000000..a2c334e
--- /dev/null
+++ b/neovim/lazylock-0.9.json
@@ -0,0 +1,282 @@
+{
+  "CopilotChat.nvim": {
+    "branch": "canary",
+    "commit": "92bc7b5e564c23b12b2ed41dd7657fdafe39d95f"
+  },
+  "LuaSnip": {
+    "branch": "master",
+    "commit": "500981ff6cefc7343e3959ef0f939bd0bfd49ba9"
+  },
+  "cmp-buffer": {
+    "branch": "main",
+    "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa"
+  },
+  "cmp-nvim-lsp": {
+    "branch": "main",
+    "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d"
+  },
+  "cmp-spell": {
+    "branch": "master",
+    "commit": "694a4e50809d6d645c1ea29015dad0c293f019d6"
+  },
+  "cmp_luasnip": {
+    "branch": "master",
+    "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843"
+  },
+  "colorbuddy.vim": {
+    "branch": "master",
+    "commit": "8b968581e5c19d22a861d5f3fe5dbd83394fa681"
+  },
+  "copilot.vim": {
+    "branch": "release",
+    "commit": "25f73977033c597d530c7ab0e211d99b60927d2d"
+  },
+  "dark-notify": {
+    "branch": "master",
+    "commit": "891adc07dd7b367b840f1e9875b075fd8af4dc52"
+  },
+  "dressing.nvim": {
+    "branch": "master",
+    "commit": "6741f1062d3dc6e4755367a7e9b347b553623f04"
+  },
+  "file-line": {
+    "branch": "master",
+    "commit": "67c3590b25703444663edcd4188991147b1bc846"
+  },
+  "friendly-snippets": {
+    "branch": "main",
+    "commit": "00ebcaa159e817150bd83bfe2d51fa3b3377d5c4"
+  },
+  "git-scripts.nvim": {
+    "branch": "dev",
+    "commit": "2f7c075f485ea9b9d834814028c691492d52445c"
+  },
+  "goyo.vim": {
+    "branch": "master",
+    "commit": "fa0263d456dd43f5926484d1c4c7022dfcb21ba9"
+  },
+  "inc-rename.nvim": {
+    "branch": "main",
+    "commit": "8ba77017ca468f3029bf88ef409c2d20476ea66b"
+  },
+  "lazy.nvim": {
+    "branch": "main",
+    "commit": "5473e3d77c13e40fc4758fa977a1f2c14d0b4ceb"
+  },
+  "limelight.vim": {
+    "branch": "master",
+    "commit": "785c1e17fe90c587ebca88920baa3146cd6e30fa"
+  },
+  "lsp_signature.nvim": {
+    "branch": "master",
+    "commit": "a38da0a61c172bb59e34befc12efe48359884793"
+  },
+  "lualine.nvim": {
+    "branch": "master",
+    "commit": "544dd1583f9bb27b393f598475c89809c4d5e86b"
+  },
+  "lush.nvim": {
+    "branch": "main",
+    "commit": "1b66ab197b177aabc2270a2c9cb8019fa5a367df"
+  },
+  "mason-lspconfig.nvim": {
+    "branch": "main",
+    "commit": "37a336b653f8594df75c827ed589f1c91d91ff6c"
+  },
+  "mason.nvim": {
+    "branch": "main",
+    "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22"
+  },
+  "neodev.nvim": {
+    "branch": "main",
+    "commit": "46aa467dca16cf3dfe27098042402066d2ae242d"
+  },
+  "null-ls.nvim": {
+    "branch": "main",
+    "commit": "0010ea927ab7c09ef0ce9bf28c2b573fc302f5a7"
+  },
+  "nvim-cmp": {
+    "branch": "main",
+    "commit": "d818fd0624205b34e14888358037fb6f5dc51234"
+  },
+  "nvim-colorizer.lua": {
+    "branch": "master",
+    "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e"
+  },
+  "nvim-dap": {
+    "branch": "master",
+    "commit": "6f79b822997f2e8a789c6034e147d42bc6706770"
+  },
+  "nvim-dap-python": {
+    "branch": "master",
+    "commit": "d777c2b32ed39f61209c09bede28d7491621a631"
+  },
+  "nvim-dap-ui": {
+    "branch": "master",
+    "commit": "a5606bc5958db86f8d92803bea7400ee26a8d7e4"
+  },
+  "nvim-lspconfig": {
+    "branch": "master",
+    "commit": "01e08d4bf1c35e5126b2ad5209725e4c552289ab"
+  },
+  "nvim-navic": {
+    "branch": "master",
+    "commit": "8649f694d3e76ee10c19255dece6411c29206a54"
+  },
+  "nvim-nio": {
+    "branch": "master",
+    "commit": "a428f309119086dc78dd4b19306d2d67be884eee"
+  },
+  "nvim-notify": {
+    "branch": "master",
+    "commit": "d333b6f167900f6d9d42a59005d82919830626bf"
+  },
+  "nvim-solarized-lua": {
+    "branch": "master",
+    "commit": "d69a263c97cbc765ca442d682b3283aefd61d4ac"
+  },
+  "nvim-treesitter": {
+    "branch": "master",
+    "commit": "0758155d4dfacfa959ad82ffa3879cb69c82e719"
+  },
+  "nvim-treesitter-textobjects": {
+    "branch": "master",
+    "commit": "34867c69838078df7d6919b130c0541c0b400c47"
+  },
+  "obsidian.nvim": {
+    "branch": "main",
+    "commit": "0f16bb4a1743d4416b905564ee753c2a1286111a"
+  },
+  "plenary.nvim": {
+    "branch": "master",
+    "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683"
+  },
+  "popup.nvim": {
+    "branch": "master",
+    "commit": "b7404d35d5d3548a82149238289fa71f7f6de4ac"
+  },
+  "rust-tools.nvim": {
+    "branch": "master",
+    "commit": "676187908a1ce35ffcd727c654ed68d851299d3e"
+  },
+  "sg.nvim": {
+    "branch": "master",
+    "commit": "8bdd4d19da2268072708d5fe18fda9c23e16509d"
+  },
+  "startuptime.vim": {
+    "branch": "master",
+    "commit": "dfa57f522d6f61793fe5fea65bca7484751b8ca2"
+  },
+  "tcomment_vim": {
+    "branch": "master",
+    "commit": "48ab639a461d9b8344f7fee06cb69b4374863b13"
+  },
+  "telescope-file-browser.nvim": {
+    "branch": "master",
+    "commit": "a7ab9a957b17199183388c6f357d614fcaa508e5"
+  },
+  "telescope.nvim": {
+    "branch": "master",
+    "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026"
+  },
+  "todo-comments.nvim": {
+    "branch": "main",
+    "commit": "313b04e5b02d29ab9275c9295ff5e2b73921b0eb"
+  },
+  "tokyonight.nvim": {
+    "branch": "main",
+    "commit": "6adfcde66e8af2f22dd5d76060980abd8daa0df8"
+  },
+  "trouble.nvim": {
+    "branch": "main",
+    "commit": "f1168feada93c0154ede4d1fe9183bf69bac54ea"
+  },
+  "vim-android": {
+    "branch": "master",
+    "commit": "26990f9fa27b23ca5faf83e14d56711c0fec40ea"
+  },
+  "vim-argwrap": {
+    "branch": "master",
+    "commit": "f3e26a5ad249d09467804b92e760d08b1cc457a1"
+  },
+  "vim-endwise": {
+    "branch": "master",
+    "commit": "3719ffddb5e42bf67b55b2183d7a6fb8d3e5a2b8"
+  },
+  "vim-eunuch": {
+    "branch": "master",
+    "commit": "8fb3904be27b6b60d086f87c2570085902414069"
+  },
+  "vim-forcedotcom": {
+    "branch": "master",
+    "commit": "a30ba7e7f6a3fc2a7cd7ed8f4d7188b42fc52264"
+  },
+  "vim-fugitive": {
+    "branch": "master",
+    "commit": "8c8cdf4405cb8bdb70dd9812a33bb52363a87dbc"
+  },
+  "vim-grepper": {
+    "branch": "master",
+    "commit": "485d349125d46f2788833ecb43df7a14c46706f6"
+  },
+  "vim-gutentags": {
+    "branch": "master",
+    "commit": "aa47c5e29c37c52176c44e61c780032dfacef3dd"
+  },
+  "vim-pencil": {
+    "branch": "master",
+    "commit": "6d70438a8886eaf933c38a7a43a61adb0a7815ed"
+  },
+  "vim-polyglot": {
+    "branch": "master",
+    "commit": "bc8a81d3592dab86334f27d1d43c080ebf680d42"
+  },
+  "vim-repeat": {
+    "branch": "master",
+    "commit": "65846025c15494983dafe5e3b46c8f88ab2e9635"
+  },
+  "vim-rsi": {
+    "branch": "master",
+    "commit": "45540637ead22f011e8215f1c90142e49d946a54"
+  },
+  "vim-startify": {
+    "branch": "master",
+    "commit": "4e089dffdad46f3f5593f34362d530e8fe823dcf"
+  },
+  "vim-surround": {
+    "branch": "master",
+    "commit": "3d188ed2113431cf8dac77be61b842acb64433d9"
+  },
+  "vim-textobj-sentence": {
+    "branch": "master",
+    "commit": "c5dd562aff2c389dfc8cd55e6499854d352a80b8"
+  },
+  "vim-textobj-user": {
+    "branch": "master",
+    "commit": "41a675ddbeefd6a93664a4dc52f302fe3086a933"
+  },
+  "vim-togglelist": {
+    "branch": "master",
+    "commit": "48f0d30292efdf20edc883e61b121e6123e03df7"
+  },
+  "vim-vinegar": {
+    "branch": "master",
+    "commit": "bb1bcddf43cfebe05eb565a84ab069b357d0b3d6"
+  },
+  "which-key.nvim": {
+    "branch": "main",
+    "commit": "4b7167f8fb2dba3d01980735e3509e172c024c29"
+  },
+  "wombat.nvim": {
+    "branch": "main",
+    "commit": "efdfe7ec9d2d961247d00b7178356407f4c9d241"
+  },
+  "wombat256.vim": {
+    "branch": "master",
+    "commit": "8734ba45dcf5e38c4d2686b35c94f9fcb30427e2"
+  },
+  "wombuddy.nvim": {
+    "branch": "main",
+    "commit": "29deb8fa68a1b9121b551d3d9530a8c1e4153f9c"
+  }
+}
diff --git a/neovim/lua/init.lua b/neovim/lua/init.lua
index f3f575c..6913c25 100644
--- a/neovim/lua/init.lua
+++ b/neovim/lua/init.lua
@@ -24,8 +24,4 @@ end
 vim.g.polyglot_disabled = { "go", "rust" }
 
 -- Plugins
--- Packer auto installs and then lazy loads itself on PackerCommand and require the plugins module
--- This command should only really be needed to bootstrap a new system
-vim.api.nvim_create_user_command("PackerBootstrap", function()
-    require("plugins")
-end, { desc = "Bootstrap Packer" })
+require("lazy_init")
diff --git a/neovim/lua/lazy_init.lua b/neovim/lua/lazy_init.lua
new file mode 100644
index 0000000..1b66579
--- /dev/null
+++ b/neovim/lua/lazy_init.lua
@@ -0,0 +1,54 @@
+local utils = require("utils")
+-- Bootstrap lazy.nvim
+local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
+if not (vim.uv or vim.loop).fs_stat(lazypath) then
+    local lazyrepo = "https://github.com/folke/lazy.nvim.git"
+    local out = vim.fn.system({ "git", "clone", "--filter=blob:none", "--branch=stable", lazyrepo, lazypath })
+    if vim.v.shell_error ~= 0 then
+        vim.api.nvim_echo({
+            { "Failed to clone lazy.nvim:\n", "ErrorMsg" },
+            { out, "WarningMsg" },
+            { "\nPress any key to exit..." },
+        }, true, {})
+        vim.fn.getchar()
+        os.exit(1)
+    end
+end
+vim.opt.rtp:prepend(lazypath)
+
+-- Setup lazy.nvim
+require("lazy").setup({
+    spec = {
+        -- TODO: Move plugins to be split by plugin or feature types
+        -- { import = "plugins" },
+        { import = "lazy_plugins" },
+    },
+    lockfile = vim.fn.stdpath("config") .. utils.map_version_rule({
+        [">=0.9.0"] = "/lazylock-0.9.json",
+        [">=0.8.0"] = "/lazylock-0.8.json",
+        [">=0.7.0"] = "/lazylock-0.7.json",
+        [">=0.6.0"] = "/lazylock-0.6.json",
+    }),
+    ui = {
+        icons = {
+            cmd = "⌘",
+            config = "🛠",
+            event = "📅",
+            ft = "📂",
+            init = "⚙",
+            keys = "🗝",
+            plugin = "🔌",
+            runtime = "💻",
+            require = "🌙",
+            source = "📄",
+            start = "🚀",
+            task = "📌",
+            lazy = "💤 ",
+        },
+    },
+    -- Configure any other settings here. See the documentation for more details.
+    -- colorscheme that will be used when installing plugins.
+    install = { colorscheme = { "habamax" } },
+    -- automatically check for plugin updates
+    checker = { enabled = true },
+})
diff --git a/neovim/lua/lazy_plugins.lua b/neovim/lua/lazy_plugins.lua
new file mode 100644
index 0000000..3f0f28a
--- /dev/null
+++ b/neovim/lua/lazy_plugins.lua
@@ -0,0 +1,558 @@
+local utils = require("utils")
+return {
+    -- Colorschemes
+    {
+        "https://github.com/vim-scripts/wombat256.vim",
+    },
+    {
+        "https://github.com/ViViDboarder/wombat.nvim",
+        dependencies = {
+            {
+                "https://github.com/rktjmp/lush.nvim",
+                tag = utils.map_version_rule({
+                    [">=0.7.0"] = utils.nil_val,
+                    [">=0.5.0"] = "v1.0.1",
+                }),
+            },
+        },
+    },
+    {
+        "https://github.com/ViViDboarder/wombuddy.nvim",
+        dependencies = { { "https://github.com/tjdevries/colorbuddy.vim" } },
+    },
+    {
+        "https://github.com/ishan9299/nvim-solarized-lua",
+        commit = utils.map_version_rule({
+            [">=0.7.0"] = utils.nil_val,
+            ["<0.7.0"] = "faba49b",
+        }),
+    },
+    {
+        "https://github.com/folke/tokyonight.nvim",
+        build = 'fish -c \'echo "set --path --prepend fish_themes_path "(pwd)"/extras" > ~/.config/fish/conf.d/tokyonight.fish\' || true', -- luacheck: no max line length
+    },
+    -- Some helpers
+    -- Auto and ends to some ifs and dos
+    { "https://github.com/tpope/vim-endwise" },
+
+    -- Unix commands from vim? Yup!
+    { "https://github.com/tpope/vim-eunuch" },
+
+    -- Adds repeats for custom motions
+    { "https://github.com/tpope/vim-repeat" },
+
+    -- Readline shortcuts
+    { "https://github.com/tpope/vim-rsi" },
+
+    -- Surround motions
+    { "https://github.com/tpope/vim-surround" },
+
+    -- Better netrw
+    { "https://github.com/tpope/vim-vinegar" },
+
+    -- Easier jumping to lines
+    { "https://github.com/vim-scripts/file-line" },
+
+    -- Auto ctags generation
+    { "https://github.com/ludovicchabant/vim-gutentags" },
+    -- Make it easier to discover some of my keymaps
+    {
+        "https://github.com/folke/which-key.nvim",
+        config = function()
+            require("plugins.whichkey").configure()
+        end,
+        version = "1.x.x",
+    },
+    -- Better commenting
+    {
+        "https://github.com/tomtom/tcomment_vim",
+        config = function()
+            require("utils").keymap_set("n", "//", ":TComment<CR>", { desc = "Toggle comment" })
+            require("utils").keymap_set("v", "//", ":TCommentBlock<CR>", { desc = "Toggle comment" })
+        end,
+    },
+    -- Allow wrapping and joining of arguments across multiple lines
+    {
+        "https://github.com/FooSoft/vim-argwrap",
+        config = function()
+            require("utils").keymap_set("n", "<Leader>a", "<cmd>ArgWrap<CR>", {
+                desc = "Wrap or unwrap arguments",
+            })
+        end,
+    },
+    -- Adds git operations to vim
+    {
+        "https://github.com/tpope/vim-fugitive",
+        tag = utils.map_version_rule({
+            [">=0.9.2"] = utils.nil_val,
+            -- HACK: Pinning to avoid neovim bug https://github.com/neovim/neovim/issues/10121
+            -- when used in status line.
+            ["<0.9.2"] = "v3.6",
+        }),
+        config = function()
+            require("utils").keymap_set("n", "gb", "<cmd>Git blame<CR>", { desc = "Git blame" })
+            require("utils").keymap_set("n", "gc", "<cmd>Git commit<CR>", { desc = "Git commit" })
+            require("utils").keymap_set("n", "gd", "<cmd>Git diff<CR>", { desc = "Git diff" })
+            require("utils").keymap_set("n", "gs", "<cmd>Git<CR>", { desc = "Git status" })
+            require("utils").keymap_set("n", "gw", "<cmd>Git write<CR>", { desc = "Git write" })
+        end,
+    },
+    -- Quick toggling of Location and Quickfix lists
+    {
+        "https://github.com/milkypostman/vim-togglelist",
+        config = function()
+            require("utils").keymap_set("n", "<F6>", ":call ToggleQuickfixList()<CR>", { desc = "Toggle quickfix" })
+            require("utils").keymap_set(
+                "n",
+                "<F7>",
+                ":call ToggleLocationList()<CR>",
+                { desc = "Toggle location list" }
+            )
+        end,
+    },
+
+    -- Find text everywhere!
+    {
+        "https://github.com/mhinz/vim-grepper",
+        config = function()
+            require("plugins.grepper")
+        end,
+    },
+
+    -- Highlight inline colors
+    {
+        "https://github.com/norcalli/nvim-colorizer.lua",
+        config = true,
+    },
+
+    -- Custom status line
+
+    {
+        "https://github.com/nvim-lualine/lualine.nvim",
+        config = function()
+            require("plugins.lualine").config_lualine()
+        end,
+        dependencies = {
+            {
+                "https://github.com/SmiteshP/nvim-navic",
+                dependencies = { { "https://github.com/neovim/nvim-lspconfig" } },
+            },
+        },
+    },
+
+    -- On Mac, update colors when dark mode changes
+    {
+        "https://github.com/cormacrelf/dark-notify",
+        enabled = vim.g.is_mac,
+        -- Download latest release on install
+        build = "curl -s https://api.github.com/repos/cormacrelf/dark-notify/releases/latest | jq '.assets[].browser_download_url' | xargs curl -Ls | tar xz -C ~/.local/bin/", -- luacheck: no max line length
+        config = function()
+            require("plugins.darknotify")
+        end,
+        dependencies = { { "https://github.com/nvim-lualine/lualine.nvim" } },
+    },
+
+    -- Custom start screen
+    {
+        "https://github.com/mhinz/vim-startify",
+        config = function()
+            require("utils").require_with_local("plugins.startify")
+        end,
+    },
+
+    -- LSP
+
+    -- Configure language servers
+    {
+        "https://github.com/neovim/nvim-lspconfig",
+        tag = utils.map_version_rule({
+            -- [">=0.8.0"] = utils.nil_val,
+            [">=0.7.0"] = utils.nil_val,
+            [">=0.6.1"] = "v0.1.2",
+            [">=0.6.0"] = "v0.1.0",
+        }),
+    },
+
+    -- Debug adapter protocol
+    {
+        "https://github.com/mfussenegger/nvim-dap",
+        -- TODO: Move to lazy.nvim and allow it to load this only when the required debuggers are loaded
+        ft = { "python", "rust" },
+    },
+
+    {
+        "https://github.com/rcarriga/nvim-dap-ui",
+        dependencies = {
+            { "https://github.com/mfussenegger/nvim-dap" },
+            { "nvim-neotest/nvim-nio" },
+        },
+        config = function()
+            require("dapui").setup({
+                icons = {
+                    expanded = "-",
+                    collapsed = "+",
+                    current_frame = ">",
+                },
+                controls = {
+                    icons = {
+                        disconnect = "disconnect",
+                        pause = "pause",
+                        play = "play",
+                        run_last = "last",
+                        step_back = "back",
+                        step_into = "into",
+                        step_out = "out",
+                        step_over = "over",
+                        terminate = "term",
+                    },
+                },
+            })
+            local dap, dapui = require("dap"), require("dapui")
+            dap.listeners.after.event_initialized["dapui_config"] = function()
+                dapui.open()
+            end
+            dap.listeners.before.event_terminated["dapui_config"] = function()
+                dapui.close()
+            end
+            dap.listeners.before.event_exited["dapui_config"] = function()
+                dapui.close()
+            end
+        end,
+    },
+
+    {
+        "https://github.com/mfussenegger/nvim-dap-python",
+        dependencies = { { "https://github.com/mfussenegger/nvim-dap" } },
+        config = true,
+        ft = { "python" },
+    },
+
+    -- Install language servers
+    {
+        "https://github.com/williamboman/mason.nvim",
+        dependencies = {
+            { "https://github.com/neovim/nvim-lspconfig" },
+            { "https://github.com/williamboman/mason-lspconfig.nvim" },
+        },
+    },
+
+    -- Lua dev for vim
+    {
+        "https://github.com/folke/neodev.nvim",
+        dependencies = { { "https://github.com/neovim/nvim-lspconfig" } },
+    },
+
+    -- Rust analyzer
+    {
+        "https://github.com/simrat39/rust-tools.nvim",
+    },
+
+    -- Better display of lsp diagnostics
+    {
+        "https://github.com/folke/trouble.nvim",
+        version = utils.map_version_rule({
+            [">=0.7.2"] = "2.x.x",
+            ["<0.7.2"] = "1.x.x",
+        }),
+    },
+
+    -- Incremental lsp rename view
+    {
+        "https://github.com/smjonas/inc-rename.nvim",
+        opts = {
+            input_buffer_type = "dressing",
+        },
+        -- Only supports >=0.8.0
+        enabled = vim.fn.has("nvim-0.8.0") == 1,
+    },
+
+    -- Generic linter/formatters in diagnostics API
+    {
+        "https://github.com/jose-elias-alvarez/null-ls.nvim",
+        branch = utils.map_version_rule({
+            [">=0.8.0"] = utils.nil_val,
+            [">=0.7.0"] = "0.7-compat",
+            ["<0.7.0"] = utils.nil_val, -- use pinned commit
+        }),
+        commit = utils.map_version_rule({
+            [">=0.8.0"] = utils.nil_val,
+            [">=0.7.0"] = utils.nil_val, -- Use pinned branch
+            [">=0.6.0"] = "4b403d2d724f48150ded41189ae4866492a8158b",
+        }),
+        dependencies = {
+            { "https://github.com/nvim-lua/plenary.nvim" },
+            { "https://github.com/neovim/nvim-lspconfig" },
+        },
+    },
+
+    -- Writing
+    -- abolish/pencil
+    {
+        "https://github.com/preservim/vim-pencil",
+        cmd = { "Pencil" },
+    },
+    {
+        "https://github.com/preservim/vim-textobj-sentence",
+        dependencies = { { "https://github.com/kana/vim-textobj-user" } },
+    },
+    {
+        "https://github.com/junegunn/goyo.vim",
+        cmd = { "Goyo", "Zen" },
+        config = function()
+            require("plugins.goyo-limelight")
+        end,
+        dependencies = {
+            { "https://github.com/junegunn/limelight.vim", cmd = "Limelight" },
+        },
+    },
+
+    -- Treesitter
+    {
+        "https://github.com/nvim-treesitter/nvim-treesitter",
+        build = ":TSUpdate",
+        commit = utils.map_version_rule({
+            [">=0.8.0"] = utils.nil_val,
+            [">=0.7.0"] = "4cccb6f494eb255b32a290d37c35ca12584c74d0",
+            [">=0.6.0"] = "bc25a6a5",
+        }),
+        config = function()
+            require("utils").require_with_local("plugins.treesitter").setup()
+        end,
+    },
+    {
+        "https://github.com/nvim-treesitter/nvim-treesitter-textobjects",
+        dependencies = { { "https://github.com/nvim-treesitter/nvim-treesitter" } },
+        commit = utils.map_version_rule({
+            [">=0.8.0"] = utils.nil_val,
+            [">=0.7.0"] = "8673926519ea61069f9c1366d1ad1949316d250e",
+            ["<0.7.0"] = "eca3bf30334f85259d41dc060d50994f8f91ef7d",
+        }),
+    },
+
+    -- Completion
+    {
+        "https://github.com/L3MON4D3/LuaSnip",
+        version = "1.x.x",
+    },
+    {
+        "https://github.com/hrsh7th/cmp-nvim-lsp",
+        commit = utils.map_version_rule({
+            [">=0.7.0"] = utils.nil_val,
+            ["<0.7.0"] = "3cf38d9c957e95c397b66f91967758b31be4abe6",
+        }),
+        dependencies = { { "https://github.com/hrsh7th/nvim-cmp" } },
+    },
+    {
+        "https://github.com/hrsh7th/cmp-buffer",
+        dependencies = { { "https://github.com/hrsh7th/nvim-cmp" } },
+    },
+    {
+        "https://github.com/f3fora/cmp-spell",
+        dependencies = { { "https://github.com/hrsh7th/nvim-cmp" } },
+    },
+    {
+        "https://github.com/saadparwaiz1/cmp_luasnip",
+        commit = utils.map_version_rule({
+            [">0.7.0"] = utils.nil_val,
+            [">=0.5.0"] = "b10829736542e7cc9291e60bab134df1273165c9",
+        }),
+        dependencies = { { "https://github.com/hrsh7th/nvim-cmp" } },
+    },
+    {
+        "https://github.com/L3MON4D3/LuaSnip",
+        dependencies = { { "https://github.com/hrsh7th/nvim-cmp" } },
+    },
+
+    {
+        "https://github.com/hrsh7th/nvim-cmp",
+        config = function()
+            require("plugins.completion").config_cmp()
+        end,
+        commit = utils.map_version_rule({
+            [">=0.7.0"] = utils.nil_val,
+            [">=0.5.0"] = "bba6fb67fdafc0af7c5454058dfbabc2182741f4",
+        }),
+        event = "InsertEnter *",
+    },
+
+    -- Add snippets
+    {
+        "https://github.com/rafamadriz/friendly-snippets",
+        dependencies = { { "https://github.com/L3MON4D3/LuaSnip" } },
+        config = function()
+            require("luasnip.loaders.from_vscode").lazy_load()
+        end,
+    },
+
+    {
+        "https://github.com/ray-x/lsp_signature.nvim",
+        opts = {
+            extra_trigger_chars = { "(", "," },
+            auto_close_after = nil,
+            -- Toggle these to use hint only
+            floating_window = true,
+            hint_enable = false,
+        },
+    },
+
+    -- Fuzzy Finder
+    {
+        "https://github.com/nvim-telescope/telescope.nvim",
+        dependencies = {
+            { "https://github.com/nvim-lua/plenary.nvim" },
+            { "https://github.com/nvim-lua/popup.nvim" },
+            { "https://github.com/nvim-telescope/telescope-file-browser.nvim" },
+        },
+        version = "0.1.x",
+        config = function()
+            require("plugins.telescope")
+        end,
+    },
+
+    -- Filetypes
+    { "https://github.com/ViViDboarder/vim-forcedotcom" },
+    { "https://github.com/hsanson/vim-android" },
+    {
+        "https://github.com/sheerun/vim-polyglot",
+        config = function()
+            local gid = vim.api.nvim_create_augroup("polyglot_fts", { clear = true })
+            vim.api.nvim_create_autocmd({ "BufRead", "BufNewFile" }, {
+                pattern = { "*/playbooks/*.yml", "*/playbooks/*.yaml" },
+                command = "set filetype=yaml.ansible",
+                group = gid,
+            })
+            vim.api.nvim_create_autocmd({ "BufRead", "BufNewFile" }, {
+                pattern = { "go.mod", "go.sum" },
+                command = "set filetype=gomod",
+                group = gid,
+            })
+        end,
+    },
+
+    -- Debuging nvim config
+    {
+        "https://github.com/tweekmonster/startuptime.vim",
+        cmd = { "StartupTime" },
+    },
+
+    -- Fancy todo highlighting
+    {
+        "https://github.com/folke/todo-comments.nvim",
+        dependencies = {
+            { "https://github.com/nvim-lua/plenary.nvim" },
+        },
+        config = function()
+            require("plugins.todo")
+        end,
+        version = "1.x.x",
+    },
+
+    -- Fancy notifications
+    {
+        "https://github.com/rcarriga/nvim-notify",
+        config = function()
+            require("plugins.notify")
+        end,
+    },
+
+    {
+        "https://github.com/stevearc/dressing.nvim",
+        branch = utils.map_version_rule({
+            [">=0.8.0"] = utils.nil_val,
+            ["<0.8.0"] = "nvim-0.7",
+        }),
+        config = true,
+    },
+
+    -- Obsidian notes
+    -- This loads an Obsidian plugin for better vault interraction as well as auto pulls
+    -- and commits to my vault git repo. On iOS devices, I use Working Copy to sync the
+    -- repo and use Shortcuts to automate pulling on open and auto committing and pushing
+    -- after closing Obsidian.
+    {
+        -- Fork of https://github.com/declancm/git-scripts.nvim is used here
+        -- because it includes a few small fixes.
+        "https://github.com/vividboarder/git-scripts.nvim",
+        branch = "dev",
+        config = function()
+            local gs = require("git-scripts")
+            gs.setup({
+                -- Disable keymaps becasue I only use this for auto pull and auto commit
+                default_keymaps = false,
+                commit_on_save = true,
+            })
+            gs.async_pull()
+        end,
+        dependencies = {
+            { "https://github.com/epwalsh/obsidian.nvim" },
+        },
+        event = {
+            "BufRead " .. vim.fn.expand("~") .. "/Documents/Obsidian/**.md",
+            "BufNewFile " .. vim.fn.expand("~") .. "/Documents/Obsidian/**.md",
+        },
+    },
+    {
+        "https://github.com/epwalsh/obsidian.nvim",
+        dependencies = {
+            { "https://github.com/nvim-lua/plenary.nvim" },
+        },
+        version = "1.x.x",
+        config = function()
+            -- TODO: maybe move this to opts?
+            vim.g.vim_markdown_frontmatter = 1
+            require("obsidian").setup({
+                workspaces = {
+                    { name = "personal", path = "~/Documents/Obsidian" },
+                },
+            })
+        end,
+        event = {
+            "BufRead " .. vim.fn.expand("~") .. "/Documents/Obsidian/**.md",
+            "BufNewFile " .. vim.fn.expand("~") .. "/Documents/Obsidian/**.md",
+        },
+    },
+
+    -- Work things
+    -- Sourcegraph
+    {
+        "https://github.com/sourcegraph/sg.nvim",
+        build = "nvim -l build/init.lua",
+        dependencies = {
+            { "https://github.com/nvim-lua/plenary.nvim" },
+        },
+        opts = {
+            enable_cody = false,
+            -- Empty attach because I dont want to use default keymaps. Maybe I'll remap something later.
+            on_attach = function() end,
+        },
+        cmd = {
+            "SourcegraphBuild",
+            "SourcegraphDownloadBinaries",
+            "SourcegraphInfo",
+            "SourcegraphLink",
+            "SourcegraphLogin",
+            "SourcegraphSearch",
+        },
+        enabled = vim.g.install_sourcegraph,
+    },
+
+    {
+        "https://github.com/github/copilot.vim",
+        enabled = vim.g.install_copilot,
+        config = function()
+            require("plugins.copilot")
+        end,
+        dependencies = {
+            { "https://github.com/tpope/vim-rsi" },
+        },
+    },
+
+    {
+        "https://github.com/CopilotC-Nvim/CopilotChat.nvim",
+        enabled = vim.g.install_copilot,
+        branch = "canary",
+        config = function()
+            require("plugins.copilotchat").setup()
+        end,
+    },
+}
diff --git a/neovim/lua/plugins.lua b/neovim/lua/plugins.lua
deleted file mode 100644
index 49bd8ce..0000000
--- a/neovim/lua/plugins.lua
+++ /dev/null
@@ -1,627 +0,0 @@
--- Install packer
-local utils = require("utils")
-local install_path = vim.fn.stdpath("data") .. "/site/pack/packer/opt/packer.nvim"
-local packer_bootstrap = ""
-if vim.fn.empty(vim.fn.glob(install_path)) > 0 then
-    packer_bootstrap = vim.fn.system({ "git", "clone", "https://github.com/wbthomason/packer.nvim", install_path })
-end
-vim.cmd("packadd packer.nvim")
-
-local packer = require("packer")
-local packer_util = require("packer.util")
-local use = packer.use
-
-packer.init({
-    -- Always load default
-    snapshot = utils.map_version_rule({
-        [">=0.9.0"] = "latest-0.9",
-        [">=0.8.0"] = "latest-0.8",
-        [">=0.7.0"] = "latest-0.7",
-        [">=0.6.0"] = "latest-0.6",
-    }),
-    snapshot_path = packer_util.join_paths(vim.fn.stdpath("config"), "packer_snapshots"),
-    display = {
-        open_fn = function()
-            return packer_util.float({ border = "single" })
-        end,
-    },
-})
-
--- Load things faster!
-if vim.fn.has("nvim-0.9.0") == 1 then
-    -- Not needed on nvim 0.9+
-    vim.loader.enable()
-else
-    use({
-        "lewis6991/impatient.nvim",
-        config = [[require('impatient')]],
-        tag = utils.map_version_rule({
-            [">=0.7.0"] = utils.nil_val,
-            [">0.6.0"] = "v0.2",
-            [">=0.5.0"] = "v0.1",
-        }),
-    })
-end
-
--- Let Packer manage and lazyload itself
-use({
-    "https://github.com/wbthomason/packer.nvim",
-    cmd = {
-        "PackerClean",
-        "PackerCompile",
-        "PackerInstall",
-        "PackerLoad",
-        "PackerProfile",
-        "PackerSnapshot",
-        "PackerSnapshotDelete",
-        "PackerSnapshotRollback",
-        "PackerStatus",
-        "PackerSync",
-        "PackerUpdate",
-    },
-    config = [[require("plugins")]],
-})
-
--- Colorschemes
-use({
-    "https://github.com/vim-scripts/wombat256.vim",
-    {
-        "https://github.com/ViViDboarder/wombat.nvim",
-        requires = {
-            {
-                "rktjmp/lush.nvim",
-                tag = utils.map_version_rule({
-                    [">=0.7.0"] = utils.nil_val,
-                    [">=0.5.0"] = "v1.0.1",
-                }),
-            },
-        },
-    },
-    {
-        "https://github.com/ViViDboarder/wombuddy.nvim",
-        requires = "https://github.com/tjdevries/colorbuddy.vim",
-    },
-    {
-        "https://github.com/ishan9299/nvim-solarized-lua",
-        commit = utils.map_version_rule({
-            [">=0.7.0"] = utils.nil_val,
-            ["<0.7.0"] = "faba49b",
-        }),
-    },
-    {
-        "https://github.com/folke/tokyonight.nvim",
-        run = 'fish -c \'echo "set --path --prepend fish_themes_path "(pwd)"/extras" > ~/.config/fish/conf.d/tokyonight.fish\' || true', -- luacheck: no max line length
-    },
-})
-
--- Auto and ends to some ifs and dos
-use("https://github.com/tpope/vim-endwise")
-
--- Unix commands from vim? Yup!
-use("https://github.com/tpope/vim-eunuch")
-
--- Adds repeats for custom motions
-use("https://github.com/tpope/vim-repeat")
-
--- Readline shortcuts
-use("https://github.com/tpope/vim-rsi")
-
--- Surround motions
-use("https://github.com/tpope/vim-surround")
-
--- Better netrw
-use("https://github.com/tpope/vim-vinegar")
-
--- Easier jumping to lines
-use("https://github.com/vim-scripts/file-line")
-
--- Auto ctags generation
-use("https://github.com/ludovicchabant/vim-gutentags")
-
--- Make it easier to discover some of my keymaps
-use({
-    "https://github.com/folke/which-key.nvim",
-    config = function()
-        require("plugins.whichkey").configure()
-    end,
-    tag = "v1.*",
-})
-
--- Better commenting
-use({
-    "https://github.com/tomtom/tcomment_vim",
-    config = function()
-        require("utils").keymap_set("n", "//", ":TComment<CR>", { desc = "Toggle comment" })
-        require("utils").keymap_set("v", "//", ":TCommentBlock<CR>", { desc = "Toggle comment" })
-    end,
-})
-
--- Allow wrapping and joining of arguments across multiple lines
-use({
-    "https://github.com/FooSoft/vim-argwrap",
-    config = function()
-        require("utils").keymap_set("n", "<Leader>a", "<cmd>ArgWrap<CR>", {
-            desc = "Wrap or unwrap arguments",
-        })
-    end,
-})
-
--- Adds git operations to vim
-use({
-    "https://github.com/tpope/vim-fugitive",
-    tag = utils.map_version_rule({
-        [">=0.9.2"] = utils.nil_val,
-        -- HACK: Pinning to avoid neovim bug https://github.com/neovim/neovim/issues/10121
-        -- when used in status line.
-        ["<0.9.2"] = "v3.6",
-    }),
-    config = function()
-        require("utils").keymap_set("n", "gb", "<cmd>Git blame<CR>", { desc = "Git blame" })
-        require("utils").keymap_set("n", "gc", "<cmd>Git commit<CR>", { desc = "Git commit" })
-        require("utils").keymap_set("n", "gd", "<cmd>Git diff<CR>", { desc = "Git diff" })
-        require("utils").keymap_set("n", "gs", "<cmd>Git<CR>", { desc = "Git status" })
-        require("utils").keymap_set("n", "gw", "<cmd>Git write<CR>", { desc = "Git write" })
-    end,
-})
-
--- Quick toggling of Location and Quickfix lists
-use({
-    "https://github.com/milkypostman/vim-togglelist",
-    config = function()
-        require("utils").keymap_set("n", "<F6>", ":call ToggleQuickfixList()<CR>", { desc = "Toggle quickfix" })
-        require("utils").keymap_set("n", "<F7>", ":call ToggleLocationList()<CR>", { desc = "Toggle location list" })
-    end,
-})
-
--- Find text everywhere!
-use({
-    "https://github.com/mhinz/vim-grepper",
-    config = function()
-        require("plugins.grepper")
-    end,
-})
-
--- Highlight inline colors
-use({
-    "https://github.com/norcalli/nvim-colorizer.lua",
-    config = function()
-        require("colorizer").setup()
-    end,
-})
-
--- Custom status line
-use({
-    "https://github.com/SmiteshP/nvim-navic",
-    requires = "https://github.com/neovim/nvim-lspconfig",
-})
-
-use({
-    "https://github.com/nvim-lualine/lualine.nvim",
-    config = function()
-        require("plugins.lualine").config_lualine()
-    end,
-    after = "nvim-navic",
-})
-
--- On Mac, update colors when dark mode changes
-use({
-    "https://github.com/cormacrelf/dark-notify",
-    disable = not vim.g.is_mac,
-    -- Download latest release on install
-    run = "curl -s https://api.github.com/repos/cormacrelf/dark-notify/releases/latest | jq '.assets[].browser_download_url' | xargs curl -Ls | tar xz -C ~/.local/bin/", -- luacheck: no max line length
-    config = function()
-        require("plugins.darknotify")
-    end,
-    requires = "https://github.com/nvim-lualine/lualine.nvim",
-})
-
--- Custom start screen
-use({
-    "https://github.com/mhinz/vim-startify",
-    config = function()
-        require("utils").require_with_local("plugins.startify")
-    end,
-})
-
--- LSP
-
--- Configure language servers
-use({
-    "https://github.com/neovim/nvim-lspconfig",
-    tag = utils.map_version_rule({
-        -- [">=0.8.0"] = utils.nil_val,
-        [">=0.7.0"] = utils.nil_val,
-        [">=0.6.1"] = "v0.1.2",
-        [">=0.6.0"] = "v0.1.0",
-    }),
-})
-
--- Debug adapter protocol
-use({
-    "https://github.com/mfussenegger/nvim-dap",
-    -- TODO: Move to lazy.nvim and allow it to load this only when the required debuggers are loaded
-    ft = { "python", "rust" },
-})
-
-use({
-    "https://github.com/rcarriga/nvim-dap-ui",
-    requires = { "https://github.com/mfussenegger/nvim-dap" },
-    after = "nvim-dap",
-    config = function()
-        require("dapui").setup({
-            icons = {
-                expanded = "-",
-                collapsed = "+",
-                current_frame = ">",
-            },
-            controls = {
-                icons = {
-                    disconnect = "disconnect",
-                    pause = "pause",
-                    play = "play",
-                    run_last = "last",
-                    step_back = "back",
-                    step_into = "into",
-                    step_out = "out",
-                    step_over = "over",
-                    terminate = "term",
-                },
-            },
-        })
-        local dap, dapui = require("dap"), require("dapui")
-        dap.listeners.after.event_initialized["dapui_config"] = function()
-            dapui.open()
-        end
-        dap.listeners.before.event_terminated["dapui_config"] = function()
-            dapui.close()
-        end
-        dap.listeners.before.event_exited["dapui_config"] = function()
-            dapui.close()
-        end
-    end,
-})
-
-use({
-    "https://github.com/mfussenegger/nvim-dap-python",
-    requires = { "https://github.com/mfussenegger/nvim-dap" },
-    after = "nvim-dap",
-    config = function()
-        require("dap-python").setup()
-    end,
-    ft = "python",
-})
-
--- Install language servers
-use({
-    "https://github.com/williamboman/mason.nvim",
-    requires = {
-        "https://github.com/neovim/nvim-lspconfig",
-        "https://github.com/williamboman/mason-lspconfig.nvim",
-    },
-})
-
--- Lua dev for vim
-use({
-    "https://github.com/folke/neodev.nvim",
-    requires = "https://github.com/neovim/nvim-lspconfig",
-})
-
--- Rust analyzer
-use({
-    "https://github.com/simrat39/rust-tools.nvim",
-})
-
--- Better display of lsp diagnostics
-use({
-    "https://github.com/folke/trouble.nvim",
-    tag = utils.map_version_rule({
-        [">=0.7.2"] = "v2.*",
-        ["<0.7.2"] = "v1.*",
-    }),
-})
-
--- Incremental lsp rename view
-use({
-    "https://github.com/smjonas/inc-rename.nvim",
-    config = function()
-        require("inc_rename").setup({
-            input_buffer_type = "dressing",
-        })
-    end,
-    -- Only supports >=0.8.0
-    disable = vim.fn.has("nvim-0.8.0") ~= 1,
-})
-
--- Generic linter/formatters in diagnostics API
-use({
-    "https://github.com/jose-elias-alvarez/null-ls.nvim",
-    branch = utils.map_version_rule({
-        [">=0.8.0"] = utils.nil_val,
-        [">=0.7.0"] = "0.7-compat",
-        ["<0.7.0"] = utils.nil_val, -- use pinned commit
-    }),
-    commit = utils.map_version_rule({
-        [">=0.8.0"] = utils.nil_val,
-        [">=0.7.0"] = utils.nil_val, -- Use pinned branch
-        [">=0.6.0"] = "4b403d2d724f48150ded41189ae4866492a8158b",
-    }),
-    requires = { "https://github.com/nvim-lua/plenary.nvim", "https://github.com/neovim/nvim-lspconfig" },
-})
-
--- Writing
--- abolish/pencil
-use({
-    "https://github.com/preservim/vim-pencil",
-    cmd = { "Pencil" },
-})
-use({
-    "https://github.com/preservim/vim-textobj-sentence",
-    requires = "https://github.com/kana/vim-textobj-user",
-})
-use({
-    "https://github.com/junegunn/goyo.vim",
-    cmd = { "Goyo", "Zen" },
-    config = [[require("plugins.goyo-limelight")]],
-    requires = { "https://github.com/junegunn/limelight.vim", cmd = "Limelight" },
-})
-
--- Treesitter
-use({
-    "https://github.com/nvim-treesitter/nvim-treesitter",
-    run = ":TSUpdate",
-    commit = utils.map_version_rule({
-        [">=0.8.0"] = utils.nil_val,
-        [">=0.7.0"] = "4cccb6f494eb255b32a290d37c35ca12584c74d0",
-        [">=0.6.0"] = "bc25a6a5",
-    }),
-    config = function()
-        require("utils").require_with_local("plugins.treesitter").setup()
-    end,
-})
-use({
-    "https://github.com/nvim-treesitter/nvim-treesitter-textobjects",
-    requires = "https://github.com/nvim-treesitter/nvim-treesitter",
-    commit = utils.map_version_rule({
-        [">=0.8.0"] = utils.nil_val,
-        [">=0.7.0"] = "8673926519ea61069f9c1366d1ad1949316d250e",
-        ["<0.7.0"] = "eca3bf30334f85259d41dc060d50994f8f91ef7d",
-    }),
-})
-
--- Completion
-use({
-    "https://github.com/L3MON4D3/LuaSnip",
-    tag = "v1.*",
-})
-
-use({
-    "https://github.com/hrsh7th/nvim-cmp",
-    config = function()
-        require("plugins.completion").config_cmp()
-    end,
-    commit = utils.map_version_rule({
-        [">=0.7.0"] = utils.nil_val,
-        [">=0.5.0"] = "bba6fb67fdafc0af7c5454058dfbabc2182741f4",
-    }),
-    requires = {
-        {
-            "https://github.com/hrsh7th/cmp-nvim-lsp",
-            after = "nvim-cmp",
-            commit = utils.map_version_rule({
-                [">=0.7.0"] = utils.nil_val,
-                ["<0.7.0"] = "3cf38d9c957e95c397b66f91967758b31be4abe6",
-            }),
-        },
-        { "https://github.com/hrsh7th/cmp-buffer", after = "nvim-cmp" },
-        { "https://github.com/f3fora/cmp-spell", after = "nvim-cmp" },
-        {
-            "https://github.com/saadparwaiz1/cmp_luasnip",
-            after = "nvim-cmp",
-            commit = utils.map_version_rule({
-                [">0.7.0"] = utils.nil_val,
-                [">=0.5.0"] = "b10829736542e7cc9291e60bab134df1273165c9",
-            }),
-        },
-        "https://github.com/L3MON4D3/LuaSnip",
-    },
-    event = "InsertEnter *",
-})
-
--- Add snippets
-use({
-    "https://github.com/rafamadriz/friendly-snippets",
-    requires = "https://github.com/L3MON4D3/LuaSnip",
-    after = "LuaSnip",
-    config = function()
-        require("luasnip.loaders.from_vscode").lazy_load()
-    end,
-})
-
-use({
-    "https://github.com/ray-x/lsp_signature.nvim",
-    config = function()
-        require("lsp_signature").setup({
-            extra_trigger_chars = { "(", "," },
-            auto_close_after = nil,
-            -- Toggle these to use hint only
-            floating_window = true,
-            hint_enable = false,
-        })
-    end,
-})
-
--- Fuzzy Finder
-use({
-    "https://github.com/nvim-telescope/telescope.nvim",
-    requires = {
-        "https://github.com/nvim-lua/plenary.nvim",
-        "https://github.com/nvim-lua/popup.nvim",
-        "https://github.com/nvim-telescope/telescope-file-browser.nvim",
-    },
-    tag = utils.map_version_rule({
-        -- Follow stable release tag
-        [">=0.9.0"] = "0.1.*",
-        [">=0.7.0"] = "0.1.2",
-        [">=0.6.0"] = "nvim-0.6",
-        ["<0.6.0"] = "nvim-0.5.1",
-        ["==0.5.0"] = "nvim-0.5.0",
-    }),
-    config = function()
-        require("plugins.telescope")
-    end,
-})
-
--- Filetypes
-use("https://github.com/ViViDboarder/vim-forcedotcom")
-use("https://github.com/hsanson/vim-android")
-use({
-    "https://github.com/sheerun/vim-polyglot",
-    config = function()
-        local gid = vim.api.nvim_create_augroup("polyglot_fts", { clear = true })
-        vim.api.nvim_create_autocmd({ "BufRead", "BufNewFile" }, {
-            pattern = { "*/playbooks/*.yml", "*/playbooks/*.yaml" },
-            command = "set filetype=yaml.ansible",
-            group = gid,
-        })
-        vim.api.nvim_create_autocmd({ "BufRead", "BufNewFile" }, {
-            pattern = { "go.mod", "go.sum" },
-            command = "set filetype=gomod",
-            group = gid,
-        })
-    end,
-})
-
--- Debuging nvim config
-use({
-    "https://github.com/tweekmonster/startuptime.vim",
-    cmd = { "StartupTime" },
-})
-
--- Fancy todo highlighting
-use({
-    "https://github.com/folke/todo-comments.nvim",
-    requires = {
-        "https://github.com/nvim-lua/plenary.nvim",
-    },
-    config = function()
-        require("plugins.todo")
-    end,
-    -- Tag and branch rule because old versions are supported on a branch while latest stable is a moving tag
-    tag = utils.map_version_rule({
-        [">=0.8.0"] = "v1.*",
-        ["<0.8.0"] = utils.nil_val,
-    }),
-    branch = utils.map_version_rule({
-        [">=0.8.0"] = utils.nil_val,
-        ["<0.8.0"] = "neovim-pre-0.8.0",
-    }),
-})
-
--- Fancy notifications
-use({
-    "https://github.com/rcarriga/nvim-notify",
-    config = function()
-        require("plugins.notify")
-    end,
-})
-
-use({
-    "https://github.com/stevearc/dressing.nvim",
-    branch = utils.map_version_rule({
-        [">=0.8.0"] = utils.nil_val,
-        ["<0.8.0"] = "nvim-0.7",
-    }),
-    config = function()
-        require("dressing").setup({})
-    end,
-})
-
--- Obsidian notes
--- This loads an Obsidian plugin for better vault interraction as well as auto pulls
--- and commits to my vault git repo. On iOS devices, I use Working Copy to sync the
--- repo and use Shortcuts to automate pulling on open and auto committing and pushing
--- after closing Obsidian.
-use({
-    "https://github.com/epwalsh/obsidian.nvim",
-    requires = {
-        "https://github.com/nvim-lua/plenary.nvim",
-        {
-            -- Fork of https://github.com/declancm/git-scripts.nvim is used here
-            -- because it includes a few small fixes.
-            "https://github.com/vividboarder/git-scripts.nvim",
-            branch = "dev",
-            config = function()
-                local gs = require("git-scripts")
-                gs.setup({
-                    -- Disable keymaps becasue I only use this for auto pull and auto commit
-                    default_keymaps = false,
-                    commit_on_save = true,
-                })
-                gs.async_pull()
-            end,
-            after = "obsidian.nvim",
-        },
-    },
-    tag = "v1.*",
-    config = function()
-        vim.g.vim_markdown_frontmatter = 1
-        require("obsidian").setup({
-            workspaces = {
-                { name = "personal", path = "~/Documents/Obsidian" },
-            },
-        })
-    end,
-    event = {
-        "BufRead " .. vim.fn.expand("~") .. "/Documents/Obsidian/**.md",
-        "BufNewFile " .. vim.fn.expand("~") .. "/Documents/Obsidian/**.md",
-    },
-})
-
--- Work things
--- Sourcegraph
-use({
-    "https://github.com/sourcegraph/sg.nvim",
-    run = "nvim -l build/init.lua",
-    requires = {
-        "https://github.com/nvim-lua/plenary.nvim",
-    },
-    config = function()
-        require("sg").setup({
-            enable_cody = false,
-            -- Empty attach because I dont want to use default keymaps. Maybe I'll remap something later.
-            on_attach = function() end,
-        })
-    end,
-    cmd = {
-        "SourcegraphBuild",
-        "SourcegraphDownloadBinaries",
-        "SourcegraphInfo",
-        "SourcegraphLink",
-        "SourcegraphLogin",
-        "SourcegraphSearch",
-    },
-    disable = not vim.g.install_sourcegraph,
-})
-
-use({
-    "https://github.com/github/copilot.vim",
-    disable = not vim.g.install_copilot,
-    config = function()
-        require("plugins.copilot")
-    end,
-    after = "vim-rsi",
-})
-
-use({
-    "https://github.com/CopilotC-Nvim/CopilotChat.nvim",
-    disable = not vim.g.install_copilot,
-    branch = "canary",
-    config = function()
-        require("plugins.copilotchat").setup()
-    end,
-})
-
--- Auto sync after bootstrapping on a fresh box
-if packer_bootstrap ~= "" then
-    packer.sync()
-end
diff --git a/neovim/packer_snapshots/latest b/neovim/packer_snapshots/latest
deleted file mode 120000
index 55840ea..0000000
--- a/neovim/packer_snapshots/latest
+++ /dev/null
@@ -1 +0,0 @@
-neovim/packer_snapshots/latest-0.9
\ No newline at end of file
diff --git a/neovim/packer_snapshots/latest-0.6 b/neovim/packer_snapshots/latest-0.6
deleted file mode 100644
index 3bc7ae5..0000000
--- a/neovim/packer_snapshots/latest-0.6
+++ /dev/null
@@ -1,176 +0,0 @@
-{
-  "LuaSnip": {
-    "commit": "500981f"
-  },
-  "cmp-buffer": {
-    "commit": "3022dbc"
-  },
-  "cmp-nvim-lsp": {
-    "commit": "3cf38d9"
-  },
-  "cmp-spell": {
-    "commit": "60584cb"
-  },
-  "cmp_luasnip": {
-    "commit": "b108297"
-  },
-  "colorbuddy.vim": {
-    "commit": "cdb5b06"
-  },
-  "dark-notify": {
-    "commit": "891adc0"
-  },
-  "file-line": {
-    "commit": "67c3590"
-  },
-  "friendly-snippets": {
-    "commit": "49ca2a0"
-  },
-  "goyo.vim": {
-    "commit": "fa0263d"
-  },
-  "impatient.nvim": {
-    "commit": "969f2c5"
-  },
-  "limelight.vim": {
-    "commit": "86aaec1"
-  },
-  "lsp_signature.nvim": {
-    "commit": "17ff7a4"
-  },
-  "lualine.nvim": {
-    "commit": "05d78e9"
-  },
-  "lush.nvim": {
-    "commit": "87e9039"
-  },
-  "neodev.nvim": {
-    "commit": "c120c96"
-  },
-  "null-ls.nvim": {
-    "commit": "4b403d2"
-  },
-  "nvim-cmp": {
-    "commit": "bba6fb6"
-  },
-  "nvim-colorizer.lua": {
-    "commit": "36c610a"
-  },
-  "nvim-gps": {
-    "commit": "f4734df"
-  },
-  "nvim-lspconfig": {
-    "commit": "ea29110"
-  },
-  "nvim-notify": {
-    "commit": "ea9c8ce"
-  },
-  "nvim-solarized-lua": {
-    "commit": "faba49b"
-  },
-  "nvim-treesitter": {
-    "commit": "bc25a6a5"
-  },
-  "nvim-treesitter-textobjects": {
-    "commit": "eca3bf3"
-  },
-  "packer.nvim": {
-    "commit": "1d0cf98"
-  },
-  "plenary.nvim": {
-    "commit": "36aaceb"
-  },
-  "popup.nvim": {
-    "commit": "b7404d3"
-  },
-  "rust.vim": {
-    "commit": "889b9a7"
-  },
-  "startuptime.vim": {
-    "commit": "dfa57f5"
-  },
-  "tcomment_vim": {
-    "commit": "b4930f9"
-  },
-  "telescope-file-browser.nvim": {
-    "commit": "87dfaa9"
-  },
-  "telescope.nvim": {
-    "commit": "d88094f"
-  },
-  "todo-comments.nvim": {
-    "commit": "7b8f174"
-  },
-  "tokyonight.nvim": {
-    "commit": "161114b"
-  },
-  "trouble.nvim": {
-    "commit": "556ef30"
-  },
-  "vim-android": {
-    "commit": "8911f86"
-  },
-  "vim-argwrap": {
-    "commit": "feaba6b"
-  },
-  "vim-endwise": {
-    "commit": "e714ac3"
-  },
-  "vim-eunuch": {
-    "commit": "291ef1f"
-  },
-  "vim-forcedotcom": {
-    "commit": "a30ba7e"
-  },
-  "vim-fugitive": {
-    "commit": "5a24c25"
-  },
-  "vim-grepper": {
-    "commit": "2b93535"
-  },
-  "vim-gutentags": {
-    "commit": "1337b18"
-  },
-  "vim-pencil": {
-    "commit": "6d70438"
-  },
-  "vim-polyglot": {
-    "commit": "bc8a81d3"
-  },
-  "vim-repeat": {
-    "commit": "24afe92"
-  },
-  "vim-rsi": {
-    "commit": "4554063"
-  },
-  "vim-startify": {
-    "commit": "81e36c3"
-  },
-  "vim-surround": {
-    "commit": "3d188ed"
-  },
-  "vim-textobj-sentence": {
-    "commit": "c5dd562"
-  },
-  "vim-textobj-user": {
-    "commit": "41a675d"
-  },
-  "vim-togglelist": {
-    "commit": "48f0d30"
-  },
-  "vim-vinegar": {
-    "commit": "bb1bcdd"
-  },
-  "which-key.nvim": {
-    "commit": "e271c28"
-  },
-  "wombat.nvim": {
-    "commit": "96989b1"
-  },
-  "wombat256.vim": {
-    "commit": "8734ba4"
-  },
-  "wombuddy.nvim": {
-    "commit": "29deb8f"
-  }
-}
diff --git a/neovim/packer_snapshots/latest-0.7 b/neovim/packer_snapshots/latest-0.7
deleted file mode 100644
index dd09bdb..0000000
--- a/neovim/packer_snapshots/latest-0.7
+++ /dev/null
@@ -1,194 +0,0 @@
-{
-  "LuaSnip": {
-    "commit": "500981f"
-  },
-  "cmp-buffer": {
-    "commit": "3022dbc"
-  },
-  "cmp-nvim-lsp": {
-    "commit": "44b16d1"
-  },
-  "cmp-spell": {
-    "commit": "32a0867"
-  },
-  "cmp_luasnip": {
-    "commit": "05a9ab2"
-  },
-  "colorbuddy.vim": {
-    "commit": "cdb5b06"
-  },
-  "dark-notify": {
-    "commit": "891adc0"
-  },
-  "dressing.nvim": {
-    "commit": "f16d758"
-  },
-  "file-line": {
-    "commit": "67c3590"
-  },
-  "friendly-snippets": {
-    "commit": "43727c2"
-  },
-  "git-scripts.nvim": {
-    "commit": "2f7c075"
-  },
-  "goyo.vim": {
-    "commit": "fa0263d"
-  },
-  "impatient.nvim": {
-    "commit": "47302af"
-  },
-  "limelight.vim": {
-    "commit": "86aaec1"
-  },
-  "lsp_signature.nvim": {
-    "commit": "1fba8f4"
-  },
-  "lualine.nvim": {
-    "commit": "2248ef2"
-  },
-  "lush.nvim": {
-    "commit": "966aad1"
-  },
-  "mason-lspconfig.nvim": {
-    "commit": "ab640b3"
-  },
-  "mason.nvim": {
-    "commit": "41e75af"
-  },
-  "neodev.nvim": {
-    "commit": "b2881ee"
-  },
-  "null-ls.nvim": {
-    "commit": "6cc5477"
-  },
-  "nvim-cmp": {
-    "commit": "0b751f6"
-  },
-  "nvim-colorizer.lua": {
-    "commit": "36c610a"
-  },
-  "nvim-lspconfig": {
-    "commit": "4834708"
-  },
-  "nvim-navic": {
-    "commit": "0ffa7ff"
-  },
-  "nvim-notify": {
-    "commit": "e4a2022"
-  },
-  "nvim-solarized-lua": {
-    "commit": "7bd46fa"
-  },
-  "nvim-treesitter": {
-    "commit": "4cccb6f4"
-  },
-  "nvim-treesitter-textobjects": {
-    "commit": "8673926"
-  },
-  "obsidian.nvim": {
-    "commit": "0f16bb4"
-  },
-  "packer.nvim": {
-    "commit": "ea0cc3c"
-  },
-  "plenary.nvim": {
-    "commit": "5001291"
-  },
-  "popup.nvim": {
-    "commit": "b7404d3"
-  },
-  "rust-tools.nvim": {
-    "commit": "0cc8ada"
-  },
-  "sg.nvim": {
-    "commit": "4137856"
-  },
-  "startuptime.vim": {
-    "commit": "dfa57f5"
-  },
-  "tcomment_vim": {
-    "commit": "90eaf75"
-  },
-  "telescope-file-browser.nvim": {
-    "commit": "f41675f"
-  },
-  "telescope.nvim": {
-    "commit": "7011eaa"
-  },
-  "todo-comments.nvim": {
-    "commit": "7b8f174"
-  },
-  "tokyonight.nvim": {
-    "commit": "f247ee7"
-  },
-  "trouble.nvim": {
-    "commit": "f1168fe"
-  },
-  "vim-android": {
-    "commit": "26990f9"
-  },
-  "vim-argwrap": {
-    "commit": "b532cb6"
-  },
-  "vim-endwise": {
-    "commit": "e714ac3"
-  },
-  "vim-eunuch": {
-    "commit": "67f3dd3"
-  },
-  "vim-forcedotcom": {
-    "commit": "a30ba7e"
-  },
-  "vim-fugitive": {
-    "commit": "5a24c25"
-  },
-  "vim-grepper": {
-    "commit": "2b93535"
-  },
-  "vim-gutentags": {
-    "commit": "aa47c5e"
-  },
-  "vim-pencil": {
-    "commit": "6d70438"
-  },
-  "vim-polyglot": {
-    "commit": "bc8a81d"
-  },
-  "vim-repeat": {
-    "commit": "24afe92"
-  },
-  "vim-rsi": {
-    "commit": "4554063"
-  },
-  "vim-startify": {
-    "commit": "4e089df"
-  },
-  "vim-surround": {
-    "commit": "3d188ed"
-  },
-  "vim-textobj-sentence": {
-    "commit": "c5dd562"
-  },
-  "vim-textobj-user": {
-    "commit": "41a675d"
-  },
-  "vim-togglelist": {
-    "commit": "48f0d30"
-  },
-  "vim-vinegar": {
-    "commit": "bb1bcdd"
-  },
-  "which-key.nvim": {
-    "commit": "ce741eb"
-  },
-  "wombat.nvim": {
-    "commit": "96989b1"
-  },
-  "wombat256.vim": {
-    "commit": "8734ba4"
-  },
-  "wombuddy.nvim": {
-    "commit": "29deb8f"
-  }
-}
diff --git a/neovim/packer_snapshots/latest-0.8 b/neovim/packer_snapshots/latest-0.8
deleted file mode 100644
index 725b2c2..0000000
--- a/neovim/packer_snapshots/latest-0.8
+++ /dev/null
@@ -1,188 +0,0 @@
-{
-  "LuaSnip": {
-    "commit": "51ebb4b"
-  },
-  "cmp-buffer": {
-    "commit": "3022dbc"
-  },
-  "cmp-nvim-lsp": {
-    "commit": "0e6b2ed"
-  },
-  "cmp-spell": {
-    "commit": "60584cb"
-  },
-  "cmp_luasnip": {
-    "commit": "1809552"
-  },
-  "colorbuddy.vim": {
-    "commit": "cdb5b06"
-  },
-  "dark-notify": {
-    "commit": "891adc0"
-  },
-  "file-line": {
-    "commit": "67c3590"
-  },
-  "friendly-snippets": {
-    "commit": "0dd6114"
-  },
-  "goyo.vim": {
-    "commit": "fa0263d"
-  },
-  "impatient.nvim": {
-    "commit": "47302af"
-  },
-  "inc-rename.nvim": {
-    "commit": "fb1b746"
-  },
-  "limelight.vim": {
-    "commit": "86aaec1"
-  },
-  "lsp_signature.nvim": {
-    "commit": "17ff7a4"
-  },
-  "lualine.nvim": {
-    "commit": "05d78e9"
-  },
-  "lush.nvim": {
-    "commit": "fb148c0"
-  },
-  "mason-lspconfig.nvim": {
-    "commit": "f0ce33f"
-  },
-  "mason.nvim": {
-    "commit": "7d7efc7"
-  },
-  "neodev.nvim": {
-    "commit": "358f11c"
-  },
-  "null-ls.nvim": {
-    "commit": "c89333e"
-  },
-  "nvim-cmp": {
-    "commit": "fc0f694"
-  },
-  "nvim-colorizer.lua": {
-    "commit": "36c610a"
-  },
-  "nvim-lspconfig": {
-    "commit": "255e07c"
-  },
-  "nvim-navic": {
-    "commit": "15704c6"
-  },
-  "nvim-notify": {
-    "commit": "f3024b9"
-  },
-  "nvim-solarized-lua": {
-    "commit": "7bd46fa"
-  },
-  "nvim-treesitter": {
-    "commit": "2cbe8a4"
-  },
-  "nvim-treesitter-refactor": {
-    "commit": "65ad2ec"
-  },
-  "nvim-treesitter-textobjects": {
-    "commit": "23e883b"
-  },
-  "packer.nvim": {
-    "commit": "1d0cf98"
-  },
-  "plenary.nvim": {
-    "commit": "499e074"
-  },
-  "popup.nvim": {
-    "commit": "b7404d3"
-  },
-  "rust.vim": {
-    "commit": "889b9a7"
-  },
-  "startuptime.vim": {
-    "commit": "dfa57f5"
-  },
-  "tcomment_vim": {
-    "commit": "b4930f9"
-  },
-  "telescope-file-browser.nvim": {
-    "commit": "6cf29d5"
-  },
-  "telescope.nvim": {
-    "commit": "b79cd6c"
-  },
-  "todo-comments.nvim": {
-    "commit": "09b0b17"
-  },
-  "tokyonight.nvim": {
-    "commit": "161114b"
-  },
-  "trouble.nvim": {
-    "commit": "324c977"
-  },
-  "vim-android": {
-    "commit": "8911f86"
-  },
-  "vim-argwrap": {
-    "commit": "feaba6b"
-  },
-  "vim-endwise": {
-    "commit": "e714ac3"
-  },
-  "vim-eunuch": {
-    "commit": "291ef1f"
-  },
-  "vim-forcedotcom": {
-    "commit": "a30ba7e"
-  },
-  "vim-fugitive": {
-    "commit": "5f0d280"
-  },
-  "vim-grepper": {
-    "commit": "2b93535"
-  },
-  "vim-gutentags": {
-    "commit": "1337b18"
-  },
-  "vim-pencil": {
-    "commit": "6d70438"
-  },
-  "vim-polyglot": {
-    "commit": "bc8a81d"
-  },
-  "vim-repeat": {
-    "commit": "24afe92"
-  },
-  "vim-rsi": {
-    "commit": "4554063"
-  },
-  "vim-startify": {
-    "commit": "81e36c3"
-  },
-  "vim-surround": {
-    "commit": "3d188ed"
-  },
-  "vim-textobj-sentence": {
-    "commit": "c5dd562"
-  },
-  "vim-textobj-user": {
-    "commit": "41a675d"
-  },
-  "vim-togglelist": {
-    "commit": "48f0d30"
-  },
-  "vim-vinegar": {
-    "commit": "bb1bcdd"
-  },
-  "which-key.nvim": {
-    "commit": "e271c28"
-  },
-  "wombat.nvim": {
-    "commit": "96989b1"
-  },
-  "wombat256.vim": {
-    "commit": "8734ba4"
-  },
-  "wombuddy.nvim": {
-    "commit": "29deb8f"
-  }
-}
diff --git a/neovim/packer_snapshots/latest-0.9 b/neovim/packer_snapshots/latest-0.9
deleted file mode 100644
index b8faccf..0000000
--- a/neovim/packer_snapshots/latest-0.9
+++ /dev/null
@@ -1,209 +0,0 @@
-{
-  "CopilotChat.nvim": {
-    "commit": "92bc7b5"
-  },
-  "LuaSnip": {
-    "commit": "500981f"
-  },
-  "cmp-buffer": {
-    "commit": "3022dbc"
-  },
-  "cmp-nvim-lsp": {
-    "commit": "39e2eda"
-  },
-  "cmp-spell": {
-    "commit": "694a4e5"
-  },
-  "cmp_luasnip": {
-    "commit": "05a9ab2"
-  },
-  "colorbuddy.vim": {
-    "commit": "8b96858"
-  },
-  "copilot.vim": {
-    "commit": "25f7397"
-  },
-  "dark-notify": {
-    "commit": "891adc0"
-  },
-  "dressing.nvim": {
-    "commit": "6741f10"
-  },
-  "file-line": {
-    "commit": "67c3590"
-  },
-  "friendly-snippets": {
-    "commit": "00ebcaa"
-  },
-  "git-scripts.nvim": {
-    "commit": "2f7c075"
-  },
-  "goyo.vim": {
-    "commit": "fa0263d"
-  },
-  "inc-rename.nvim": {
-    "commit": "8ba7701"
-  },
-  "limelight.vim": {
-    "commit": "785c1e1"
-  },
-  "lsp_signature.nvim": {
-    "commit": "a38da0a"
-  },
-  "lualine.nvim": {
-    "commit": "544dd15"
-  },
-  "lush.nvim": {
-    "commit": "1b66ab1"
-  },
-  "mason-lspconfig.nvim": {
-    "commit": "37a336b"
-  },
-  "mason.nvim": {
-    "commit": "e2f7f90"
-  },
-  "neodev.nvim": {
-    "commit": "46aa467"
-  },
-  "null-ls.nvim": {
-    "commit": "0010ea9"
-  },
-  "nvim-cmp": {
-    "commit": "d818fd0"
-  },
-  "nvim-colorizer.lua": {
-    "commit": "a065833"
-  },
-  "nvim-dap": {
-    "commit": "bc03b83"
-  },
-  "nvim-dap-python": {
-    "commit": "d777c2b"
-  },
-  "nvim-dap-ui": {
-    "commit": "a5606bc"
-  },
-  "nvim-lspconfig": {
-    "commit": "01e08d4"
-  },
-  "nvim-navic": {
-    "commit": "8649f69"
-  },
-  "nvim-notify": {
-    "commit": "d333b6f"
-  },
-  "nvim-solarized-lua": {
-    "commit": "d69a263"
-  },
-  "nvim-treesitter": {
-    "commit": "0758155"
-  },
-  "nvim-treesitter-textobjects": {
-    "commit": "34867c6"
-  },
-  "obsidian.nvim": {
-    "commit": "0f16bb4"
-  },
-  "packer.nvim": {
-    "commit": "ea0cc3c"
-  },
-  "plenary.nvim": {
-    "commit": "a3e3bc8"
-  },
-  "popup.nvim": {
-    "commit": "b7404d3"
-  },
-  "rust-tools.nvim": {
-    "commit": "6761879"
-  },
-  "sg.nvim": {
-    "commit": "8bdd4d1"
-  },
-  "startuptime.vim": {
-    "commit": "dfa57f5"
-  },
-  "tcomment_vim": {
-    "commit": "48ab639"
-  },
-  "telescope-file-browser.nvim": {
-    "commit": "a7ab9a9"
-  },
-  "telescope.nvim": {
-    "commit": "a0bbec2"
-  },
-  "todo-comments.nvim": {
-    "commit": "313b04e"
-  },
-  "tokyonight.nvim": {
-    "commit": "6adfcde"
-  },
-  "trouble.nvim": {
-    "commit": "f1168fe"
-  },
-  "vim-android": {
-    "commit": "26990f9"
-  },
-  "vim-argwrap": {
-    "commit": "f3e26a5"
-  },
-  "vim-endwise": {
-    "commit": "3719ffd"
-  },
-  "vim-eunuch": {
-    "commit": "8fb3904"
-  },
-  "vim-forcedotcom": {
-    "commit": "a30ba7e"
-  },
-  "vim-fugitive": {
-    "commit": "8c8cdf4"
-  },
-  "vim-grepper": {
-    "commit": "485d349"
-  },
-  "vim-gutentags": {
-    "commit": "aa47c5e"
-  },
-  "vim-pencil": {
-    "commit": "6d70438"
-  },
-  "vim-polyglot": {
-    "commit": "bc8a81d"
-  },
-  "vim-repeat": {
-    "commit": "6584602"
-  },
-  "vim-rsi": {
-    "commit": "4554063"
-  },
-  "vim-startify": {
-    "commit": "4e089df"
-  },
-  "vim-surround": {
-    "commit": "3d188ed"
-  },
-  "vim-textobj-sentence": {
-    "commit": "c5dd562"
-  },
-  "vim-textobj-user": {
-    "commit": "41a675d"
-  },
-  "vim-togglelist": {
-    "commit": "48f0d30"
-  },
-  "vim-vinegar": {
-    "commit": "bb1bcdd"
-  },
-  "which-key.nvim": {
-    "commit": "4b7167f"
-  },
-  "wombat.nvim": {
-    "commit": "efdfe7e"
-  },
-  "wombat256.vim": {
-    "commit": "8734ba4"
-  },
-  "wombuddy.nvim": {
-    "commit": "29deb8f"
-  }
-}