diff --git a/common/.config/nvim/init.lua b/common/.config/nvim/init.lua
index 654af8d..c2b1450 100644
--- a/common/.config/nvim/init.lua
+++ b/common/.config/nvim/init.lua
@@ -7,7 +7,20 @@ vim.api.nvim_set_hl(0, "NormalFloat", { bg = "NONE" })
 vim.api.nvim_set_hl(0, "FloatBorder", { bg = "NONE" })
 vim.api.nvim_set_hl(0, "CmpItemMenu", { bg = "NONE" })
 
-require('plugins')
+local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
+if not vim.loop.fs_stat(lazypath) then
+  vim.fn.system({
+    "git",
+    "clone",
+    "--filter=blob:none",
+    "https://github.com/folke/lazy.nvim.git",
+    "--branch=stable", -- latest stable release
+    lazypath,
+  })
+end
+vim.opt.rtp:prepend(lazypath)
+
+require("lazy").setup(require('plugins'))
 
 vim.cmd('source ~/.config/nvim/neovim.vim')
 
diff --git a/common/.config/nvim/lua/plugins.lua b/common/.config/nvim/lua/plugins.lua
index fd773d0..4988ff5 100644
--- a/common/.config/nvim/lua/plugins.lua
+++ b/common/.config/nvim/lua/plugins.lua
@@ -1,261 +1,194 @@
-local fn = vim.fn
-local installPath = DATA_PATH..'/site/pack/packer/start/packer.nvim'
-
--- install packer if it's not installed already
-local packerBootstrap = nil
-if fn.empty(fn.glob(installPath)) > 0 then
-    packerBootstrap = fn.system({'git', 'clone', '--depth', '1', 'https://github.com/wbthomason/packer.nvim', installPath})
-    vim.cmd [[packadd packer.nvim]]
-end
-
-
-local packer = require('packer').startup(function(use)
-    -- Packer should manage itself
-    use 'wbthomason/packer.nvim'
-
-    -- colourscheme
-    use { 'rebelot/kanagawa.nvim' }
-    use 'nvim-tree/nvim-web-devicons'
-
+return {
+    {
+        'rebelot/kanagawa.nvim',
+        lazy = false,
+        priority = 1000,
+        config = function ()
+            vim.cmd('colorscheme kanagawa')
+        end
+    },
     -- QUALITY OF LIFE INTEGRATIONS
-
-    -- git integration
-    use 'tpope/vim-fugitive'
-
-    use {
+    {
+        -- git integration
+        'tpope/vim-fugitive',
+        opts = {}
+    },
+    {
         'lewis6991/gitsigns.nvim',
-        requires = { 'nvim-lua/plenary.nvim' },
+        dependencies = { 'nvim-lua/plenary.nvim' },
         config = function ()
             require('plugin-config/gitsigns')
         end
-    }
-
-    -- colourise colour codes
-    use {
+    },
+    {
+        -- colourise colour codes
         'norcalli/nvim-colorizer.lua',
-        config = function ()
-            require('colorizer').setup({})
-        end
-    }
-
-    -- harpoon
-    use {
+        lazy = true,
+        opts = {}
+    },
+    {
+        -- EPIC HARPOON MOMENT
         'ThePrimeagen/harpoon',
-        config = function ()
-            require('harpoon').setup({
-                tabline = true,
-            })
-            vim.keymap.set("n", "<leader>hh", require("harpoon.ui").toggle_quick_menu, { desc = "Toggle harpoon menu" })
-            vim.keymap.set("n", "<leader>hg", require("harpoon.mark").toggle_file, { desc = "Add file to harpoon list" })
+        opts = {
+            tabline = true,
+        },
+        keys = {
+            { '<leader>hh', '<cmd>lua require("harpoon.ui").toggle_quick_menu()<cr>', desc = "Toggle harpoon menu" },
+            { '<leader>hg', '<cmd>require("harpoon.mark").toggle_file() <cr>', desc = "Add file to harpoon list" },
+        },
+        config = function()
             for pos = 1, 9 do
                 vim.keymap.set("n", "<C-w>" .. pos, function()
                     require("harpoon.ui").nav_file(pos)
                 end, { desc = "Move to harpoon mark #" .. pos })
             end
         end
-    }
-
-    -- telescope - searching / navigation
-    use {
+    },
+    {
         'nvim-telescope/telescope.nvim',
-        requires = {
+        dependencies = {
             'nvim-lua/plenary.nvim',
             'nvim-telescope/telescope-ui-select.nvim',
             'debugloop/telescope-undo.nvim',
             'folke/todo-comments.nvim',
+            'kevinhwang91/nvim-bqf',
         },
         config = function ()
             require('plugin-config/telescope')
             require('todo-comments').setup({})
         end
-    }
-
-    -- better hotfix window (for showing and searching through results in telescope's find usages)
-    use 'kevinhwang91/nvim-bqf'
-
-    -- better highlighting
-    use {
-        'nvim-treesitter/nvim-treesitter',
-        run = ':TSUpdate',
+    },
+    {
+        'nvim-treesitter/nvim-treesitter-context',
+        build = ':TSUpdate',
+        dependencies = {
+            'nvim-treesitter/nvim-treesitter',
+        },
         config = function ()
             require('plugin-config/nvim-treesitter')
         end
-    }
-    use 'nvim-treesitter/nvim-treesitter-context'
-
-    -- better split navigation
-    use {
+    },
+    {
         'mrjones2014/smart-splits.nvim',
-        config = function ()
+         config = function ()
             require('plugin-config/smart-splits')
         end
-    }
-
-    -- zen m
-    use {
+    },
+    {
         'folke/zen-mode.nvim',
-        config = function()
-            require('zen-mode').setup({})
-            vim.keymap.set("n", "<leader>z", function()
-                require("zen-mode").toggle()
-            end, { desc = "Toggle Zen Mode" })
-        end
-    }
-
-    -- gorbit's codewindow
-    use {
+        lazy = true,
+        opts = {},
+        keys = {
+            { '<leader>z', '<cmd>lua require("zen-mode").toggle()<cr>', desc = "Toggle zen mode" },
+        },
+    },
+    {
         'gorbit99/codewindow.nvim',
-        config = function()
-            local codewindow = require('codewindow')
-            codewindow.setup()
-            codewindow.apply_default_keybinds()
+        lazy = true,
+        opts = {},
+        config = function ()
+            require('codewindow').apply_default_keybinds()
         end
-    }
-
-    -- nerd commenter
-    use 'scrooloose/nerdcommenter'
-
-    -- LSP code previews
-    use {
-        "glepnir/lspsaga.nvim",
-        opt = true,
-        branch = "main",
-        event = "LspAttach",
-        config = function()
-            require("lspsaga").setup({
-                symbol_in_winbar = {
-                    enable = false,
-                },
-                lightbulb = {
-                    enable = false,
-                },
-                rename = {
-                    whole_project = false,
-                }
-            })
-        end,
-    }
-
-    -- whitespace pedantics
-    use 'ntpeters/vim-better-whitespace'
-
-    -- auto brace pairs vscode-style
-    use {
+    },
+    {
+        'scrooloose/nerdcommenter'
+    },
+    {
+        'glepnir/lspsaga.nvim',
+        lazy = true,
+        opts = {
+            symbol_in_winbar = {
+                enable = false,
+            },
+            lightbulb = {
+                enable = false,
+            },
+            rename = {
+                whole_project = false,
+            }
+        },
+    },
+    {
+        'ntpeters/vim-better-whitespace'
+    },
+    {
         'windwp/nvim-autopairs',
-        config = function()
-            require('nvim-autopairs').setup({})
-        end
-    }
-
-    -- obsidian!!!
-    use {
-        'epwalsh/obsidian.nvim',
-        config = function()
-            require('plugin-config/obsidian')
-        end
-    }
-
+        opts = {},
+    },
     -- VISUAL CHANGES
-
-    -- epic splash screen
-    use {
+    {
         'jovanlanik/fsplash.nvim',
-        config = function ()
-            require('fsplash').setup({
-                lines = {
-                    "▄▄▄▄· ▄▄▄ . ▐ ▄  ▌ ▐·▪  • ▌ ▄ ·. ",
-                    "▐█ ▀█▪▀▄.▀·•█▌▐█▪█·█▌██ ·██ ▐███▪",
-                    "▐█▀▀█▄▐▀▀▪▄▐█▐▐▌▐█▐█•▐█·▐█ ▌▐▌▐█·",
-                    "██▄▪▐█▐█▄▄▌██▐█▌ ███ ▐█▌██ ██▌▐█▌",
-                    "·▀▀▀▀  ▀▀▀ ▀▀ █▪. ▀  ▀▀▀▀▀  █▪▀▀▀",
-                    '',
-                    'NVIM v'
-                    .. vim.version().major
-                    .. '.'
-                    .. vim.version().minor
-                    .. '.'
-                    ..  vim.version().patch,
-                    'Nvim is open Source and freely distributable',
-                    '',
-                    'type  :checkhealth<Enter>     to optimize Nvim',
-                    'type  :q<Enter>               to exit         ',
-                    'type  :help<Enter>            for help        ',
-                    '',
-                    'type  :help news<Enter> to see changes in v'
-                    .. vim.version().major
-                    .. '.'
-                    .. vim.version().minor
-                },
-                border = 'none';
-            })
-        end
-    }
-
-    -- nicer looking tab display
-    use {
+        opts = {
+            lines = {
+                "▄▄▄▄· ▄▄▄ . ▐ ▄  ▌ ▐·▪  • ▌ ▄ ·. ",
+                "▐█ ▀█▪▀▄.▀·•█▌▐█▪█·█▌██ ·██ ▐███▪",
+                "▐█▀▀█▄▐▀▀▪▄▐█▐▐▌▐█▐█•▐█·▐█ ▌▐▌▐█·",
+                "██▄▪▐█▐█▄▄▌██▐█▌ ███ ▐█▌██ ██▌▐█▌",
+                "·▀▀▀▀  ▀▀▀ ▀▀ █▪. ▀  ▀▀▀▀▀  █▪▀▀▀",
+                '',
+                'NVIM v'
+                .. vim.version().major
+                .. '.'
+                .. vim.version().minor
+                .. '.'
+                ..  vim.version().patch,
+                'Nvim is open Source and freely distributable',
+                '',
+                'type  :checkhealth<Enter>     to optimize Nvim',
+                'type  :q<Enter>               to exit         ',
+                'type  :help<Enter>            for help        ',
+                '',
+                'type  :help news<Enter> to see changes in v'
+                .. vim.version().major
+                .. '.'
+                .. vim.version().minor
+            },
+            border = 'none';
+        },
+    },
+    {
         'lukas-reineke/indent-blankline.nvim',
-        config = function ()
-            require('indent_blankline').setup({
-                char = '│',
-                filetype_exclude = { 'help', 'alpha', 'dashboard', 'neo-tree', 'Trouble', 'lazy' },
-            })
-        end
-    }
-
-    -- nicer looking indent guides
-    use {
+        opts = {
+            char = '│',
+            filetype_exclude = { 'help', 'alpha', 'dashboard', 'neo-tree', 'Trouble', 'lazy' },
+        }
+    },
+    {
         'echasnovski/mini.indentscope',
-        config = function ()
-            require('mini.indentscope').setup({
-                symbol = '│',
-                options = { try_as_border = true },
-            })
-        end
-    }
-
-    -- colourcolumn that looks better
-    use {
+        opts = {
+            symbol = '│',
+            options = { try_as_border = true },
+        },
+    },
+    {
         'ecthelionvi/NeoColumn.nvim',
-        config = function()
-            require('NeoColumn').setup({
-                NeoColumn = '80',
-                always_on = true,
-            })
-        end
-    }
-
-    -- statusline
-    use {
+        opts = {
+            NeoColumn = '80',
+            always_on = true,
+        },
+    },
+    {
         'benkyd/nvim-hardline',
-        config = function ()
-            require('hardline').setup({})
-        end
-    }
-
+        opts = {},
+    },
     -- FUNCTIONAL CODING STUFF
-
-    -- AI Autocompletion
-    use {
+    {
         'zbirenbaum/copilot.lua',
-        cmd = 'Copilot',
         event = 'InsertEnter',
-        config = function()
-            require('copilot').setup({
-                suggestion = {
-                    enabled = true,
-                    auto_trigger = true,
-                    keymap = {
-                        accept = '<C-CR>',
-                    }
-                },
-            })
-        end
-    }
-
-    use {
+        opts = {
+            suggestion = {
+                enabled = true,
+                auto_trigger = true,
+                keymap = {
+                    accept = '<C-CR>',
+                }
+            },
+        }
+    },
+    {
         'VonHeikemen/lsp-zero.nvim',
         branch = 'v1.x',
-        requires = {
+        dependencies = {
             -- LSP Support
             {'neovim/nvim-lspconfig'},
             {'williamboman/mason.nvim'},
@@ -279,42 +212,30 @@ local packer = require('packer').startup(function(use)
         config = function ()
             require('lsp-general')
         end
-    }
-
-    -- for lsp signature autocompletion
-    use {
+    },
+    {
         'ray-x/lsp_signature.nvim',
-        config = function ()
-            require('lsp_signature').setup({
-                hint_prefix='🚀'
-            })
-        end
-    }
-
-    use({
-        "https://git.sr.ht/~whynothugo/lsp_lines.nvim",
+        opts = {
+            hint_prefix='🚀'
+        },
+    },
+    {
+        url = 'https://git.sr.ht/~whynothugo/lsp_lines.nvim',
         config = function()
-            require("lsp_lines").setup()
-            vim.keymap.set("", "<leader>x", function()
+            require('lsp_lines').setup()
+            vim.keymap.set('', '<leader>x', function()
                 local config = vim.diagnostic.config()
                 vim.diagnostic.config({
                     virtual_text = not config.virtual_text,
                     virtual_lines = not config.virtual_lines,
                 })
-            end, { desc = "Toggle Line Diagnostics" })
+            end, { desc = 'Toggle Line Diagnostics' })
 
             vim.diagnostic.config({
                 virtual_text = true,
                 virtual_lines = false,
             })
         end,
-    })
+    }
 
-    -- this will automatically install listed dependencies
-    -- only the first time NeoVim is opened, because that's when Packer gets installed
-    if packerBootstrap then
-        require('packer').sync()
-    end
-end)
-
-return packer
+}
diff --git a/common/.config/nvim/neovim.vim b/common/.config/nvim/neovim.vim
index 808206f..d260f01 100644
--- a/common/.config/nvim/neovim.vim
+++ b/common/.config/nvim/neovim.vim
@@ -9,5 +9,3 @@ augroup vimload
     autocmd VimEnter * lua require('fsplash').open_window()
 augroup END
 
-colorscheme kanagawa
-