diff --git a/lazy-lock.json b/lazy-lock.json new file mode 100644 index 0000000..838c936 --- /dev/null +++ b/lazy-lock.json @@ -0,0 +1,57 @@ +{ + "Comment.nvim": { "branch": "master", "commit": "0236521ea582747b58869cb72f70ccfa967d2e89" }, + "LuaSnip": { "branch": "master", "commit": "c4d6298347f7707e9757351b2ee03d0c00da5c20" }, + "bufferline.nvim": { "branch": "main", "commit": "d24378edc14a675c820a303b4512af3bbc5761e9" }, + "catppuccin": { "branch": "main", "commit": "b573866ef64122119668f375ebb794bcb3b518e2" }, + "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, + "cmp-nvim-lsp": { "branch": "main", "commit": "44b16d11215dce86f253ce0c30949813c0a90765" }, + "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, + "cmp_luasnip": { "branch": "master", "commit": "18095520391186d634a0045dacaa346291096566" }, + "copilot.vim": { "branch": "release", "commit": "172955782814a49fbebca2d1a2ccce2059103329" }, + "dashboard-nvim": { "branch": "master", "commit": "c17d3210b3dec8798b4fc82a11c542989251f85d" }, + "diffview.nvim": { "branch": "main", "commit": "7e5a85c186027cab1e825d018f07c350177077fc" }, + "doom-one.nvim": { "branch": "main", "commit": "a43528cbd7908ccec7af4587ec8e18be149095bd" }, + "dracula.nvim": { "branch": "main", "commit": "9fe831e685a76e1a1898a694623b33247c4d036c" }, + "fine-cmdline.nvim": { "branch": "main", "commit": "ead2b85e455eacde10469a8fcf1a717822d2bb9a" }, + "friendly-snippets": { "branch": "main", "commit": "377d45475b49e37460a902d6d569d2093d4037d0" }, + "git-blame.nvim": { "branch": "master", "commit": "41e22dc843c6821a410db57be0b7025154f9d8ec" }, + "gitsigns.nvim": { "branch": "main", "commit": "749267aaa863c30d721c9913699c5d94e0c07dd3" }, + "keyseer.nvim": { "branch": "main", "commit": "ebcd7f7494c8b5debb4bf8103710865d37508509" }, + "lazy.nvim": { "branch": "main", "commit": "dac844ed617dda4f9ec85eb88e9629ad2add5e05" }, + "lspkind.nvim": { "branch": "master", "commit": "57610d5ab560c073c465d6faf0c19f200cb67e6e" }, + "lualine.nvim": { "branch": "master", "commit": "45e27ca739c7be6c49e5496d14fcf45a303c3a63" }, + "markdown-preview.nvim": { "branch": "master", "commit": "02cc3874738bc0f86e4b91f09b8a0ac88aef8e96" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "2997f467881ac4faa6f8c5e7065e3a672297c8ad" }, + "mason-null-ls.nvim": { "branch": "main", "commit": "ae0c5fa57468ac65617f1bf821ba0c3a1e251f0c" }, + "mason.nvim": { "branch": "main", "commit": "a51c2d063c5377ee9e58c5f9cda7c7436787be72" }, + "mellow.nvim": { "branch": "main", "commit": "6e5845571d4543b282cf915f2410c5b77064c014" }, + "moonlight.nvim": { "branch": "pure-lua", "commit": "e24e4218ec680b6396532808abf57ca0ada82e66" }, + "neogit": { "branch": "master", "commit": "a5fb1b47975c43c1400e338f57badd94a6e09450" }, + "neorg": { "branch": "main", "commit": "f296a22864bbac0d94ad00fa18cc8231dbeaa1e3" }, + "nui.nvim": { "branch": "main", "commit": "9e3916e784660f55f47daa6f26053ad044db5d6a" }, + "null-ls.nvim": { "branch": "main", "commit": "0010ea927ab7c09ef0ce9bf28c2b573fc302f5a7" }, + "nvim-autopairs": { "branch": "master", "commit": "ae5b41ce880a6d850055e262d6dfebd362bb276e" }, + "nvim-cmp": { "branch": "main", "commit": "51f1e11a89ec701221877532ee1a23557d291dd5" }, + "nvim-colorizer.lua": { "branch": "master", "commit": "dde3084106a70b9a79d48f426f6d6fec6fd203f7" }, + "nvim-lspconfig": { "branch": "master", "commit": "27c59475ae610cc8ccbb81d9d7859e5ffbd4ec8a" }, + "nvim-notify": { "branch": "master", "commit": "ea9c8ce7a37f2238f934e087c255758659948e0f" }, + "nvim-surround": { "branch": "main", "commit": "0d6882635817a2677749a330127d12ac30a4f3c8" }, + "nvim-tree.lua": { "branch": "master", "commit": "920868dba13466586897a8f40220eca6b2caac41" }, + "nvim-treesitter": { "branch": "master", "commit": "2ee71c1a2fa74c10692be10ae420ff0c3a02eb3c" }, + "nvim-ts-autotag": { "branch": "main", "commit": "6be1192965df35f94b8ea6d323354f7dc7a557e4" }, + "nvim-web-devicons": { "branch": "master", "commit": "cfc8824cc1db316a276b36517f093baccb8e799a" }, + "nvimcord": { "branch": "master", "commit": "3a087d3e568136f168047c242fd6d568e5e6ad96" }, + "oceanic-next.nvim": { "branch": "main", "commit": "374cb9cd0c72f65f9c1ace5273d16c16fdff3e5c" }, + "onedarkpro.nvim": { "branch": "main", "commit": "c81dff789f7623c431d1f43cf334237e52bbfd61" }, + "plenary.nvim": { "branch": "master", "commit": "267282a9ce242bbb0c5dc31445b6d353bed978bb" }, + "presence.nvim": { "branch": "main", "commit": "aafdf49ea6c198a960a71b9f989d849543c91eb5" }, + "telescope-file-browser.nvim": { "branch": "master", "commit": "ad7b637c72549713b9aaed7c4f9c79c62bcbdff0" }, + "telescope-fzf-native.nvim": { "branch": "main", "commit": "9bc8237565ded606e6c366a71c64c0af25cd7a50" }, + "telescope-project.nvim": { "branch": "master", "commit": "7c64b181dd4e72deddcf6f319e3bf1e95b2a2f30" }, + "telescope.nvim": { "branch": "master", "commit": "c1a2af0af69e80e14e6b226d3957a064cd080805" }, + "toggleterm.nvim": { "branch": "main", "commit": "b90a1381e9b5b8596f49070ee86c71db267ac868" }, + "tokyonight.nvim": { "branch": "main", "commit": "1ee11019f8a81dac989ae1db1a013e3d582e2033" }, + "transparent.nvim": { "branch": "main", "commit": "4cf97fc0b1c4a88cf246b2f6facb735a536a558e" }, + "trouble.nvim": { "branch": "main", "commit": "40aad004f53ae1d1ba91bcc5c29d59f07c5f01d3" }, + "which-key.nvim": { "branch": "main", "commit": "7ccf476ebe0445a741b64e36c78a682c1c6118b7" } +} \ No newline at end of file diff --git a/lua/taken/init.lua b/lua/taken/init.lua index 7fa088a..bf3fe5f 100644 --- a/lua/taken/init.lua +++ b/lua/taken/init.lua @@ -1,4 +1,5 @@ +require("taken.lazy") require("taken.core") -require("taken.plugin") +require("taken.pluginloader") -vim.notify = require("notify") +-- vim.notify = require("notify") diff --git a/lua/taken/lazy.lua b/lua/taken/lazy.lua new file mode 100644 index 0000000..2c2adf0 --- /dev/null +++ b/lua/taken/lazy.lua @@ -0,0 +1,144 @@ +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({ + { + "catppuccin/nvim", + name = "catppuccin", + priority = 1000, + }, + { "folke/tokyonight.nvim", priority = 1000 }, + { "Mofiqul/dracula.nvim", priority = 1000 }, + { "roflolilolmao/oceanic-next.nvim", priority = 1000 }, + { "olimorris/onedarkpro.nvim", priority = 1000 }, + { "NTBBloodbath/doom-one.nvim", priority = 1000 }, + { "shaunsingh/moonlight.nvim", priority = 1000 }, + { "kvrohit/mellow.nvim", priority = 1000 }, + -- 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" }, + }, + }, + -- development + "github/copilot.vim", + { + "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, + }, + "numToStr/Comment.nvim", + { "NeogitOrg/neogit", dependencies = "nvim-lua/plenary.nvim" }, + "sindrets/diffview.nvim", + "windwp/nvim-autopairs", + { "windwp/nvim-ts-autotag", dependencies = "nvim-treesitter" }, + "lewis6991/gitsigns.nvim", + "f-person/git-blame.nvim", + -- useful plugins + { + "glepnir/dashboard-nvim", + event = "VimEnter", + dependencies = { "nvim-tree/nvim-web-devicons" }, + }, + { + "nvim-neorg/neorg", + build = ":Neorg sync-parsers", + dependencies = "nvim-lua/plenary.nvim", + }, + { + "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 = "*" }, + "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", + "xiyaowong/transparent.nvim", + "jokajak/keyseer.nvim", +}) diff --git a/lua/taken/plugin/init.lua b/lua/taken/plugin/init.lua deleted file mode 100644 index db6dbbb..0000000 --- a/lua/taken/plugin/init.lua +++ /dev/null @@ -1 +0,0 @@ -require("taken.plugin.packer") diff --git a/lua/taken/plugin/packer.lua b/lua/taken/plugin/packer.lua deleted file mode 100644 index 211cc89..0000000 --- a/lua/taken/plugin/packer.lua +++ /dev/null @@ -1,156 +0,0 @@ -local ensure_packer = function() - local fn = vim.fn - local install_path = fn.stdpath("data") .. "/site/pack/packer/start/packer.nvim" - if fn.empty(fn.glob(install_path)) > 0 then - fn.system({ "git", "clone", "--depth", "1", "https://github.com/wbthomason/packer.nvim", install_path }) - vim.cmd([[packadd packer.nvim]]) - return true - end - return false -end -local packer_bootstrap = ensure_packer() -- true if packer was just installed - -vim.cmd([[packadd packer.nvim]]) - --- import packer safely -local status, packer = pcall(require, "packer") -if not status then - return -end - -return packer.startup({ - function(use) - --Packer - use("wbthomason/packer.nvim") - --Themes - use({ "catppuccin/nvim", as = "catppuccin" }) - use("folke/tokyonight.nvim") - use("Mofiqul/dracula.nvim") - use("roflolilolmao/oceanic-next.nvim") - use("olimorris/onedarkpro.nvim") - use("NTBBloodbath/doom-one.nvim") - use("shaunsingh/moonlight.nvim") - use("kvrohit/mellow.nvim") - -- telescope - use({ - "nvim-telescope/telescope.nvim", - tag = "0.1.1", - requires = { { "nvim-lua/plenary.nvim" } }, - }) - use({ - "nvim-telescope/telescope-file-browser.nvim", - requires = { "nvim-telescope/telescope.nvim", "nvim-lua/plenary.nvim" }, - }) - use({ - "nvim-telescope/telescope-project.nvim", - requires = { "nvim-telescope/telescope.nvim", "nvim-lua/plenary.nvim" }, - }) - use({ - "nvim-telescope/telescope-fzf-native.nvim", - run = "make", - requires = { "nvim-telescope/telescope.nvim" }, - }) - use({ - "VonHeikemen/fine-cmdline.nvim", - requires = { - { "MunifTanjim/nui.nvim" }, - }, - }) - -- development - use("github/copilot.vim") - use({ - "nvim-tree/nvim-tree.lua", - requires = { { "nvim-tree/nvim-web-devicons" } }, - }) - use({ "nvim-treesitter/nvim-treesitter", run = ":TSUpdate" }) - --lsp - use({ - "williamboman/mason.nvim", - run = function() - pcall(vim.cmd, "MasonUpdate") - end, - }) - use({ "neovim/nvim-lspconfig" }) - use({ "williamboman/mason-lspconfig.nvim" }) - -- formatters and linters - use("jose-elias-alvarez/null-ls.nvim") - use("jayp0521/mason-null-ls.nvim") - -- completion - use({ "hrsh7th/nvim-cmp" }) - use({ "hrsh7th/cmp-nvim-lsp" }) - use("hrsh7th/cmp-buffer") - use("hrsh7th/cmp-path") - -- snippets - use("L3MON4D3/LuaSnip") - use("saadparwaiz1/cmp_luasnip") - use("rafamadriz/friendly-snippets") - use("onsails/lspkind.nvim") - use({ - "folke/trouble.nvim", - requires = { "nvim-tree/nvim-web-devicons" }, - }) - use({ - "iamcco/markdown-preview.nvim", - run = function() - vim.fn["mkdp#util#install"]() - end, - }) - use({ - "numToStr/Comment.nvim", - config = function() end, - }) - use({ "NeogitOrg/neogit", requires = "nvim-lua/plenary.nvim" }) - use("sindrets/diffview.nvim") - use("windwp/nvim-autopairs") - use({ "windwp/nvim-ts-autotag", after = "nvim-treesitter" }) - use("lewis6991/gitsigns.nvim") - use("f-person/git-blame.nvim") - -- useful plugins - use({ - "glepnir/dashboard-nvim", - event = "VimEnter", - requires = { "nvim-tree/nvim-web-devicons" }, - }) - use({ - "nvim-neorg/neorg", - run = ":Neorg sync-parsers", - requires = "nvim-lua/plenary.nvim", - }) - use({ - "NvChad/nvim-colorizer.lua", - config = function() - require("colorizer").setup({}) - end, - }) - use("folke/which-key.nvim") - use({ - "nvim-lualine/lualine.nvim", - requires = { "nvim-tree/nvim-web-devicons", opt = true }, - }) - use({ "akinsho/toggleterm.nvim", tag = "*" }) - use("rcarriga/nvim-notify") - use({ "akinsho/bufferline.nvim", tag = "*", requires = "nvim-tree/nvim-web-devicons" }) - use("TakenMC/presence.nvim") - use({ - "kylechui/nvim-surround", - tag = "*", - config = function() - require("nvim-surround").setup({}) - end, - }) - use("ObserverOfTime/nvimcord") - use("xiyaowong/transparent.nvim") - use("jokajak/keyseer.nvim") - -- packer autosync - if packer_bootstrap then - require("packer").sync() - end - end, - config = { - display = { - open_fn = function() - return require("packer.util").float({ border = "single" }) - end, - }, - }, -}) diff --git a/lua/taken/pluginloader.lua b/lua/taken/pluginloader.lua new file mode 100644 index 0000000..5d1cc5d --- /dev/null +++ b/lua/taken/pluginloader.lua @@ -0,0 +1,17 @@ +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 diff --git a/after/plugin/autopairs.lua b/lua/taken/plugins/autopairs.lua similarity index 100% rename from after/plugin/autopairs.lua rename to lua/taken/plugins/autopairs.lua diff --git a/after/plugin/bufferline.lua b/lua/taken/plugins/bufferline.lua similarity index 100% rename from after/plugin/bufferline.lua rename to lua/taken/plugins/bufferline.lua diff --git a/after/plugin/cmdline.lua b/lua/taken/plugins/cmdline.lua similarity index 100% rename from after/plugin/cmdline.lua rename to lua/taken/plugins/cmdline.lua diff --git a/after/plugin/comment.lua b/lua/taken/plugins/comment.lua similarity index 100% rename from after/plugin/comment.lua rename to lua/taken/plugins/comment.lua diff --git a/after/plugin/dashboard.lua b/lua/taken/plugins/dashboard.lua similarity index 100% rename from after/plugin/dashboard.lua rename to lua/taken/plugins/dashboard.lua diff --git a/after/plugin/gitsigns.lua b/lua/taken/plugins/gitsigns.lua similarity index 100% rename from after/plugin/gitsigns.lua rename to lua/taken/plugins/gitsigns.lua diff --git a/after/plugin/keyseer.lua b/lua/taken/plugins/keyseer.lua similarity index 100% rename from after/plugin/keyseer.lua rename to lua/taken/plugins/keyseer.lua diff --git a/after/plugin/legacyvimscript.lua b/lua/taken/plugins/legacyvimscript.lua similarity index 100% rename from after/plugin/legacyvimscript.lua rename to lua/taken/plugins/legacyvimscript.lua diff --git a/after/plugin/lsp.lua.old b/lua/taken/plugins/lsp.lua.old similarity index 100% rename from after/plugin/lsp.lua.old rename to lua/taken/plugins/lsp.lua.old diff --git a/after/plugin/lsp/lspconfig.lua b/lua/taken/plugins/lsp/lspconfig.lua similarity index 100% rename from after/plugin/lsp/lspconfig.lua rename to lua/taken/plugins/lsp/lspconfig.lua diff --git a/after/plugin/lsp/mason.lua b/lua/taken/plugins/lsp/mason.lua similarity index 100% rename from after/plugin/lsp/mason.lua rename to lua/taken/plugins/lsp/mason.lua diff --git a/after/plugin/lsp/null-ls.lua b/lua/taken/plugins/lsp/null-ls.lua similarity index 100% rename from after/plugin/lsp/null-ls.lua rename to lua/taken/plugins/lsp/null-ls.lua diff --git a/after/plugin/lualine.lua b/lua/taken/plugins/lualine.lua similarity index 100% rename from after/plugin/lualine.lua rename to lua/taken/plugins/lualine.lua diff --git a/after/plugin/neogit.lua b/lua/taken/plugins/neogit.lua similarity index 100% rename from after/plugin/neogit.lua rename to lua/taken/plugins/neogit.lua diff --git a/after/plugin/neorg.lua b/lua/taken/plugins/neorg.lua similarity index 100% rename from after/plugin/neorg.lua rename to lua/taken/plugins/neorg.lua diff --git a/after/plugin/nvim-cmp.lua b/lua/taken/plugins/nvim-cmp.lua similarity index 100% rename from after/plugin/nvim-cmp.lua rename to lua/taken/plugins/nvim-cmp.lua diff --git a/after/plugin/nvimcord.lua b/lua/taken/plugins/nvimcord.lua similarity index 100% rename from after/plugin/nvimcord.lua rename to lua/taken/plugins/nvimcord.lua diff --git a/after/plugin/nvimtree.lua b/lua/taken/plugins/nvimtree.lua similarity index 100% rename from after/plugin/nvimtree.lua rename to lua/taken/plugins/nvimtree.lua diff --git a/after/plugin/presence.lua b/lua/taken/plugins/presence.lua similarity index 100% rename from after/plugin/presence.lua rename to lua/taken/plugins/presence.lua diff --git a/after/plugin/telescope.lua b/lua/taken/plugins/telescope.lua similarity index 100% rename from after/plugin/telescope.lua rename to lua/taken/plugins/telescope.lua diff --git a/after/plugin/toggleterm.lua b/lua/taken/plugins/toggleterm.lua similarity index 100% rename from after/plugin/toggleterm.lua rename to lua/taken/plugins/toggleterm.lua diff --git a/after/plugin/transparent.lua b/lua/taken/plugins/transparent.lua similarity index 100% rename from after/plugin/transparent.lua rename to lua/taken/plugins/transparent.lua diff --git a/after/plugin/treesitter.lua b/lua/taken/plugins/treesitter.lua similarity index 100% rename from after/plugin/treesitter.lua rename to lua/taken/plugins/treesitter.lua diff --git a/after/plugin/whichkey.lua b/lua/taken/plugins/whichkey.lua similarity index 100% rename from after/plugin/whichkey.lua rename to lua/taken/plugins/whichkey.lua