Moving to individual plugin files for lazy

Signed-off-by: Taken <taken@mairimashita.org>

lua/taken/init.lua

@@ -1,5 +1,5 @@
-require("taken.lazy")
 require("taken.core")
+require("taken.lazy")
 require("taken.prefs")
 
 vim.notify = require("notify")

lua/taken/lazy.lua

@@ -0,0 +1,30 @@
+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)
+
+local lazy = require("lazy")
+
+local plugins = {
+    { import = "taken.plugins" },
+    { import = "taken.plugins.lsp" }
+}
+
+local opts = {
+    dev = {
+        path = "~/git/nvim",
+    },
+    checker = {
+        enabled = true,
+    },
+}
+
+lazy.setup(plugins, opts)

lua/taken/lazy/init.lua

@@ -1,2 +0,0 @@
-require("taken.lazy.lazy")
-require("taken.lazy.pluginloader")

lua/taken/lazy/lazy.lua

@@ -1,240 +0,0 @@
-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)
-
-local lazy = require("lazy")
-
-local plugins = {
-    {
-        "catppuccin/nvim",
-        name = "catppuccin",
-        priority = 1000,
-    },
-    { "folke/tokyonight.nvim", priority = 1000, lazy = true },
-    { "Mofiqul/dracula.nvim", priority = 1000, lazy = true },
-    { "roflolilolmao/oceanic-next.nvim", priority = 1000, lazy = true },
-    { "olimorris/onedarkpro.nvim", priority = 1000, lazy = true },
-    { "NTBBloodbath/doom-one.nvim", priority = 1000, lazy = true },
-    { "shaunsingh/moonlight.nvim", priority = 1000, lazy = true },
-    { "kvrohit/mellow.nvim", priority = 1000, lazy = true },
-    -- telescope
-    {
-        "nvim-telescope/telescope.nvim",
-        version = "0.1.1",
-        dependencies = { "nvim-lua/plenary.nvim" },
-    },
-    {
-        "nvim-telescope/telescope-file-browser.nvim",
-        dependencies = { "nvim-telescope/telescope.nvim", "nvim-lua/plenary.nvim" },
-    },
-    {
-        "nvim-telescope/telescope-project.nvim",
-        dependencies = { "nvim-telescope/telescope.nvim", "nvim-lua/plenary.nvim" },
-    },
-    {
-        "nvim-telescope/telescope-fzf-native.nvim",
-        build = "make",
-        dependencies = { "nvim-telescope/telescope.nvim" },
-    },
-    {
-        "VonHeikemen/fine-cmdline.nvim",
-        dependencies = {
-            { "MunifTanjim/nui.nvim" },
-        },
-        cmd = "FineCmdline",
-        config = function()
-            require("taken.plugins.lazy.cmdline")
-        end,
-    },
-    -- development
-
-    {
-        "ray-x/go.nvim",
-        dependencies = {
-            "ray-x/guihua.lua",
-            "neovim/nvim-lspconfig",
-            "nvim-treesitter/nvim-treesitter",
-        },
-        config = function()
-            require("taken.plugins.lazy.go")
-        end,
-        ft = { "go", "gomod" },
-        build = function()
-            require("go.install").update_all_sync()
-        end,
-    },
-    {
-        "github/copilot.vim",
-        event = "VimEnter",
-    },
-    {
-        "folke/todo-comments.nvim",
-        dependencies = { "nvim-lua/plenary.nvim" },
-        config = true,
-    },
-    {
-        "nvim-tree/nvim-tree.lua",
-        dependencies = { "nvim-tree/nvim-web-devicons" },
-    },
-    { "nvim-treesitter/nvim-treesitter", build = ":TSUpdate" },
-    --lsp
-    {
-        "williamboman/mason.nvim",
-        build = function()
-            pcall(vim.cmd, "MasonUpdate")
-        end,
-    },
-    "neovim/nvim-lspconfig",
-    {
-        "williamboman/mason-lspconfig.nvim",
-        dependencies = { "williamboman/mason.nvim", "neovim/nvim-lspconfig" },
-    },
-    -- formatters and linters
-    "jose-elias-alvarez/null-ls.nvim",
-    {
-        "jayp0521/mason-null-ls.nvim",
-        dependencies = { "williamboman/mason.nvim", "jose-elias-alvarez/null-ls.nvim" },
-    },
-    -- completion
-    "hrsh7th/nvim-cmp",
-    "hrsh7th/cmp-nvim-lsp",
-    "hrsh7th/cmp-buffer",
-    "hrsh7th/cmp-path",
-    -- snippets
-    "L3MON4D3/LuaSnip",
-    "saadparwaiz1/cmp_luasnip",
-    "rafamadriz/friendly-snippets",
-    "onsails/lspkind.nvim",
-    {
-        "folke/trouble.nvim",
-        dependencies = { "nvim-tree/nvim-web-devicons" },
-    },
-    {
-        "iamcco/markdown-preview.nvim",
-        build = function()
-            vim.fn["mkdp#util#install"]()
-        end,
-        config = function()
-            vim.cmd([[
-            let g:mkdp_auto_close = 0
-            let g:mkdp_theme = 'dark'
-            ]])
-        end,
-        ft = "markdown",
-    },
-    "numToStr/Comment.nvim",
-    {
-        "NeogitOrg/neogit",
-        dependencies = "nvim-lua/plenary.nvim",
-        config = function()
-            require("taken.plugins.lazy.neogit")
-        end,
-        cmd = "Neogit",
-    },
-    {
-        "sindrets/diffview.nvim",
-        cmd = "DiffviewOpen",
-    },
-    "windwp/nvim-autopairs",
-    { "windwp/nvim-ts-autotag", dependencies = "nvim-treesitter" },
-    {
-        "lewis6991/gitsigns.nvim",
-        config = function()
-            require("gitsigns").setup({})
-        end,
-    },
-    {
-        "f-person/git-blame.nvim",
-        config = function()
-            vim.cmd([[
-            let g:gitblame_enabled = 1
-            ]])
-        end,
-    },
-    -- useful plugins
-    "szw/vim-maximizer",
-    {
-        "glepnir/dashboard-nvim",
-        event = "VimEnter",
-        dependencies = { "nvim-tree/nvim-web-devicons" },
-    },
-    {
-        "nvim-neorg/neorg",
-        build = ":Neorg sync-parsers",
-        dependencies = "nvim-lua/plenary.nvim",
-        config = function()
-            require("taken.plugins.lazy.neorg")
-        end,
-        cmd = "Neorg",
-        ft = "norg",
-    },
-    {
-        "NvChad/nvim-colorizer.lua",
-        config = function()
-            require("colorizer").setup({})
-        end,
-    },
-    "folke/which-key.nvim",
-    {
-        "nvim-lualine/lualine.nvim",
-        dependencies = { "nvim-tree/nvim-web-devicons" },
-    },
-    {
-        "akinsho/toggleterm.nvim",
-        version = "*",
-        config = function()
-            require("taken.plugins.lazy.toggleterm")
-        end,
-        cmd = "ToggleTerm",
-    },
-    "rcarriga/nvim-notify",
-    {
-        "akinsho/bufferline.nvim",
-        version = "*",
-        dependencies = "nvim-tree/nvim-web-devicons",
-    },
-    "TakenMC/presence.nvim",
-    {
-        "kylechui/nvim-surround",
-        version = "*",
-        config = function()
-            require("nvim-surround").setup({})
-        end,
-    },
-    {
-        "ObserverOfTime/nvimcord",
-        cmd = "NvimcordUpdate",
-        enabled = false,
-        config = function()
-            require("taken.plugins.lazy.nvimcord")
-        end,
-    },
-    "xiyaowong/transparent.nvim",
-    {
-        "jokajak/keyseer.nvim",
-        cmd = "KeySeer",
-        config = function()
-            require("taken.plugins.lazy.keyseer")
-        end,
-    },
-}
-
-local opts = {
-    dev = {
-        path = "~/git/nvim",
-    },
-    checker = {
-        enabled = true,
-    },
-}
-
-lazy.setup(plugins, opts)

