From a867a290c6220271fd92bfad6dadfdd8a5ddd415 Mon Sep 17 00:00:00 2001 From: Ryan Hughes Date: Tue, 14 Oct 2025 00:39:15 -0400 Subject: [PATCH] Update to omarchy-nvim --- .../omarchy-lazyvim/lua/plugins/theme.lua | 8 --- .../.gitignore | 0 .../PKGBUILD | 8 +-- .../lazyvim.json | 0 .../omarchy-nvim/lua/plugins/all-themes.lua | 61 +++++++++++++++++++ .../lua/plugins/omarchy-theme-hotreload.lua | 45 ++++++++++++++ .../plugins/snacks-animated-scrolling-off.lua | 0 .../omarchy-nvim-setup} | 10 +-- .../plugin/after/transparency.lua | 0 9 files changed, 115 insertions(+), 17 deletions(-) delete mode 100644 pkgbuilds/omarchy-lazyvim/lua/plugins/theme.lua rename pkgbuilds/{omarchy-lazyvim => omarchy-nvim}/.gitignore (100%) rename pkgbuilds/{omarchy-lazyvim => omarchy-nvim}/PKGBUILD (91%) rename pkgbuilds/{omarchy-lazyvim => omarchy-nvim}/lazyvim.json (100%) create mode 100644 pkgbuilds/omarchy-nvim/lua/plugins/all-themes.lua create mode 100644 pkgbuilds/omarchy-nvim/lua/plugins/omarchy-theme-hotreload.lua rename pkgbuilds/{omarchy-lazyvim => omarchy-nvim}/lua/plugins/snacks-animated-scrolling-off.lua (100%) rename pkgbuilds/{omarchy-lazyvim/omarchy-lazyvim-setup => omarchy-nvim/omarchy-nvim-setup} (85%) rename pkgbuilds/{omarchy-lazyvim => omarchy-nvim}/plugin/after/transparency.lua (100%) diff --git a/pkgbuilds/omarchy-lazyvim/lua/plugins/theme.lua b/pkgbuilds/omarchy-lazyvim/lua/plugins/theme.lua deleted file mode 100644 index dad2d30..0000000 --- a/pkgbuilds/omarchy-lazyvim/lua/plugins/theme.lua +++ /dev/null @@ -1,8 +0,0 @@ -return { - { - "LazyVim/LazyVim", - opts = { - colorscheme = "tokyonight", - }, - }, -} diff --git a/pkgbuilds/omarchy-lazyvim/.gitignore b/pkgbuilds/omarchy-nvim/.gitignore similarity index 100% rename from pkgbuilds/omarchy-lazyvim/.gitignore rename to pkgbuilds/omarchy-nvim/.gitignore diff --git a/pkgbuilds/omarchy-lazyvim/PKGBUILD b/pkgbuilds/omarchy-nvim/PKGBUILD similarity index 91% rename from pkgbuilds/omarchy-lazyvim/PKGBUILD rename to pkgbuilds/omarchy-nvim/PKGBUILD index 09eb648..1ef9257 100644 --- a/pkgbuilds/omarchy-lazyvim/PKGBUILD +++ b/pkgbuilds/omarchy-nvim/PKGBUILD @@ -1,6 +1,6 @@ # Maintainer: Ryan Hughes -pkgname=omarchy-lazyvim -pkgver=2025.08.29 +pkgname=omarchy-nvim +pkgver=2025.10.14 pkgrel=1 pkgdesc="Pre-built LazyVim configuration with cached plugins" arch=('any') @@ -46,7 +46,7 @@ build() { package() { cd "$srcdir" - # Install everything to /usr/share/omarchy-lazyvim + # Install everything to /usr/share/omarchy-nvim install -dm755 "$pkgdir/usr/share/$pkgname" # Copy all the built artifacts @@ -59,5 +59,5 @@ package() { find "$pkgdir/usr/share/$pkgname" -type f -exec chmod 644 {} \; # Install setup script to /usr/bin - install -Dm755 "$startdir/omarchy-lazyvim-setup" "$pkgdir/usr/bin/omarchy-lazyvim-setup" + install -Dm755 "$startdir/omarchy-nvim-setup" "$pkgdir/usr/bin/omarchy-nvim-setup" } diff --git a/pkgbuilds/omarchy-lazyvim/lazyvim.json b/pkgbuilds/omarchy-nvim/lazyvim.json similarity index 100% rename from pkgbuilds/omarchy-lazyvim/lazyvim.json rename to pkgbuilds/omarchy-nvim/lazyvim.json diff --git a/pkgbuilds/omarchy-nvim/lua/plugins/all-themes.lua b/pkgbuilds/omarchy-nvim/lua/plugins/all-themes.lua new file mode 100644 index 0000000..4c38f98 --- /dev/null +++ b/pkgbuilds/omarchy-nvim/lua/plugins/all-themes.lua @@ -0,0 +1,61 @@ +return { + -- Load all theme plugins but don't apply them + -- This ensures all colorschemes are available for hot-reloading + { + "ribru17/bamboo.nvim", + lazy = true, + priority = 1000, + }, + { + "catppuccin/nvim", + name = "catppuccin", + lazy = true, + priority = 1000, + }, + { + "sainnhe/everforest", + lazy = true, + priority = 1000, + }, + { + "kepano/flexoki-neovim", + lazy = true, + priority = 1000, + }, + { + "ellisonleao/gruvbox.nvim", + lazy = true, + priority = 1000, + }, + { + "rebelot/kanagawa.nvim", + lazy = true, + priority = 1000, + }, + { + "tahayvr/matteblack.nvim", + lazy = true, + priority = 1000, + }, + { + "loctvl842/monokai-pro.nvim", + lazy = true, + priority = 1000, + }, + { + "shaunsingh/nord.nvim", + lazy = true, + priority = 1000, + }, + { + "rose-pine/neovim", + name = "rose-pine", + lazy = true, + priority = 1000, + }, + { + "folke/tokyonight.nvim", + lazy = true, + priority = 1000, + }, +} diff --git a/pkgbuilds/omarchy-nvim/lua/plugins/omarchy-theme-hotreload.lua b/pkgbuilds/omarchy-nvim/lua/plugins/omarchy-theme-hotreload.lua new file mode 100644 index 0000000..8d05a5b --- /dev/null +++ b/pkgbuilds/omarchy-nvim/lua/plugins/omarchy-theme-hotreload.lua @@ -0,0 +1,45 @@ +return { + { + name = "theme-hotreload", + dir = vim.fn.stdpath("config"), + lazy = false, + priority = 1000, + config = function() + local transparency_file = vim.fn.stdpath("config") .. "/plugin/after/transparency.lua" + + vim.api.nvim_create_autocmd("User", { + pattern = "LazyReload", + callback = function() + package.loaded["plugins.theme"] = nil + + vim.schedule(function() + local ok, theme_spec = pcall(require, "plugins.theme") + if not ok then + return + end + + for _, spec in ipairs(theme_spec) do + if spec[1] == "LazyVim/LazyVim" and spec.opts and spec.opts.colorscheme then + local colorscheme = spec.opts.colorscheme + + require("lazy.core.loader").colorscheme(colorscheme) + + vim.defer_fn(function() + pcall(vim.cmd.colorscheme, colorscheme) + + if vim.fn.filereadable(transparency_file) == 1 then + vim.defer_fn(function() + vim.cmd.source(transparency_file) + end, 5) + end + end, 5) + + break + end + end + end) + end, + }) + end, + }, +} diff --git a/pkgbuilds/omarchy-lazyvim/lua/plugins/snacks-animated-scrolling-off.lua b/pkgbuilds/omarchy-nvim/lua/plugins/snacks-animated-scrolling-off.lua similarity index 100% rename from pkgbuilds/omarchy-lazyvim/lua/plugins/snacks-animated-scrolling-off.lua rename to pkgbuilds/omarchy-nvim/lua/plugins/snacks-animated-scrolling-off.lua diff --git a/pkgbuilds/omarchy-lazyvim/omarchy-lazyvim-setup b/pkgbuilds/omarchy-nvim/omarchy-nvim-setup similarity index 85% rename from pkgbuilds/omarchy-lazyvim/omarchy-lazyvim-setup rename to pkgbuilds/omarchy-nvim/omarchy-nvim-setup index d3e7e70..e6c67f2 100755 --- a/pkgbuilds/omarchy-lazyvim/omarchy-lazyvim-setup +++ b/pkgbuilds/omarchy-nvim/omarchy-nvim-setup @@ -1,10 +1,10 @@ #!/bin/bash -# Setup script for omarchy-lazyvim +# Setup script for omarchy-nvim # This can be called from Omarchy setup scripts set -euo pipefail -PACKAGE_DIR="/usr/share/omarchy-lazyvim" +PACKAGE_DIR="/usr/share/omarchy-nvim" CONFIG_DIR="${HOME}/.config/nvim" DATA_DIR="${HOME}/.local/share/nvim" STATE_DIR="${HOME}/.local/state/nvim" @@ -12,7 +12,7 @@ CACHE_DIR="${HOME}/.cache/nvim" # Check if package is installed if [[ ! -d "$PACKAGE_DIR" ]]; then - echo "Error: omarchy-lazyvim package not installed" + echo "Error: omarchy-nvim package not installed" exit 1 fi @@ -29,7 +29,7 @@ if [[ -d "$CONFIG_DIR" ]]; then fi fi -echo "Setting up LazyVim configuration..." +echo "Setting up Neovim configuration..." # Make sure everything is clear rm -rf $DATA_DIR $CACHE_DIR $STATE_DIR @@ -50,4 +50,4 @@ for dir in $DATA_DIR/lazy/*/; do fi done -echo "LazyVim setup complete!" +echo "Neovim setup complete!" diff --git a/pkgbuilds/omarchy-lazyvim/plugin/after/transparency.lua b/pkgbuilds/omarchy-nvim/plugin/after/transparency.lua similarity index 100% rename from pkgbuilds/omarchy-lazyvim/plugin/after/transparency.lua rename to pkgbuilds/omarchy-nvim/plugin/after/transparency.lua