diff --git a/lazy-lock.json b/lazy-lock.json index e7b6052..f77413b 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,31 +1,33 @@ { - "LuaSnip": { "branch": "master", "commit": "45db5addf8d0a201e1cf247cae4cdce605ad3768" }, + "LuaSnip": { "branch": "master", "commit": "e808bee352d1a6fcf902ca1a71cee76e60e24071" }, "auto-dark-mode.nvim": { "branch": "master", "commit": "14cad96b80a07e9e92a0dcbe235092ed14113fb2" }, "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, "conform.nvim": { "branch": "master", "commit": "50649648851cd0e126dfedd0f3c33b900a6f1ef8" }, "copilot-cmp": { "branch": "master", "commit": "b6e5286b3d74b04256d0a7e3bd2908eabec34b44" }, - "copilot.lua": { "branch": "master", "commit": "f9e2c140643bd4519a4517a78a51f6ae8b8b2a95" }, + "copilot.lua": { "branch": "master", "commit": "1a237cf50372830a61d92b0adf00d3b23882e0e1" }, "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" }, "flash.nvim": { "branch": "main", "commit": "34c7be146a91fec3555c33fe89c7d643f6ef5cf1" }, "gitsigns.nvim": { "branch": "main", "commit": "1ef74b546732f185d0f806860fa5404df7614f28" }, - "lazy.nvim": { "branch": "main", "commit": "48b52b5cfcf8f88ed0aff8fde573a5cc20b1306d" }, + "lazy.nvim": { "branch": "main", "commit": "460e1cd8f24e364d54543a4b0e83f6f4ec1f65fb" }, "lsp-zero.nvim": { "branch": "v3.x", "commit": "56db3d5ce5476b183783160e6045f7337ba12b83" }, "lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "25c11854aa25558ee6c03432edfa0df0217324be" }, "mason.nvim": { "branch": "main", "commit": "c43eeb5614a09dc17c03a7fb49de2e05de203924" }, - "mini.nvim": { "branch": "main", "commit": "f0d6e89515c6b055c20d257da717bd30211532f1" }, + "mini.nvim": { "branch": "main", "commit": "e50cf9de614500a20e47cfc50e30a100042f91c3" }, + "newpaper.nvim": { "branch": "main", "commit": "d8f2a29001f795a59e4f28713427c200c15449ea" }, "nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" }, - "nvim-lint": { "branch": "master", "commit": "a7ce9c78a7c710c28bee56dfab10a5c0c80b7fb5" }, - "nvim-lspconfig": { "branch": "master", "commit": "d88ae6623fef09251e3aa20001bb761686eae730" }, - "nvim-treesitter": { "branch": "master", "commit": "b6a6d8997c46dc15682020ce4fddc5a89ee1ac0d" }, - "nvim-treesitter-context": { "branch": "master", "commit": "e6cc783b74606d97ca9eff6494e3f5c2ca603a50" }, + "nvim-lint": { "branch": "master", "commit": "99cab0b885aaa2f59736c047d23e9a7835d4f9a9" }, + "nvim-lspconfig": { "branch": "master", "commit": "eb36e0185ad4b92b0999fb698428f2966334d2c1" }, + "nvim-treesitter": { "branch": "master", "commit": "4d94c24d6cb9985347bdf0692c1fd81088c6c8b2" }, + "nvim-treesitter-context": { "branch": "master", "commit": "7f7eeaa99e5a9beab518f502292871ae5f20de6f" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "bf8d2ad35d1d1a687eae6c065c3d524f7ab61b23" }, - "oil.nvim": { "branch": "master", "commit": "665bf2edc9f9a6d77a6fc636df36276c97fb5d66" }, - "plenary.nvim": { "branch": "master", "commit": "ec289423a1693aeae6cd0d503bac2856af74edaa" }, + "oil.nvim": { "branch": "master", "commit": "f60bb7f793477d99ef1acf39e920bf2ca4e644de" }, + "plenary.nvim": { "branch": "master", "commit": "f4faa5a3dc77a694ba58f42585985fed88540ac6" }, + "rose-pine": { "branch": "main", "commit": "8b1fd252255a7f2c41b4192a787ab62660b29f72" }, "snipe.nvim": { "branch": "main", "commit": "f1abd4aaaef6398b45dcddc9f1a40dd982f732b0" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "cf48d4dfce44e0b9a2e19a008d6ec6ea6f01a83b" }, "telescope.nvim": { "branch": "master", "commit": "d90956833d7c27e73c621a61f20b29fdb7122709" }, - "todo-comments.nvim": { "branch": "main", "commit": "319c01b99b7a8c9ac2066bf0efd4d6ec68fef444" }, + "todo-comments.nvim": { "branch": "main", "commit": "ae0a2afb47cf7395dc400e5dc4e05274bf4fb9e0" }, "tokyonight.nvim": { "branch": "main", "commit": "2cd12582c98a3552032824ffa67fd44b4d81184a" }, "trouble.nvim": { "branch": "main", "commit": "6efc446226679fda0547c0fd6a7892fd5f5b15d8" }, "twilight.nvim": { "branch": "main", "commit": "1584c0b0a979b71fd86b18d302ba84e9aba85b1b" }, diff --git a/lua/weeheavy/lazy.lua b/lua/weeheavy/lazy.lua index 63a08ed..c06feeb 100644 --- a/lua/weeheavy/lazy.lua +++ b/lua/weeheavy/lazy.lua @@ -12,4 +12,8 @@ if not vim.loop.fs_stat(lazypath) then end vim.opt.rtp:prepend(lazypath) -require("lazy").setup({ { import = "weeheavy.plugins" }, { import = "weeheavy.plugins.lsp" } }) +require("lazy").setup({ + { import = "weeheavy.plugins" }, + { import = "weeheavy.plugins.lsp" }, + { import = "weeheavy.plugins.theme" }, +}) diff --git a/lua/weeheavy/plugins/auto-dark-mode.lua b/lua/weeheavy/plugins/auto-dark-mode.lua index dd25bcf..56efe9d 100644 --- a/lua/weeheavy/plugins/auto-dark-mode.lua +++ b/lua/weeheavy/plugins/auto-dark-mode.lua @@ -11,7 +11,7 @@ return { end, set_light_mode = function() vim.api.nvim_set_option_value("background", "light", {}) - vim.cmd("colorscheme tokyonight-day") + vim.cmd("colorscheme rose-pine-dawn") end, }, config = function() diff --git a/lua/weeheavy/plugins/catppuccin.lua b/lua/weeheavy/plugins/theme/catppuccin.lua similarity index 100% rename from lua/weeheavy/plugins/catppuccin.lua rename to lua/weeheavy/plugins/theme/catppuccin.lua diff --git a/lua/weeheavy/plugins/theme/newpaper.lua b/lua/weeheavy/plugins/theme/newpaper.lua new file mode 100644 index 0000000..4bbc3c5 --- /dev/null +++ b/lua/weeheavy/plugins/theme/newpaper.lua @@ -0,0 +1,9 @@ +return { + "yorik1984/newpaper.nvim", + branch = "main", + lazy = false, + enabled = false, + priority = 1000, + config = true, + opts = {}, +} diff --git a/lua/weeheavy/plugins/nightfox.lua b/lua/weeheavy/plugins/theme/nightfox.lua similarity index 100% rename from lua/weeheavy/plugins/nightfox.lua rename to lua/weeheavy/plugins/theme/nightfox.lua diff --git a/lua/weeheavy/plugins/rosepine.lua b/lua/weeheavy/plugins/theme/rosepine.lua similarity index 86% rename from lua/weeheavy/plugins/rosepine.lua rename to lua/weeheavy/plugins/theme/rosepine.lua index 8f8c9c5..f00c774 100644 --- a/lua/weeheavy/plugins/rosepine.lua +++ b/lua/weeheavy/plugins/theme/rosepine.lua @@ -3,7 +3,7 @@ return { name = "rose-pine", branch = "main", lazy = false, - enabled = false, + enabled = true, priority = 1000, opts = {}, } diff --git a/lua/weeheavy/plugins/tokyonight.lua b/lua/weeheavy/plugins/theme/tokyonight.lua similarity index 100% rename from lua/weeheavy/plugins/tokyonight.lua rename to lua/weeheavy/plugins/theme/tokyonight.lua diff --git a/lua/weeheavy/prefs.lua b/lua/weeheavy/prefs.lua index 285f4bd..71d5f18 100644 --- a/lua/weeheavy/prefs.lua +++ b/lua/weeheavy/prefs.lua @@ -54,7 +54,9 @@ vim.opt.background = "dark" -- light, dark -- tokyonight-storm -- tokyonight-day -- tokyonight-moon -vim.cmd.colorscheme("tokyonight-storm") +-- vim.cmd.colorscheme("tokyonight-storm") +vim.cmd.colorscheme("rose-pine-dawn") +-- vim.cmd.colorscheme("newpaper") -- Decrease update time vim.opt.updatetime = 250