Update to omarchy-nvim
This commit is contained in:
1 parent
38272ba428
commit
a867a290c6
9 files changed
+115
-17
No files matched your search
@@ -1,8 +0,0 @@
|
|||||||
return {
|
|
||||||
{
|
|
||||||
"LazyVim/LazyVim",
|
|
||||||
opts = {
|
|
||||||
colorscheme = "tokyonight",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
}
|
|
||||||
File renamed without changes.
@@ -1,6 +1,6 @@
|
|||||||
# Maintainer: Ryan Hughes <ryan@omarchy.org>
|
# Maintainer: Ryan Hughes <ryan@omarchy.org>
|
||||||
pkgname=omarchy-lazyvim
|
pkgname=omarchy-nvim
|
||||||
pkgver=2025.08.29
|
pkgver=2025.10.14
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
pkgdesc="Pre-built LazyVim configuration with cached plugins"
|
pkgdesc="Pre-built LazyVim configuration with cached plugins"
|
||||||
arch=('any')
|
arch=('any')
|
||||||
@@ -46,7 +46,7 @@ build() {
|
|||||||
package() {
|
package() {
|
||||||
cd "$srcdir"
|
cd "$srcdir"
|
||||||
|
|
||||||
# Install everything to /usr/share/omarchy-lazyvim
|
# Install everything to /usr/share/omarchy-nvim
|
||||||
install -dm755 "$pkgdir/usr/share/$pkgname"
|
install -dm755 "$pkgdir/usr/share/$pkgname"
|
||||||
|
|
||||||
# Copy all the built artifacts
|
# Copy all the built artifacts
|
||||||
@@ -59,5 +59,5 @@ package() {
|
|||||||
find "$pkgdir/usr/share/$pkgname" -type f -exec chmod 644 {} \;
|
find "$pkgdir/usr/share/$pkgname" -type f -exec chmod 644 {} \;
|
||||||
|
|
||||||
# Install setup script to /usr/bin
|
# 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"
|
||||||
}
|
}
|
||||||
File renamed without changes.
@@ -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,
|
||||||
|
},
|
||||||
|
}
|
||||||
@@ -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,
|
||||||
|
},
|
||||||
|
}
|
||||||
File renamed without changes.
+5
-5
@@ -1,10 +1,10 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
# Setup script for omarchy-lazyvim
|
# Setup script for omarchy-nvim
|
||||||
# This can be called from Omarchy setup scripts
|
# This can be called from Omarchy setup scripts
|
||||||
|
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
|
|
||||||
PACKAGE_DIR="/usr/share/omarchy-lazyvim"
|
PACKAGE_DIR="/usr/share/omarchy-nvim"
|
||||||
CONFIG_DIR="${HOME}/.config/nvim"
|
CONFIG_DIR="${HOME}/.config/nvim"
|
||||||
DATA_DIR="${HOME}/.local/share/nvim"
|
DATA_DIR="${HOME}/.local/share/nvim"
|
||||||
STATE_DIR="${HOME}/.local/state/nvim"
|
STATE_DIR="${HOME}/.local/state/nvim"
|
||||||
@@ -12,7 +12,7 @@ CACHE_DIR="${HOME}/.cache/nvim"
|
|||||||
|
|
||||||
# Check if package is installed
|
# Check if package is installed
|
||||||
if [[ ! -d "$PACKAGE_DIR" ]]; then
|
if [[ ! -d "$PACKAGE_DIR" ]]; then
|
||||||
echo "Error: omarchy-lazyvim package not installed"
|
echo "Error: omarchy-nvim package not installed"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@@ -29,7 +29,7 @@ if [[ -d "$CONFIG_DIR" ]]; then
|
|||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "Setting up LazyVim configuration..."
|
echo "Setting up Neovim configuration..."
|
||||||
|
|
||||||
# Make sure everything is clear
|
# Make sure everything is clear
|
||||||
rm -rf $DATA_DIR $CACHE_DIR $STATE_DIR
|
rm -rf $DATA_DIR $CACHE_DIR $STATE_DIR
|
||||||
@@ -50,4 +50,4 @@ for dir in $DATA_DIR/lazy/*/; do
|
|||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|
||||||
echo "LazyVim setup complete!"
|
echo "Neovim setup complete!"
|
||||||
File renamed without changes.
Reference in new issue
Block a user