diff --git a/dots/.nvim-environments/primary/config/init.lua b/dots/.nvim-environments/primary/config/init.lua
index 0368553e..58a15029 100755
--- a/dots/.nvim-environments/primary/config/init.lua
+++ b/dots/.nvim-environments/primary/config/init.lua
@@ -1,5 +1 @@
-local loaded, impatient = pcall(require, 'impatient')
-if loaded then
-    impatient.enable_profile()
-end
 require('main')
diff --git a/dots/.nvim-environments/primary/config/lua/plugins/configs/alpha.lua b/dots/.nvim-environments/primary/config/lua/plugins/configs/alpha.lua
index d88f95fc..a0fb37d3 100644
--- a/dots/.nvim-environments/primary/config/lua/plugins/configs/alpha.lua
+++ b/dots/.nvim-environments/primary/config/lua/plugins/configs/alpha.lua
@@ -29,20 +29,18 @@ local header = {
 }
 
 -- Subheader, plugin count
-local get_plugins = function()
-    local num_plugins_loaded = #vim.fn.globpath(vim.fn.stdpath('data') .. '/site/pack/packer/start', '*', 0, 1)
-    local num_plugins_total = #vim.tbl_keys(packer_plugins)
-    if num_plugins_total <= 1 then
-        return num_plugins_loaded .. ' / ' .. num_plugins_total .. ' plugin  loaded'
+local get_plugin_info = function()
+    if require("lazy.status").has_updates() then
+        return "Plugin updates available, check :Lazy"
     else
-        return num_plugins_loaded .. ' / ' .. num_plugins_total .. ' plugins  loaded'
+        return "All plugins up to date"
     end
 end
 