lua/taken/lazy/pluginloader.lua

@@ -1,17 +0,0 @@
-local configDir = vim.fn.stdpath("config")
-local configFiles = vim.fn.readdir(configDir .. "/lua/taken/plugins")
-local lspFiles = vim.fn.readdir(configDir .. "/lua/taken/plugins/lsp")
-
-for _, file in pairs(configFiles) do
-    if file:match("%.lua$") then
-        local name = file:gsub("%.lua$", "")
-        require("taken.plugins." .. name)
-    end
-end
-
-for _, file in pairs(lspFiles) do
-    if file:match("%.lua$") then
-        local name = file:gsub("%.lua$", "")
-        require("taken.plugins.lsp." .. name)
-    end
-end

lua/taken/plugins/autopairs.lua

@@ -1,7 +1,7 @@
-local autopairs_setup, autopairs = pcall(require, "nvim-autopairs")
-if not autopairs_setup then
-    return
-end
+return {
+    "windwp/nvim-autopairs",
+    config = function()
+        local autopairs = require("nvim-autopairs")
 
         autopairs.setup({
             check_ts = true,
@@ -11,3 +11,5 @@ autopairs.setup({
                 java = false,
             },
         })
+    end,
+}

lua/taken/plugins/bufferline.lua

@@ -1,7 +1,9 @@
-local setup, bufferline = pcall(require, "bufferline")
-if not setup then
-    return
-end
+return {
+    "akinsho/bufferline.nvim",
+    version = "*",
+    dependencies = "nvim-tree/nvim-web-devicons",
+    config = function()
+        local bufferline = require("bufferline")
 
         bufferline.setup({
             options = {
@@ -28,7 +30,8 @@ bufferline.setup({
                 },
                 color_icons = true,
                 get_element_icon = function(element)
-            local icon, hl = require("nvim-web-devicons").get_icon_by_filetype(element.filetype, { default = false })
+                    local icon, hl =
+                        require("nvim-web-devicons").get_icon_by_filetype(element.filetype, { default = false })
                     return icon, hl
                 end,
                 always_show_bufferline = true,
@@ -67,3 +70,5 @@ vim.g.transparent_groups = vim.list_extend(
                 return v.hl_group
             end, vim.tbl_values(require("bufferline.config").highlights))
         )
+    end,
+}

lua/taken/plugins/catppuccin.lua

@@ -1,11 +0,0 @@
-local status, catppuccin = pcall(require, "catppuccin")
-if not status then
-    return
-end
-
-catppuccin.setup({
-    integrations = {
-        notify = true,
-        mason = true,
-    },
-})

lua/taken/plugins/cmdline.lua

@@ -0,0 +1,31 @@
+return {
+    "VonHeikemen/fine-cmdline.nvim",
+    dependencies = "MunifTanjim/nui.nvim",
+    cmd = "FineCmdline",
+    config = function()
+        local cmdline = require("fine-cmdline")
+
+        cmdline.setup({
+            cmdline = {
+                enable_keymaps = true,
+                smart_history = true,
+                prompt = "> ",
+            },
+            popup = {
+                position = {
+                    row = "10%",
+                    col = "50%",
+                },
+                size = {
+                    width = "80%",
+                },
+                border = {
+                    style = "rounded",
+                },
+                win_options = {
+                    winhighlight = "Normal:Normal,FloatBorder:FloatBorder",
+                },
+            },
+        })
+    end,
+}

lua/taken/plugins/colors.lua

@@ -0,0 +1,23 @@
+return {
+    {
+        "catppuccin/nvim",
+        name = "catppuccin",
+        priority = 1000,
+        config = function()
+            local catppuccin = require("catppuccin")
+            catppuccin.setup({
+                integrations = {
+                    notify = true,
+                    mason = true,
+                },
+            })
+        end,
+    },
+    { "folke/tokyonight.nvim", priority = 1000, lazy = true },
+    { "Mofiqul/dracula.nvim", priority = 1000, lazy = true },
+    { "roflolilolmao/oceanic-next.nvim", priority = 1000, lazy = true },
+    { "olimorris/onedarkpro.nvim", priority = 1000, lazy = true },
+    { "NTBBloodbath/doom-one.nvim", priority = 1000, lazy = true },
+    { "shaunsingh/moonlight.nvim", priority = 1000, lazy = true },
+    { "kvrohit/mellow.nvim", priority = 1000, lazy = true },
+}

lua/taken/plugins/comment.lua

@@ -1,8 +1,7 @@
-local setup, comment = pcall(require, "Comment")
-if not setup then
-    return
-end
-
+return {
+    "numToStr/Comment.nvim",
+    config = function()
+        local comment = require("Comment")
         comment.setup({
             padding = true,
             sticky = true,
@@ -27,3 +26,5 @@ comment.setup({
             pre_hook = nil,
             post_hook = nil,
         })
+    end,
+}

lua/taken/plugins/dashboard.lua

@@ -1,7 +1,9 @@
-local staus, db = pcall(require, "dashboard")
-if not staus then
-    return
-end
+return {
+    "glepnir/dashboard-nvim",
+    event = "VimEnter",
+    dependencies = { "nvim-tree/nvim-web-devicons" },
+    config = function()
+        local db = require("dashboard")
 
         local stats = require("lazy").stats()
         local version = vim.version().major .. "." .. vim.version().minor .. "." .. vim.version().patch
@@ -76,7 +78,18 @@ db.setup({
                     },
                 },
                 footer = {
-            " " .. version .. " " .. plugins_count .. " plugins in " .. ms .. "ms 󰃭 " .. date .. "  " .. time,
+                    " "
+                        .. version
+                        .. " "
+                        .. plugins_count
+                        .. " plugins in "
+                        .. ms
+                        .. "ms 󰃭 "
+                        .. date
+                        .. "  "
+                        .. time,
                 },
             },
         })
+    end,
+}

lua/taken/plugins/go.lua

@@ -0,0 +1,18 @@
+return {
+    "ray-x/go.nvim",
+    dependencies = {
+        "ray-x/guihua.lua",
+        "neovim/nvim-lspconfig",
+        "nvim-treesitter/nvim-treesitter",
+    },
+    ft = { "go", "gomod" },
+    build = function()
+        require("go.install").update_all_sync()
+    end,
+    config = function()
+        local lspconfig = require("lspconfig")
+        local cfg = require("go.lsp").config()
+
+        lspconfig["gopls"].setup(cfg)
+    end,
+}

lua/taken/plugins/keyseer.lua

@@ -0,0 +1,55 @@
+return {
+    "jokajak/keyseer.nvim",
+    cmd = "KeySeer",
+    config = function()
+        local keyseer = require("keyseer")
+
+        keyseer.setup({
+            debug = false,
+            initial_mode = "n",
+            include_builtin_keymaps = true,
+            include_global_keymaps = true,
+            include_buffer_keymaps = true,
+            include_modified_keypresses = false,
+            ignore_whichkey_conflicts = true,
+
+            ui = {
+                border = "double",
+                margin = { 1, 0, 1, 0 },
+                winblend = 0,
+                size = {
+                    width = 65,
+                    height = 10,
+                },
+                icons = {
+                    keyseer = "",
+                },
+                show_header = true,
+            },
+            keyboard = {
+                layout = "qwertz",
+                keycap_padding = { 0, 1, 0, 1 },
+                highlight_padding = { 0, 0, 0, 0 },
+                key_labels = {
+                    ["Up"] = "↑",
+                    ["Down"] = "↓",
+                    ["Left"] = "←",
+                    ["Right"] = "→",
+                    ["<F1>"] = "F1",
+                    ["<F2>"] = "F2",
+                    ["<F3>"] = "F3",
+                    ["<F4>"] = "F4",
+                    ["<F5>"] = "F5",
+                    ["<F6>"] = "F6",
+                    ["<F7>"] = "F7",
+                    ["<F8>"] = "F8",
+                    ["<F9>"] = "F9",
+                    ["<F10>"] = "F10",
+                    -- ["<space>"] = "SPC",
+                    -- ["<cr>"] = "RET",
+                    -- ["<tab>"] = "TAB",
+                },
+            },
+        })
+    end,
+}

lua/taken/plugins/lazy/cmdline.lua

@@ -1,27 +0,0 @@
-local status, cmdline = pcall(require, "fine-cmdline")
-if not status then
-    return
-end
-
-cmdline.setup({
-    cmdline = {
-        enable_keymaps = true,
-        smart_history = true,
-        prompt = "> ",
-    },
-    popup = {
-        position = {
-            row = "10%",
-            col = "50%",
-        },
-        size = {
-            width = "80%",
-        },
-        border = {
-            style = "rounded",
-        },
-        win_options = {
-            winhighlight = "Normal:Normal,FloatBorder:FloatBorder",
-        },
-    },
-})

lua/taken/plugins/lazy/go.lua

@@ -1,9 +0,0 @@
-local go_status, go = pcall(require, "go")
-if not go_status then
-    return
-end
-
-local lspconfig = require("lspconfig")
-local cfg = require("go.lsp").config()
-
-lspconfig["gopls"].setup(cfg)

lua/taken/plugins/lazy/keyseer.lua

@@ -1,52 +0,0 @@
-local status, keyseer = pcall(require, "keyseer")
-if not status then
-    return
-end
-
-keyseer.setup({
-    debug = false,
-    initial_mode = "n",
-    include_builtin_keymaps = true,
-    include_global_keymaps = true,
-    include_buffer_keymaps = true,
-    include_modified_keypresses = false,
-    ignore_whichkey_conflicts = true,
-
-    ui = {
-        border = "double",
-        margin = { 1, 0, 1, 0 },
-        winblend = 0,
-        size = {
-            width = 65,
-            height = 10,
-        },
-        icons = {
-            keyseer = "",
-        },
-        show_header = true,
-    },
-    keyboard = {
-        layout = "qwertz",
-        keycap_padding = { 0, 1, 0, 1 },
-        highlight_padding = { 0, 0, 0, 0 },
-        key_labels = {
-            ["Up"] = "↑",
-            ["Down"] = "↓",
-            ["Left"] = "←",
-            ["Right"] = "→",
-            ["<F1>"] = "F1",
-            ["<F2>"] = "F2",
-            ["<F3>"] = "F3",
-            ["<F4>"] = "F4",
-            ["<F5>"] = "F5",
-            ["<F6>"] = "F6",
-            ["<F7>"] = "F7",
-            ["<F8>"] = "F8",
-            ["<F9>"] = "F9",
-            ["<F10>"] = "F10",
-            -- ["<space>"] = "SPC",
-            -- ["<cr>"] = "RET",
-            -- ["<tab>"] = "TAB",
-        },
-    },
-})

lua/taken/plugins/lazy/neogit.lua

@@ -1,58 +0,0 @@
-local setup, neogit = pcall(require, "neogit")
-if not setup then
-    return
-end
-
-neogit.setup({
-    auto_refresh = true,
-    remember_settings = true,
-    disable_insert_on_commit = false,
-    commit_popup = {
-        kind = "split",
-    },
-    preview_buffer = {
-        kind = "split",
-    },
-    popup = {
-        kind = "split",
-    },
-    signs = {
-        section = { "", "" },
-        item = { "", "" },
-        hunk = { "", "" },
-    },
-    integrations = {
-        diffview = true,
-    },
-    sections = {
-        untracked = {
-            folded = false,
-        },
-        unstaged = {
-            folded = false,
-        },
-        staged = {
-            folded = false,
-        },
-        stashes = {
-            folded = true,
-        },
-        unpulled = {
-            folded = true,
-            hidden = false,
-        },
-        unmerged = {
-            folded = false,
-            hidden = false,
-        },
-        recent = {
-            folded = true,
-        },
-    },
-    mappings = {
-        status = {
-            ["p"] = "PushPopup",
-            ["P"] = "PullPopup",
-        },
-    },
-})

lua/taken/plugins/lazy/neorg.lua

@@ -1,18 +0,0 @@
-local status, neorg = pcall(require, "neorg")
-if not status then
-    return
-end
-
-neorg.setup({
-    load = {
-        ["core.defaults"] = {},
-        ["core.concealer"] = {},
-        ["core.dirman"] = {
-            config = {
-                workspaces = {
-                    main = "~/neorg/main",
-                },
-            },
-        },
-    },
-})

lua/taken/plugins/lazy/nvimcord.lua

@@ -1,17 +0,0 @@
-local setup, nvimcord = pcall(require, "nvimcord")
-if not setup then
-    return
-end
-
-nvimcord.setup({
-    autostart = false,
-    client_id = "954365489214291979",
-    large_file_icon = false,
-    log_level = vim.log.levels.DEBUG,
-    workspace_name = function()
-        return vim.cmd([[pwd]])
-    end,
-    workspace_url = function()
-        return ""
-    end,
-})

lua/taken/plugins/lazy/toggleterm.lua

@@ -1,9 +0,0 @@
-local status, toggleterm = pcall(require, "toggleterm")
-if not status then
-    return
-end
-
-toggleterm.setup({
-    shell = "pwsh.exe -nologo",
-    start_in_insert = true,
-})

lua/taken/plugins/lsp/lspconfig.lua

@@ -1,12 +1,9 @@
-local lspconfig_status, lspconfig = pcall(require, "lspconfig")
-if not lspconfig_status then
-    return
-end
-
-local cmp_nvim_lsp_status, cmp_nvim_lsp = pcall(require, "cmp_nvim_lsp")
-if not cmp_nvim_lsp_status then
-    return
-end
+return {
+    "neovim/nvim-lspconfig",
+    dependencies = "hrsh7th/cmp-nvim-lsp",
+    config = function()
+        local lspconfig = require("lspconfig")
+        local cmp_nvim_lsp = require("cmp_nvim_lsp")
 
         local on_attach = function(client, bufnr)
             local opts = { noremap = true, silent = true, buffer = bufnr }
@@ -87,3 +84,5 @@ lspconfig["powershell_es"].setup({
             on_attach = on_attach,
             bundle_path = vim.fn.stdpath("data") .. "/mason/packages/powershell-editor-services",
         })
+    end,
+}

lua/taken/plugins/lsp/mason.lua

@@ -1,17 +1,16 @@
-local mason_status, mason = pcall(require, "mason")
-if not mason_status then
-    return
-end
-
-local mason_lspconfig_status, mason_lspconfig = pcall(require, "mason-lspconfig")
-if not mason_lspconfig_status then
-    return
-end
-
-local mason_null_ls_status, mason_null_ls = pcall(require, "mason-null-ls")
-if not mason_null_ls_status then
-    return
-end
+return {
+    "williamboman/mason.nvim",
+    build = function()
+        pcall(vim.cmd, "MasonUpdate")
+    end,
+    dependencies = {
+        "williamboman/mason-lspconfig.nvim",
+        "jayp0521/mason-null-ls.nvim",
+    },
+    config = function()
+        local mason = require("mason")
+        local mason_lspconfig = require("mason-lspconfig")
+        local mason_null_ls = require("mason-null-ls")
 
         mason.setup()
 
@@ -35,3 +34,5 @@ mason_null_ls.setup({
             },
             automatic_installation = true,
         })
+    end,
+}

lua/taken/plugins/lsp/null-ls.lua

@@ -1,7 +1,7 @@
-local setup, null_ls = pcall(require, "null-ls")
-if not setup then
-    return
-end
+return {
+    "jose-elias-alvarez/null-ls.nvim",
+    config = function()
+        local null_ls = require("null-ls")
 
         local formatting = null_ls.builtins.formatting
         local diagnostics = null_ls.builtins.diagnostics
@@ -12,3 +12,5 @@ null_ls.setup({
                 formatting.clang_format,
             },
         })
+    end,
+}

lua/taken/plugins/lualine.lua

@@ -1,7 +1,8 @@
-local setup, lualine = pcall(require, "lualine")
-if not setup then
-    return
-end
+return {
+    "nvim-lualine/lualine.nvim",
+    dependencies = { "nvim-tree/nvim-web-devicons" },
+    config = function()
+        local lualine = require("lualine")
 
         local colors = {
             bg = "#1e1e2e",
@@ -209,3 +210,5 @@ ins_right({
 
         -- Now don't forget to initialize lualine
         lualine.setup(config)
+    end,
+}

lua/taken/plugins/neogit.lua

@@ -0,0 +1,62 @@
+return {
+    "NeogitOrg/neogit",
+    dependencies = "nvim-lua/plenary.nvim",
+    cmd = "Neogit",
+    config = function()
+        local neogit = require("neogit")
+
+        neogit.setup({
+            auto_refresh = true,
+            remember_settings = true,
+            disable_insert_on_commit = false,
+            commit_popup = {
+                kind = "split",
+            },
+            preview_buffer = {
+                kind = "split",
+            },
+            popup = {
+                kind = "split",
+            },
+            signs = {
+                section = { "", "" },
+                item = { "", "" },
+                hunk = { "", "" },
+            },
+            integrations = {
+                diffview = true,
+            },
+            sections = {
+                untracked = {
+                    folded = false,
+                },
+                unstaged = {
+                    folded = false,
+                },
+                staged = {
+                    folded = false,
+                },
+                stashes = {
+                    folded = true,
+                },
+                unpulled = {
+                    folded = true,
+                    hidden = false,
+                },
+                unmerged = {
+                    folded = false,
+                    hidden = false,
+                },
+                recent = {
+                    folded = true,
+                },
+            },
+            mappings = {
+                status = {
+                    ["p"] = "PushPopup",
+                    ["P"] = "PullPopup",
+                },
+            },
+        })
+    end,
+}

lua/taken/plugins/neorg.lua

@@ -0,0 +1,24 @@
+return {
+    "nvim-neorg/neorg",
+    build = ":Neorg sync-parsers",
+    dependencies = "nvim-lua/plenary.nvim",
+    cmd = "Neorg",
+    ft = "norg",
+    config = function()
+        local neorg = require("neorg")
+
+        neorg.setup({
+            load = {
+                ["core.defaults"] = {},
+                ["core.concealer"] = {},
+                ["core.dirman"] = {
+                    config = {
+                        workspaces = {
+                            main = "~/neorg/main",
+                        },
+                    },
+                },
+            },
+        })
+    end,
+}

lua/taken/plugins/nvim-cmp.lua

@@ -1,17 +1,18 @@
-local cmp_status, cmp = pcall(require, "cmp")
-if not cmp_status then
-    return
-end
-
-local luasnip_status, luasnip = pcall(require, "luasnip")
-if not luasnip_status then
-    return
-end
-
-local lspkind_status, lspkind = pcall(require, "lspkind")
-if not lspkind_status then
-    return
-end
+return {
+    "hrsh7th/nvim-cmp",
+    dependencies = {
+        "hrsh7th/cmp-nvim-lsp",
+        "hrsh7th/cmp-buffer",
+        "hrsh7th/cmp-path",
+        "L3MON4D3/LuaSnip",
+        "saadparwaiz1/cmp_luasnip",
+        "rafamadriz/friendly-snippets",
+        "onsails/lspkind.nvim",
+    },
+    config = function()
+        local cmp = require("cmp")
+        local luasnip = require("luasnip")
+        local lspkind = require("lspkind")
 
         require("luasnip/loaders/from_vscode").lazy_load()
 
@@ -45,3 +46,5 @@ cmp.setup({
                 }),
             },
         })
+    end,
+}

lua/taken/plugins/nvimcord.lua

@@ -0,0 +1,21 @@
+return {
+    "ObserverOfTime/nvimcord",
+    cmd = "NvimcordUpdate",
+    enabled = false,
+    config = function()
+        local nvimcord = require("nvimcord")
+
+        nvimcord.setup({
+            autostart = false,
+            client_id = "954365489214291979",
+            large_file_icon = false,
+            log_level = vim.log.levels.DEBUG,
+            workspace_name = function()
+                return vim.cmd([[pwd]])
+            end,
+            workspace_url = function()
+                return ""
+            end,
+        })
+    end,
+}

lua/taken/plugins/nvimtree.lua

@@ -1,7 +1,8 @@
-local setup, nvimtree = pcall(require, "nvim-tree")
-if not setup then
-    return
-end
+return {
+    "nvim-tree/nvim-tree.lua",
+    dependencies = { "nvim-tree/nvim-web-devicons" },
+    config = function()
+        local nvimtree = require("nvim-tree")
 
         nvimtree.setup({
             sync_root_with_cwd = true,
@@ -22,3 +23,5 @@ nvimtree.setup({
                 },
             },
         })
+    end,
+}

lua/taken/plugins/otherplugins.lua

@@ -0,0 +1,59 @@
+return {
+    {
+        "github/copilot.vim",
+        event = "VimEnter",
+    },
+    {
+        "folke/todo-comments.nvim",
+        dependencies = { "nvim-lua/plenary.nvim" },
+        config = true,
+    },
+    {
+        "folke/trouble.nvim",
+        dependencies = { "nvim-tree/nvim-web-devicons" },
+    },
+    {
+        "sindrets/diffview.nvim",
+        cmd = "DiffviewOpen",
+    },
+    { "windwp/nvim-ts-autotag", dependencies = "nvim-treesitter" },
+    {
+        "lewis6991/gitsigns.nvim",
+        config = true,
+    },
+    {
+        "szw/vim-maximizer",
+        cmd = "MaximizerToggle",
+    },
+    {
+        "NvChad/nvim-colorizer.lua",
+        config = true,
+    },
+    "rcarriga/nvim-notify",
+    {
+        "kylechui/nvim-surround",
+        version = "*",
+        config = true,
+    },
+    {
+        "iamcco/markdown-preview.nvim",
+        build = function()
+            vim.fn["mkdp#util#install"]()
+        end,
+        config = function()
+            vim.cmd([[
+            let g:mkdp_auto_close = 0
+            let g:mkdp_theme = 'dark'
+            ]])
+        end,
+        ft = "markdown",
+    },
+    {
+        "f-person/git-blame.nvim",
+        config = function()
+            vim.cmd([[
+            let g:gitblame_enabled = 1
+            ]])
+        end,
+    },
+}

lua/taken/plugins/presence.lua

@@ -1,7 +1,7 @@
-local setup, presence = pcall(require, "presence")
-if not setup then
-    return
-end
+return {
+    "TakenMC/presence.nvim",
+    config = function()
+        local presence = require("presence")
 
         presence.setup({
             auto_update = true,
@@ -27,3 +27,5 @@ presence.setup({
             workspace_text = "Working on %s",
             line_number_text = "Line %s out of %s",
         })
+    end,
+}

lua/taken/plugins/telescope.lua

@@ -1,7 +1,14 @@
-local telescope_setup, telescope = pcall(require, "telescope")
-if not telescope_setup then
-    return
-end
+return {
+    "nvim-telescope/telescope.nvim",
+    version = "0.1.1",
+    dependencies = {
+        "nvim-lua/plenary.nvim",
+        "nvim-telescope/telescope-file-browser.nvim",
+        "nvim-telescope/telescope-project.nvim",
+        { "nvim-telescope/telescope-fzf-native.nvim", build = "make" },
+    },
+    config = function()
+        local telescope = require("telescope")
 
         telescope.load_extension("project")
 
@@ -30,3 +37,5 @@ telescope.setup({
 
         telescope.load_extension("file_browser")
         telescope.load_extension("fzf")
+    end,
+}

lua/taken/plugins/toggleterm.lua

@@ -0,0 +1,12 @@
+return {
+    "akinsho/toggleterm.nvim",
+    version = "*",
+    cmd = "ToggleTerm",
+    config = function()
+        local toggleterm = require("toggleterm")
+        toggleterm.setup({
+            shell = "pwsh.exe -nologo",
+            start_in_insert = true,
+        })
+    end,
+}

lua/taken/plugins/transparent.lua

@@ -1,7 +1,7 @@
-local status, transparent = pcall(require, "transparent")
-if not status then
-    return
-end
+return {
+    "xiyaowong/transparent.nvim",
+    config = function()
+        local transparent = require("transparent")
 
         transparent.setup({
             groups = {
@@ -45,3 +45,5 @@ transparent.setup({
             },
             exclude_groups = {},
         })
+    end,
+}

lua/taken/plugins/treesitter.lua

@@ -1,7 +1,8 @@
-local status, treesitter = pcall(require, "nvim-treesitter.configs")
-if not status then
-    return
-end
+return {
+    "nvim-treesitter/nvim-treesitter",
+    build = ":TSUpdate",
+    config = function()
+        local treesitter = require("nvim-treesitter.configs")
 
         treesitter.setup({
             ensure_installed = { "lua", "vim", "vimdoc", "javascript", "java", "json" },
@@ -13,3 +14,5 @@ treesitter.setup({
                 additional_vim_regex_highlighting = false,
             },
         })
+    end,
+}

lua/taken/plugins/whichkey.lua

@@ -1,7 +1,7 @@
-local status, whichkey = pcall(require, "which-key")
-if not status then
-    return
-end
+return {
+    "folke/which-key.nvim",
+    config = function()
+        local whichkey = require("which-key")
 
         whichkey.setup({
             key_labels = {
@@ -46,3 +46,5 @@ whichkey.register({
                 },
             },
         })
+    end,
+}