-local plugin_count = {
+local plugin_info = {
     type = 'text',
     val = {
-        get_plugins(),
+        get_plugin_info()
     },
     opts = {
         hl = 'Comment',
@@ -87,7 +85,7 @@ local buttons = {
         button('f', '  Find File', ':Telescope find_files<CR>'),
         button('r', '  Recent', ':Telescope oldfiles<CR>'),
         button('s', '  Settings', ':e ~/.config/nvim/<CR>'),
-        button('u', '  Update Plugins', ':PackerSync<CR>'),
+        button('u', '  Update Plugins', ':Lazy sync<CR>'),
         button('q', '  Quit', ':qa<CR>'),
     },
     opts = {
@@ -113,7 +111,7 @@ local opts = {
         padding(),
         header,
         padding(),
-        plugin_count,
+        plugin_info,
         padding(),
         buttons,
         padding(),
diff --git a/dots/.nvim-environments/primary/config/lua/plugins/configs/statusline.lua b/dots/.nvim-environments/primary/config/lua/plugins/configs/statusline.lua
index e499a402..2a8b638a 100755
--- a/dots/.nvim-environments/primary/config/lua/plugins/configs/statusline.lua
+++ b/dots/.nvim-environments/primary/config/lua/plugins/configs/statusline.lua
@@ -130,7 +130,12 @@ lualine.setup({
         },
 
         -- Right
-        lualine_x = {},
+        lualine_x = {
+            {
+                require("lazy.status").updates,
+                cond = require("lazy.status").has_updates,
+            },
+        },
         lualine_y = {
             {
                 "buffers",
diff --git a/dots/.nvim-environments/primary/config/lua/plugins/mappings.lua b/dots/.nvim-environments/primary/config/lua/plugins/mappings.lua
index 9856d3f7..0de07804 100755
--- a/dots/.nvim-environments/primary/config/lua/plugins/mappings.lua
+++ b/dots/.nvim-environments/primary/config/lua/plugins/mappings.lua
@@ -183,34 +183,6 @@ vim.keymap.set(
     { silent = true, desc = "Gitsigns: Unstage Hunk" }
 )
 
--- Packer Mappings
-local packer = require("packer")
-local packer_sync = function()
-    vim.notify("Syncing packer.", "info", {
-        title = "Packer",
-    })
-    local snap_shot_time = tostring(os.date("!%Y-%m-%dT%TZ"))
-    packer.snapshot(snap_shot_time)
-    packer.sync()
-end
-
-local packer_compile = function()
-    vim.notify("Compiling packer.", "info", {
-        title = "Packer",
-    })
-    packer.compile()
-end
-
-vim.keymap.set("n", "<leader>ps", packer_sync, {
-    silent = true,
-    desc = "Packer: Sync",
-})
-
-vim.keymap.set("n", "<leader>pc", packer_compile, {
-    silent = true,
-    desc = "Packer: Compile",
-})
-
 -- Hop Mappings
 local hop = require("hop")
 
diff --git a/dots/.nvim-environments/primary/config/lua/plugins/plugins.lua b/dots/.nvim-environments/primary/config/lua/plugins/plugins.lua
index 4dc6a335..71334fbc 100755
--- a/dots/.nvim-environments/primary/config/lua/plugins/plugins.lua
+++ b/dots/.nvim-environments/primary/config/lua/plugins/plugins.lua
@@ -1,799 +1,792 @@
-local fn = vim.fn
-local utils = require("utils.funcs")
-
 -- Packer strap, install packer automatically and configure plugins
 -- See the end of this file for how the variable `packer_strap` gets used
-local install_path = fn.stdpath("data") .. "/site/pack/packer/start/packer.nvim"
-if fn.empty(fn.glob(install_path)) > 0 then
-    PACKER_STRAP = fn.system({
+local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
+if not vim.loop.fs_stat(lazypath) then
+    vim.notify("Installing Lazy plugin manager, please wait...")
+    vim.fn.system({
         "git",
         "clone",
-        "--depth",
-        "1",
-        "https://github.com/wbthomason/packer.nvim",
-        install_path,
+        "--filter=blob:none",
+        "--single-branch",
+        "https://github.com/folke/lazy.nvim.git",
+        lazypath,
     })
-    -- Update the runtime so packer can be used
-    vim.o.runtimepath = vim.fn.stdpath("data") .. "/site/pack/*/start/*," .. vim.o.runtimepath
 end
+vim.opt.runtimepath:prepend(lazypath)
 
-local packer = require("packer")
+local lazy = require("lazy")
 
-packer.init({
-    max_jobs = 20,
-})
+lazy.setup({
+    -- Packer Itself
+    { "wbthomason/packer.nvim" },
 
-return packer.startup({
-    function(use)
-        -- Performance boost on startup
-        -- keep at top of plugins
-        use({ "lewis6991/impatient.nvim" })
-
-        -- Packer Itself
-        use({ "wbthomason/packer.nvim" })
-
-        -- Commonly used library
-        use({
-            "nvim-lua/plenary.nvim",
-        })
-
-        -- Much nicer ui, integrates cmdheight = 0 wella
-        use({
-            "folke/noice.nvim",
-            config = function()
-                -- NOTE: Might be redundant, to check later
-                require("plugins.configs.nvim-notify")
-                require("plugins.configs.noice")
-            end,
-            requires = {
-                -- if you lazy-load any plugin below, make sure to add proper `module="..."` entries
-                "MunifTanjim/nui.nvim",
-                "rcarriga/nvim-notify",
-                "hrsh7th/nvim-cmp",
-            },
-        })
-
-        -- Color schemes
-        use({ "folke/tokyonight.nvim" })
-        use({
-            "EdenEast/nightfox.nvim",
-            config = function()
-                require("nightfox").setup({
-                    options = {
-                        transparent = true,
-                        dim_inactive = true,
-                    },
-                })
-            end,
-        })
-        use({
-            "rebelot/kanagawa.nvim",
-            config = function()
-                require("plugins.configs.kanagawa")
-            end,
-        })
-
-        -- Icons for folders, files, etc.
-        use({
-            "kyazdani42/nvim-web-devicons",
-            event = "BufEnter",
-        })
-
-        -- Statusline.
-        use({
-            "nvim-lualine/lualine.nvim",
-            config = function()
-                require("plugins.configs.statusline")
-            end,
-        })
-
-        -- Indentation Guides
-        use({
-            "lukas-reineke/indent-blankline.nvim",
-            event = "BufEnter",
-            config = function()
-                require("plugins.configs.indent-blankline")
-            end,
-        })
-
-        -- Treesitter
-        use({
-            "nvim-treesitter/nvim-treesitter",
-            run = ":TSUpdate",
-            requires = {
-                "p00f/nvim-ts-rainbow",
-                "nvim-treesitter/nvim-treesitter-context",
-            },
-            config = function()
-                require("plugins.configs.treesitter")
-            end,
-            before = "folke/noice.nvim",
-        })
-
-        use({
-            "nvim-treesitter/nvim-treesitter-textobjects",
-            after = { "nvim-treesitter" },
-            config = function()
-                require("nvim-treesitter.configs").setup({
-                    textobjects = {
-                        select = {
-                            enable = true,
-                            lookahead = true,
-                            disable = function(lang, bufnr)
-                                local mode = vim.fn.mode()
-                                if mode == "c" then
-                                    return true
-                                end
-                            end,
-                            keymaps = {
-                                ["af"] = "@function.outer",
-                                ["if"] = "@function.inner",
-                                ["ac"] = "@class.outer",
-                                ["ic"] = "@class.inner",
-                                ["ib"] = "@block.inner",
-                                ["ab"] = "@block.outer",
-                            },
-                        },
-                        move = {
-                            enable = true,
-                            disable = function(lang, bufnr)
-                                local mode = vim.fn.mode()
-                                if mode == "c" then
-                                    return true
-                                end
-                            end,
-                            set_jumps = true,
-                            goto_next_start = {
-                                ["]fs"] = "@function.outer",
-                                ["]cs"] = "@class.outer",
-                                ["]bs"] = "@block.outer",
-                            },
-                            goto_next_end = {
-                                ["]fe"] = "@function.outer",
-                                ["]ce"] = "@class.outer",
-                                ["]be"] = "@block.outer",
-                            },
-                            goto_previous_start = {
-                                ["[fs"] = "@function.outer",
-                                ["[cs"] = "@class.outer",
-                                ["[bs"] = "@block.outer",
-                            },
-                            goto_previous_end = {
-                                ["[fe"] = "@function.outer",
-                                ["[ce"] = "@class.outer",
-                                ["[bs"] = "@block.outer",
-                            },
-                        },
-                    },
-                })
-            end,
-        })
-
-        -- Highlight given color codes
-        use({
-            "brenoprata10/nvim-highlight-colors",
-            event = "BufEnter",
-            config = function()
-                require("nvim-highlight-colors").setup({
-                    enable_tailwind = true,
-                    render = "background",
-                })
-            end,
-        })
-
-        -- Dashboard when no file is given to nvim
-
-        use({
-            "goolord/alpha-nvim",
-            requires = { "kyazdani42/nvim-web-devicons" },
-            config = function()
-                require("plugins.configs.alpha")
-            end,
-        })
-
-        -- Telescope
-        use({
-            "nvim-telescope/telescope.nvim",
-            requires = {
-                "nvim-telescope/telescope-media-files.nvim",
-                "nvim-telescope/telescope-file-browser.nvim",
-                "artart222/telescope_find_directories",
-                "nvim-telescope/telescope-ui-select.nvim",
-                { "nvim-telescope/telescope-smart-history.nvim", requires = "tami5/sqlite.lua" },
-                { "nvim-telescope/telescope-fzf-native.nvim", run = "make" },
-            },
-            config = function()
-                require("plugins.configs.telescope-nvim")
-            end,
-        })
-
-        use({
-            "stevearc/dressing.nvim",
-        })
-
-        -- File Tree
-        use({
-            "nvim-neo-tree/neo-tree.nvim",
-            branch = "v2.x",
-            requires = {
-                "kyazdani42/nvim-web-devicons",
-                "nvim-lua/plenary.nvim",
-                "MunifTanjim/nui.nvim",
-            },
-            config = function()
-                require("plugins.configs.neotree")
-            end,
-            cmd = "Neotree",
-        })
-
-        -- Lspconfig
-        use({
-            "neovim/nvim-lspconfig",
-            requires = {
-                "hrsh7th/cmp-nvim-lsp",
-                "folke/neodev.nvim",
-                "Decodetalkers/csharpls-extended-lsp.nvim",
-                "williamboman/mason-lspconfig.nvim",
-                "nanotee/sqls.nvim",
-                "williamboman/mason.nvim",
-                "simrat39/rust-tools.nvim",
-                "Hoffs/omnisharp-extended-lsp.nvim",
-                "b0o/schemastore.nvim",
-            },
-            after = "noice.nvim",
-            config = function()
-                require("mason").setup({})
-                require("plugins.configs.lsp")
-            end,
-        })
-
-        -- Incremental rename, easier to view renames
-        use({
-            "https://github.com/smjonas/inc-rename.nvim.git",
-            config = function()
-                require("inc_rename").setup({})
-            end,
-        })
-
-        -- Better LSP Virtual Text Lines
-        use({
-            "https://git.sr.ht/~whynothugo/lsp_lines.nvim",
-            config = function()
-                require("lsp_lines").setup()
-            end,
-        })
-
-        -- Lsp From Null LS
-        use({
-            "jose-elias-alvarez/null-ls.nvim",
-            config = function()
-                require("plugins.configs.null_ls")
-            end,
-        })
-
-        -- Autopairs
-        use({
-            "windwp/nvim-autopairs",
-            config = function()
-                require("nvim-autopairs").setup()
-            end,
-        })
-
-        -- Snippets
-        use({
-            "rafamadriz/friendly-snippets",
-            config = function()
-                require("luasnip.loaders.from_vscode").lazy_load()
-            end,
-            requires = {
-                "L3MON4D3/LuaSnip",
-                "https://github.com/saadparwaiz1/cmp_luasnip",
-            },
-            after = "LuaSnip",
-            event = "BufEnter",
-        })
-
-        -- Code completion
-        use({
-            "hrsh7th/nvim-cmp",
-            requires = {
-                "hrsh7th/cmp-nvim-lsp",
-                "hrsh7th/cmp-path",
-                "hrsh7th/cmp-cmdline",
-                "hrsh7th/cmp-emoji",
-                "hrsh7th/cmp-nvim-lsp-document-symbol",
-                "hrsh7th/cmp-calc",
-                "davidsierradz/cmp-conventionalcommits",
-                "tamago324/cmp-zsh",
-                "dmitmel/cmp-cmdline-history",
-                "David-Kunz/cmp-npm",
-                "lukas-reineke/cmp-rg",
-                "onsails/lspkind.nvim",
-                "f3fora/cmp-spell",
-            },
-            config = function()
-                require("plugins.configs._cmp")
-            end,
-        })
-
-        use({
-            "tzachar/cmp-fuzzy-buffer",
-            requires = { "hrsh7th/nvim-cmp", "tzachar/fuzzy.nvim" },
-        })
-        use({ "tzachar/cmp-fuzzy-path", requires = { "hrsh7th/nvim-cmp", "tzachar/fuzzy.nvim" } })
-        use({
-            "saecki/crates.nvim",
-            event = { "BufRead Cargo.toml" },
-            requires = { { "nvim-lua/plenary.nvim" } },
-            config = function()
-                require("crates").setup()
-            end,
-        })
-
-        -- DAP, debugger
-        use({
-            "mfussenegger/nvim-dap",
-            config = function()
-                require("dap.ext.vscode").load_launchjs()
-                require("plugins.configs._dap")
-            end,
-            after = "nvim-notify",
-        })
-
-        -- Python debugger, dapinstall does not play nice with debugpy
-        use({
-            "mfussenegger/nvim-dap-python",
-            after = "nvim-dap",
-            config = function()
-                require("plugins.configs.python-dap")
-            end,
-        })
-
-        -- Virtual Text for DAP
-        use({
-            "theHamsta/nvim-dap-virtual-text",
-            after = "nvim-dap",
-            config = function()
-                require("nvim-dap-virtual-text").setup({})
-            end,
-        })
-
-        -- Fancy ui for dap
-        use({
-            "rcarriga/nvim-dap-ui",
-            after = "nvim-dap",
-            config = function()
-                require("plugins.configs.dap-ui")
-            end,
-        })
-
-        -- Code formatting
-        use({
-            "sbdchd/neoformat",
-            cmd = "Neoformat",
-            config = function()
-                require("plugins.configs.neoformat")
-            end,
-        })
-
-        use({
-            "anuvyklack/pretty-fold.nvim",
-            requires = "anuvyklack/nvim-keymap-amend",
-            config = function()
-                require("pretty-fold").setup({
-                    fill_char = " ",
-                })
-            end,
-        })
-
-        -- Git signs
-        use({
-            "lewis6991/gitsigns.nvim",
-            config = function()
-                require("gitsigns").setup({
-                    current_line_blame = true,
-                    current_line_blame_opts = {
-                        delay = 0,
-                    },
-                })
-            end,
-        })
-
-        -- Highlight certain comments, TODO, BUG, etc.
-        use({
-            "folke/todo-comments.nvim",
-            event = "BufEnter",
-            config = function()
-                require("todo-comments").setup({})
-            end,
-        })
-
-        -- Show possible key bindings during typing
-        use({
-            "folke/which-key.nvim",
-            config = function()
-                require("which-key").setup({})
-            end,
-        })
-
-        -- Create full path if not existing on write
-        use({
-            "jghauser/mkdir.nvim",
-            cmd = "new",
-            config = function()
-                require("mkdir")
-            end,
-        })
-
-        -- Text commenting
-        use({
-            "terrortylor/nvim-comment",
-            cmd = "CommentToggle",
-            config = function()
-                require("nvim_comment").setup()
-            end,
-        })
-
-        -- Move selections with alt+movement key
-        use({
-            "matze/vim-move",
-        })
-
-        -- Register support in telescope with persistent save
-        use({
-            "AckslD/nvim-neoclip.lua",
-            requires = {
-                { "tami5/sqlite.lua", module = "sqlite" },
-                { "nvim-telescope/telescope.nvim" },
-            },
-            config = function()
-                require("neoclip").setup({
-                    enable_persistent_history = true,
-                })
-            end,
-        })
-
-        -- Markdown Previewer
-        use({
-            "iamcco/markdown-preview.nvim",
-            run = "cd app && npm install",
-            setup = function()
-                vim.g.mkdp_filetypes = { "markdown" }
-                vim.g.mkdp_browser = "firefox-developer-edition"
-            end,
-            ft = { "markdown" },
-        })
-
-        -- Better Git integration
-        use({
-            "TimUntersberger/neogit",
-            config = function()
-                require("neogit").setup({
-                    disable_commit_confirmation = true,
-                    integrations = {
-                        diffview = true,
-                    },
-                })
-            end,
-            event = "BufWinEnter",
-            requires = {
-                "sindrets/diffview.nvim",
-            },
-        })
-
-        -- Ansible Syntax Highlighting
-        use({
-            "pearofducks/ansible-vim",
-        })
-
-        -- Better search display
-        use({
-            "kevinhwang91/nvim-hlslens",
-            module = "hlslens",
-            keys = "/",
-            config = function()
-                require("hlslens").setup()
-            end,
-        })
-
-        -- Note Taking
-        use({
-            "nvim-neorg/neorg",
-            config = function()
-                require("plugins.configs._neorg")
-            end,
-            requires = {
-                "nvim-lua/plenary.nvim",
-                "nvim-neorg/neorg-telescope",
-            },
-            after = "nvim-treesitter",
-            ft = "norg",
-        })
-
-        -- Log Syntax Highlighting
-        use({
-            "MTDL9/vim-log-highlighting",
-        })
-
-        -- Lots of small modules pulled into
-        -- one git repository
-        use({
-            "echasnovski/mini.nvim",
-            config = function()
-                require("mini.cursorword").setup({})
-            end,
-        })
-
-        -- Smoother Scrolling
-        use({
-            "karb94/neoscroll.nvim",
-            config = function()
-                require("neoscroll").setup({
-                    easing_function = "circular",
-                })
-            end,
-        })
-
-        -- Generate function/class/etc annotations
-        use({
-            "danymat/neogen",
-            requires = "nvim-treesitter/nvim-treesitter",
-            config = function()
-                require("neogen").setup({
-                    snippet_engine = "luasnip",
-                    languages = {
-                        cs = {
-                            template = {
-                                annotation_convention = "xmldoc",
-                            },
-                        },
-                    },
-                })
-            end,
-        })
-
-        -- Multiple cursor/multiple visual selection support
-        use({
-            "mg979/vim-visual-multi",
-        })
-
-        -- Editorconfig support
-        use({
-            "gpanders/editorconfig.nvim",
-        })
-
-        -- Maintain last cursor position in files
-        use({
-            "ethanholz/nvim-lastplace",
-            config = function()
-                require("nvim-lastplace").setup({
-                    lastplace_ignore_buftype = { "quickfix", "nofile", "help" },
-                    lastplace_ignore_filetype = { "gitcommit", "gitrebase", "svn", "hgcommit", "fugitive" },
-                    lastplace_open_folds = true,
-                })
-            end,
-        })
-
-        -- Diagnose startup time
-        use({ "dstein64/vim-startuptime" })
-
-        -- More codeactions
-        use({
-            "ThePrimeagen/refactoring.nvim",
-            requires = {
-                { "nvim-lua/plenary.nvim" },
-                { "nvim-treesitter/nvim-treesitter" },
-            },
-        })
-
-        -- Http Request Support
-        use({
-            "NTBBloodbath/rest.nvim",
-            requires = {
-                "https://github.com/nvim-lua/plenary.nvim",
-            },
-            config = function()
-                local rest_nvim = require("rest-nvim")
-                rest_nvim.setup({
-                    -- This is a dev plugin, makes life easier
-                    skip_ssl_verification = true,
-                })
-            end,
-        })
-
-        -- Allows repeating actions and more
-        use({
-            "anuvyklack/hydra.nvim",
-            requires = {
-                "anuvyklack/keymap-layer.nvim",
-                "lewis6991/gitsigns.nvim",
-                "jbyuki/venn.nvim",
-                "folke/which-key.nvim",
-            },
-            config = function()
-                require("plugins.configs.hydra")
-            end,
-        })
-
-        -- Faster motions
-        use({
-            "phaazon/hop.nvim",
-            config = function()
-                -- you can configure Hop the way you like here; see :h hop-config
-                require("hop").setup({ keys = "etovxqpdygfblzhckisuran" })
-            end,
-        })
-
-        -- Surround actions
-        use({
-            "kylechui/nvim-surround",
-            config = function()
-                require("nvim-surround").setup({})
-            end,
-        })
-
-        -- Better list continuation
-        use({
-            "gaoDean/autolist.nvim",
-            ft = {
-                "markdown",
-                "text",
-                "text",
-                "plaintex",
-            },
-            config = function()
-                require("autolist").setup({})
-            end,
-        })
-
-        -- Tint inactive windows
-        use({
-            "levouh/tint.nvim",
-            config = function()
-                require("tint").setup({
-                    highlight_ignore_patterns = { "WinSeparator" },
-                    tint = -30,
-                    saturation = 0.8,
-                })
-            end,
-        })
-
-        -- Highlight argument definitions and usages
-        use({
-            "m-demare/hlargs.nvim",
-            requires = { "nvim-treesitter/nvim-treesitter" },
-            config = function()
-                require("hlargs").setup({})
-            end,
-        })
-
-        -- Vim Latex Support
-        use({
-            "lervag/vimtex",
-            ft = "tex",
-            config = function()
-                vim.g.vimtext_view_method = "zathura"
-                vim.g.vimtex_view_general_viewer = "zathura"
-            end,
-        })
-
-        use({
-            "akinsho/toggleterm.nvim",
-            config = function()
-                require("toggleterm").setup({
-                    start_in_insert = false,
-                    direction = "float",
-                    autochdir = true,
-                    winbar = {
-                        enable = true,
-                        name_formatter = function(term) --  term: Terminal
-                            return term.name
-                        end,
-                    },
-                })
-            end,
-            cmd = {
-                "ToggleTerm",
-                "ToggleTermSetName",
-                "ToggleTermToggleAll",
-                "ToggleTermSendCurrentLine",
-                "ToggleTermSendVisualLines",
-                "ToggleTermSendVisualSelection",
-            },
-        })
-
-        -- Take a screenshot of code selected
-        use({
-            "NarutoXY/silicon.lua",
-            requires = { "nvim-lua/plenary.nvim" },
-            config = function()
-                require("silicon").setup({})
-            end,
-        })
-
-        -- Nice sidebar cursor goodies
-        use({
-            "gen740/SmoothCursor.nvim",
-            after = "kanagawa.nvim",
-            config = function()
-                require("smoothcursor").setup({
-                    fancy = {
-                        enable = true,
-                        head = { cursor = "⯈", texthl = "SmoothCursorCursor", linehl = nil },
-                        body = {
-                            { cursor = "", texthl = "SmoothCursorTrailBig1" },
-                            { cursor = "", texthl = "SmoothCursorTrailBig2" },
-                            { cursor = "●", texthl = "SmoothCursorTrailMedium" },
-                            { cursor = "●", texthl = "SmoothCursorTrailMedium" },
-                            { cursor = "•", texthl = "SmoothCursorTrailSmall" },
-                            { cursor = ".", texthl = "SmoothCursorTrailXSmall" },
-                            { cursor = ".", texthl = "SmoothCursorTrailXSmall" },
-                        },
-                    },
-                    disabled_filetypes = { "NeogitNotification" },
-                })
-            end,
-        })
-
-        -- Color Picker
-        use({
-            "uga-rosa/ccc.nvim",
-            config = function()
-                require("plugins.configs.ccc")
-            end,
-            cmd = {
-                "CccPick",
-                "CccConvert",
-                "CccHighlighterEnable",
-                "CccHighlighterToggle",
-                "CccHighlighterDisable",
-            },
-        })
-
-        -- Task runner & job management
-        use({
-            "stevearc/overseer.nvim",
-            config = function()
-                require("overseer").setup()
-            end,
-        })
-
-        -- Better buffer deletion
-        use({
-            "famiu/bufdelete.nvim",
-        })
-
-        -- Leave at end!!!
-        -- Install and deploy packer plugins
-        -- automatically
-        if PACKER_STRAP then
-            vim.notify("Syncing packer from bootstrap")
-
-            function _G.NotifyRestartNeeded()
-                local notify_available, _ = require("notify")
-                local message = "Neovim Restart Required to Finish Installation!"
-                if notify_available then
-                    vim.notify(message, vim.lsp.log_levels.WARN, {
-                        title = "Packer Strap",
-                        keep = function()
-                            return true
-                        end,
-                    })
-                else
-                    vim.notify(message)
-                end
-            end
-
-            vim.api.nvim_exec(
-                [[
-                autocmd User PackerCompileDone lua NotifyRestartNeeded()
-                ]],
-                false
-            )
-            require("packer").sync()
-        end
-    end,
-    config = {
-        compile_path = vim.fn.stdpath("config") .. "/lua/packer_compiled.lua",
+    -- Commonly used library
+    {
+        "nvim-lua/plenary.nvim",
     },
+
+    -- Much nicer ui, integrates cmdheight = 0 wella
+    {
+        "folke/noice.nvim",
+        config = function()
+            -- NOTE: Might be redundant, to check later
+            require("plugins.configs.nvim-notify")
+            require("plugins.configs.noice")
+        end,
+        dependencies = {
+            -- if you lazy-load any plugin below, make sure to add proper `module="..."` entries
+            "MunifTanjim/nui.nvim",
+            "rcarriga/nvim-notify",
+            "hrsh7th/nvim-cmp",
+        },
+    },
+
+    -- Color schemes
+    { "folke/tokyonight.nvim" },
+    {
+        "EdenEast/nightfox.nvim",
+        config = function()
+            require("nightfox").setup({
+                options = {
+                    transparent = true,
+                    dim_inactive = true,
+                },
+            })
+        end,
+    },
+    {
+        "rebelot/kanagawa.nvim",
+        config = function()
+            require("plugins.configs.kanagawa")
+        end,
+    },
+
+    -- Icons for folders, files, etc.
+    {
+        "kyazdani42/nvim-web-devicons",
+        event = "BufEnter",
+    },
+
+    -- Statusline.
+    {
+        "nvim-lualine/lualine.nvim",
+        config = function()
+            require("plugins.configs.statusline")
+        end,
+    },
+
+    -- Indentation Guides
+    {
+        "lukas-reineke/indent-blankline.nvim",
+        event = "BufEnter",
+        config = function()
+            require("plugins.configs.indent-blankline")
+        end,
+    },
+
+    -- Treesitter
+    {
+        "nvim-treesitter/nvim-treesitter",
+        build = ":TSUpdate",
+        dependencies = {
+            "p00f/nvim-ts-rainbow",
+            "nvim-treesitter/nvim-treesitter-context",
+        },
+        config = function()
+            require("plugins.configs.treesitter")
+        end,
+        before = "folke/noice.nvim",
+    },
+
+    {
+        "nvim-treesitter/nvim-treesitter-textobjects",
+        after = { "nvim-treesitter" },
+        config = function()
+            require("nvim-treesitter.configs").setup({
+                textobjects = {
+                    select = {
+                        enable = true,
+                        lookahead = true,
+                        disable = function(lang, bufnr)
+                            local mode = vim.fn.mode()
+                            if mode == "c" then
+                                return true
+                            end
+                        end,
+                        keymaps = {
+                            ["af"] = "@function.outer",
+                            ["if"] = "@function.inner",
+                            ["ac"] = "@class.outer",
+                            ["ic"] = "@class.inner",
+                            ["ib"] = "@block.inner",
+                            ["ab"] = "@block.outer",
+                        },
+                    },
+                    move = {
+                        enable = true,
+                        disable = function(lang, bufnr)
+                            local mode = vim.fn.mode()
+                            if mode == "c" then
+                                return true
+                            end
+                        end,
+                        set_jumps = true,
+                        goto_next_start = {
+                            ["]fs"] = "@function.outer",
+                            ["]cs"] = "@class.outer",
+                            ["]bs"] = "@block.outer",
+                        },
+                        goto_next_end = {
+                            ["]fe"] = "@function.outer",
+                            ["]ce"] = "@class.outer",
+                            ["]be"] = "@block.outer",
+                        },
+                        goto_previous_start = {
+                            ["[fs"] = "@function.outer",
+                            ["[cs"] = "@class.outer",
+                            ["[bs"] = "@block.outer",
+                        },
+                        goto_previous_end = {
+                            ["[fe"] = "@function.outer",
+                            ["[ce"] = "@class.outer",
+                            ["[bs"] = "@block.outer",
+                        },
+                    },
+                },
+            })
+        end,
+    },
+
+    -- Highlight given color codes
+    {
+        "brenoprata10/nvim-highlight-colors",
+        event = "BufEnter",
+        config = function()
+            require("nvim-highlight-colors").setup({
+                enable_tailwind = true,
+                render = "background",
+            })
+        end,
+    },
+
+    -- Dashboard when no file is given to nvim
+
+    {
+        "goolord/alpha-nvim",
+        dependencies = { "kyazdani42/nvim-web-devicons" },
+        config = function()
+            require("plugins.configs.alpha")
+        end,
+    },
+
+    -- Telescope
+    {
+        "nvim-telescope/telescope.nvim",
+        dependencies = {
+            "nvim-telescope/telescope-media-files.nvim",
+            "nvim-telescope/telescope-file-browser.nvim",
+            "artart222/telescope_find_directories",
+            "nvim-telescope/telescope-ui-select.nvim",
+            { "nvim-telescope/telescope-smart-history.nvim", dependencies = "tami5/sqlite.lua" },
+            { "nvim-telescope/telescope-fzf-native.nvim", build = "make" },
+        },
+        config = function()
+            require("plugins.configs.telescope-nvim")
+        end,
+    },
+
+    {
+        "stevearc/dressing.nvim",
+    },
+
+    -- File Tree
+    {
+        "nvim-neo-tree/neo-tree.nvim",
+        branch = "v2.x",
+        dependencies = {
+            "kyazdani42/nvim-web-devicons",
+            "nvim-lua/plenary.nvim",
+            "MunifTanjim/nui.nvim",
+        },
+        config = function()
+            require("plugins.configs.neotree")
+        end,
+        cmd = "Neotree",
+    },
+
+    -- Lspconfig
+    {
+        "neovim/nvim-lspconfig",
+        dependencies = {
+            "hrsh7th/cmp-nvim-lsp",
+            "folke/neodev.nvim",
+            "Decodetalkers/csharpls-extended-lsp.nvim",
+            "williamboman/mason-lspconfig.nvim",
+            "nanotee/sqls.nvim",
+            "williamboman/mason.nvim",
+            "simrat39/rust-tools.nvim",
+            "Hoffs/omnisharp-extended-lsp.nvim",
+            "b0o/schemastore.nvim",
+        },
+        after = "noice.nvim",
+        event = "BufEnter",
+        config = function()
+            require("mason").setup({})
+            require("plugins.configs.lsp")
+        end,
+    },
+
+    -- Incremental rename, easier to view renames
+    {
+        "smjonas/inc-rename.nvim",
+        config = function()
+            require("inc_rename").setup({})
+        end,
+    },
+
+    -- Better LSP Virtual Text Lines
+    {
+        url = "https://git.sr.ht/~whynothugo/lsp_lines.nvim",
+        config = function()
+            require("lsp_lines").setup()
+        end,
+    },
+
+    -- Lsp From Null LS
+    {
+        "jose-elias-alvarez/null-ls.nvim",
+        config = function()
+            require("plugins.configs.null_ls")
+        end,
+    },
+
+    -- Autopairs
+    {
+        "windwp/nvim-autopairs",
+        config = function()
+            require("nvim-autopairs").setup()
+        end,
+    },
+
+    -- Snippets
+    {
+        "rafamadriz/friendly-snippets",
+        config = function()
+            require("luasnip.loaders.from_vscode").lazy_load()
+        end,
+        dependencies = {
+            "L3MON4D3/LuaSnip",
+            "saadparwaiz1/cmp_luasnip",
+        },
+        after = "LuaSnip",
+        event = "BufEnter",
+    },
+
+    -- Code completion
+    {
+        "hrsh7th/nvim-cmp",
+        dependencies = {
+            "hrsh7th/cmp-nvim-lsp",
+            "hrsh7th/cmp-path",
+            "hrsh7th/cmp-cmdline",
+            "hrsh7th/cmp-emoji",
+            "hrsh7th/cmp-nvim-lsp-document-symbol",
+            "hrsh7th/cmp-calc",
+            "davidsierradz/cmp-conventionalcommits",
+            "tamago324/cmp-zsh",
+            "dmitmel/cmp-cmdline-history",
+            "David-Kunz/cmp-npm",
+            "lukas-reineke/cmp-rg",
+            "onsails/lspkind.nvim",
+            "f3fora/cmp-spell",
+        },
+        config = function()
+            require("plugins.configs._cmp")
+        end,
+    },
+
+    {
+        "tzachar/cmp-fuzzy-buffer",
+        dependencies = { "hrsh7th/nvim-cmp", "tzachar/fuzzy.nvim" },
+    },
+    { "tzachar/cmp-fuzzy-path", dependencies = { "hrsh7th/nvim-cmp", "tzachar/fuzzy.nvim" } },
+    {
+        "saecki/crates.nvim",
+        event = { "BufRead Cargo.toml" },
+        dependencies = { { "nvim-lua/plenary.nvim" } },
+        config = function()
+            require("crates").setup()
+        end,
+    },
+
+    -- DAP, debugger
+    {
+        "mfussenegger/nvim-dap",
+        config = function()
+            require("dap.ext.vscode").load_launchjs()
+            require("plugins.configs._dap")
+        end,
+        after = "nvim-notify",
+    },
+
+    -- Python debugger, dapinstall does not play nice with debugpy
+    {
+        "mfussenegger/nvim-dap-python",
+        after = "nvim-dap",
+        config = function()
+            require("plugins.configs.python-dap")
+        end,
+    },
+
+    -- Virtual Text for DAP
+    {
+        "theHamsta/nvim-dap-virtual-text",
+        after = "nvim-dap",
+        config = function()
+            require("nvim-dap-virtual-text").setup({})
+        end,
+    },
+
+    -- Fancy ui for dap
+    {
+        "rcarriga/nvim-dap-ui",
+        after = "nvim-dap",
+        config = function()
+            require("plugins.configs.dap-ui")
+        end,
+    },
+
+    -- Code formatting
+    {
+        "sbdchd/neoformat",
+        cmd = "Neoformat",
+        config = function()
+            require("plugins.configs.neoformat")
+        end,
+    },
+
+    {
+        "anuvyklack/pretty-fold.nvim",
+        dependencies = "anuvyklack/nvim-keymap-amend",
+        config = function()
+            require("pretty-fold").setup({
+                fill_char = " ",
+            })
+        end,
+    },
+
+    -- Git signs
+    {
+        "lewis6991/gitsigns.nvim",
+        config = function()
+            require("gitsigns").setup({
+                current_line_blame = true,
+                current_line_blame_opts = {
+                    delay = 0,
+                },
+            })
+        end,
+    },
+
+    -- Highlight certain comments, TODO, BUG, etc.
+    {
+        "folke/todo-comments.nvim",
+        event = "BufEnter",
+        config = function()
+            require("todo-comments").setup({})
+        end,
+    },
+
+    -- Show possible key bindings during typing
+    {
+        "folke/which-key.nvim",
+        config = function()
+            require("which-key").setup({})
+        end,
+    },
+
+    -- Create full path if not existing on write
+    {
+        "jghauser/mkdir.nvim",
+        config = function()
+            require("mkdir")
+        end,
+    },
+
+    -- Text commenting
+    {
+        "terrortylor/nvim-comment",
+        cmd = "CommentToggle",
+        config = function()
+            require("nvim_comment").setup()
+        end,
+    },
+
+    -- Move selections with alt+movement key
+    {
+        "matze/vim-move",
+    },
+
+    -- Register support in telescope with persistent save
+    {
+        "AckslD/nvim-neoclip.lua",
+        dependencies = {
+            { "tami5/sqlite.lua", module = "sqlite" },
+            { "nvim-telescope/telescope.nvim" },
+        },
+        config = function()
+            require("neoclip").setup({
+                enable_persistent_history = true,
+            })
+        end,
+    },
+
+    -- Markdown Previewer
+    {
+        "iamcco/markdown-preview.nvim",
+        build = "cd app && npm install",
+        init = function()
+            vim.g.mkdp_filetypes = { "markdown" }
+            vim.g.mkdp_browser = "firefox-developer-edition"
+        end,
+        ft = { "markdown" },
+    },
+
+    -- Better Git integration
+    {
+        "TimUntersberger/neogit",
+        config = function()
+            require("neogit").setup({
+                disable_commit_confirmation = true,
+                integrations = {
+                    diffview = true,
+                },
+            })
+        end,
+        event = "BufWinEnter",
+        dependencies = {
+            "sindrets/diffview.nvim",
+        },
+    },
+
+    -- Ansible Syntax Highlighting
+    {
+        "pearofducks/ansible-vim",
+    },
+
+    -- Better search display
+    {
+        "kevinhwang91/nvim-hlslens",
+        module = "hlslens",
+        keys = "/",
+        config = function()
+            require("hlslens").setup()
+        end,
+    },
+
+    -- Note Taking
+    {
+        "nvim-neorg/neorg",
+        config = function()
+            require("plugins.configs._neorg")
+        end,
+        dependencies = {
+            "nvim-lua/plenary.nvim",
+            "nvim-neorg/neorg-telescope",
+        },
+        after = "nvim-treesitter",
+        ft = "norg",
+    },
+
+    -- Log Syntax Highlighting
+    {
+        "MTDL9/vim-log-highlighting",
+    },
+
+    -- Lots of small modules pulled into
+    -- one git repository
+    {
+        "echasnovski/mini.nvim",
+        config = function()
+            require("mini.cursorword").setup({})
+        end,
+    },
+
+    -- Smoother Scrolling
+    {
+        "karb94/neoscroll.nvim",
+        config = function()
+            require("neoscroll").setup({
+                easing_function = "circular",
+            })
+        end,
+    },
+
+    -- Generate function/class/etc annotations
+    {
+        "danymat/neogen",
+        dependencies = "nvim-treesitter/nvim-treesitter",
+        config = function()
+            require("neogen").setup({
+                snippet_engine = "luasnip",
+                languages = {
+                    cs = {
+                        template = {
+                            annotation_convention = "xmldoc",
+                        },
+                    },
+                },
+            })
+        end,
+    },
+
+    -- Multiple cursor/multiple visual selection support
+    {
+        "mg979/vim-visual-multi",
+    },
+
+    -- Editorconfig support
+    {
+        "gpanders/editorconfig.nvim",
+    },
+
+    -- Maintain last cursor position in files
+    {
+        "ethanholz/nvim-lastplace",
+        config = function()
+            require("nvim-lastplace").setup({
+                lastplace_ignore_buftype = { "quickfix", "nofile", "help" },
+                lastplace_ignore_filetype = { "gitcommit", "gitrebase", "svn", "hgcommit", "fugitive" },
+                lastplace_open_folds = true,
+            })
+        end,
+    },
+
+    -- Diagnose startup time
+    { "dstein64/vim-startuptime" },
+
+    -- More codeactions
+    {
+        "ThePrimeagen/refactoring.nvim",
+        dependencies = {
+            { "nvim-lua/plenary.nvim" },
+            { "nvim-treesitter/nvim-treesitter" },
+        },
+    },
+
+    -- Http Request Support
+    {
+        "NTBBloodbath/rest.nvim",
+        dependencies = {
+            "nvim-lua/plenary.nvim",
+        },
+        config = function()
+            local rest_nvim = require("rest-nvim")
+            rest_nvim.setup({
+                -- This is a dev plugin, makes life easier
+                skip_ssl_verification = true,
+            })
+        end,
+    },
+
+    -- Allows repeating actions and more
+    {
+        "anuvyklack/hydra.nvim",
+        dependencies = {
+            "anuvyklack/keymap-layer.nvim",
+            "lewis6991/gitsigns.nvim",
+            "jbyuki/venn.nvim",
+            "folke/which-key.nvim",
+        },
+        config = function()
+            require("plugins.configs.hydra")
+        end,
+    },
+
+    -- Faster motions
+    {
+        "phaazon/hop.nvim",
+        config = function()
+            -- you can configure Hop the way you like here; see :h hop-config
+            require("hop").setup({ keys = "etovxqpdygfblzhckisuran" })
+        end,
+    },
+
+    -- Surround actions
+    {
+        "kylechui/nvim-surround",
+        config = function()
+            require("nvim-surround").setup({})
+        end,
+    },
+
+    -- Better list continuation
+    {
+        "gaoDean/autolist.nvim",
+        ft = {
+            "markdown",
+            "text",
+            "text",
+            "plaintex",
+        },
+        config = function()
+            require("autolist").setup({})
+        end,
+    },
+
+    -- Tint inactive windows
+    {
+        "levouh/tint.nvim",
+        config = function()
+            require("tint").setup({
+                highlight_ignore_patterns = { "WinSeparator" },
+                tint = -30,
+                saturation = 0.8,
+            })
+        end,
+    },
+
+    -- Highlight argument definitions and usages
+    {
+        "m-demare/hlargs.nvim",
+        dependencies = { "nvim-treesitter/nvim-treesitter" },
+        config = function()
+            require("hlargs").setup({})
+        end,
+    },
+
+    -- Vim Latex Support
+    {
+        "lervag/vimtex",
+        ft = "tex",
+        config = function()
+            vim.g.vimtext_view_method = "zathura"
+            vim.g.vimtex_view_general_viewer = "zathura"
+        end,
+    },
+
+    {
+        "akinsho/toggleterm.nvim",
+        config = function()
+            require("toggleterm").setup({
+                start_in_insert = false,
+                direction = "float",
+                autochdir = true,
+                winbar = {
+                    enable = true,
+                    name_formatter = function(term) --  term: Terminal
+                        return term.name
+                    end,
+                },
+            })
+        end,
+        cmd = {
+            "ToggleTerm",
+            "ToggleTermSetName",
+            "ToggleTermToggleAll",
+            "ToggleTermSendCurrentLine",
+            "ToggleTermSendVisualLines",
+            "ToggleTermSendVisualSelection",
+        },
+    },
+
+    -- Take a screenshot of code selected
+    {
+        "NarutoXY/silicon.lua",
+        dependencies = { "nvim-lua/plenary.nvim" },
+        config = function()
+            require("silicon").setup({})
+        end,
+    },
+
+    -- Nice sidebar cursor goodies
+    {
+        "gen740/SmoothCursor.nvim",
+        after = "kanagawa.nvim",
+        config = function()
+            require("smoothcursor").setup({
+                fancy = {
+                    enable = true,
+                    head = { cursor = "⯈", texthl = "SmoothCursorCursor", linehl = nil },
+                    body = {
+                        { cursor = "", texthl = "SmoothCursorTrailBig1" },
+                        { cursor = "", texthl = "SmoothCursorTrailBig2" },
+                        { cursor = "●", texthl = "SmoothCursorTrailMedium" },
+                        { cursor = "●", texthl = "SmoothCursorTrailMedium" },
+                        { cursor = "•", texthl = "SmoothCursorTrailSmall" },
+                        { cursor = ".", texthl = "SmoothCursorTrailXSmall" },
+                        { cursor = ".", texthl = "SmoothCursorTrailXSmall" },
+                    },
+                },
+                disabled_filetypes = { "NeogitNotification" },
+            })
+        end,
+    },
+
+    -- Color Picker
+    {
+        "uga-rosa/ccc.nvim",
+        config = function()
+            require("plugins.configs.ccc")
+        end,
+        cmd = {
+            "CccPick",
+            "CccConvert",
+            "CccHighlighterEnable",
+            "CccHighlighterToggle",
+            "CccHighlighterDisable",
+        },
+    },
+
+    -- Task runner & job management
+    {
+        "stevearc/overseer.nvim",
+        config = function()
+            require("overseer").setup()
+        end,
+    },
+
+    -- Better buffer deletion
+    {
+        "famiu/bufdelete.nvim",
+    },
+
+    -- Leave at end!!!
+    -- Install and deploy packer plugins
+    -- automatically
+    --     if PACKER_STRAP then
+    --         vim.notify("Syncing packer from bootstrap")
+    --
+    --         function _G.NotifyRestartNeeded()
+    --             local notify_available, _ = require("notify")
+    --             local message = "Neovim Restart Required to Finish Installation!"
+    --             if notify_available then
+    --                 vim.notify(message, vim.lsp.log_levels.WARN, {
+    --                     title = "Packer Strap",
+    --                     keep = function()
+    --                         return true
+    --                     end,
+    --                 },
+    --             else
+    --                 vim.notify(message)
+    --             end
+    --         end
+    --
+    --         vim.api.nvim_exec(
+    --             [[
+    --             autocmd User PackerCompileDone lua NotifyRestartNeeded()
+    --             ]],
+    --             false
+    --         )
+    --         require("packer").sync()
+    --     end
+    -- end,
+    -- config = {
+    --     compile_path = vim.fn.stdpath("config") .. "/lua/packer_compiled.lua",
+    -- },
+}, {
+    checker = {
+        enabled = true,
+        concurrency = 20
+    }
 })