mirror of
https://github.com/basecamp/omarchy.git
synced 2026-02-17 15:25:37 +00:00
Compare commits
9 Commits
add-fast-s
...
nvim-auto-
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
62f6882621 | ||
|
|
4e0431540d | ||
|
|
86653b52d9 | ||
|
|
2197fdc216 | ||
|
|
ff71701174 | ||
|
|
00be806b46 | ||
|
|
44127f6f24 | ||
|
|
1fa7a28faa | ||
|
|
a634eac187 |
@@ -47,7 +47,6 @@ install_node() {
|
|||||||
case "$1" in
|
case "$1" in
|
||||||
ruby)
|
ruby)
|
||||||
echo -e "Installing Ruby on Rails...\n"
|
echo -e "Installing Ruby on Rails...\n"
|
||||||
omarchy-pkg-add libyaml
|
|
||||||
mise use --global ruby@latest
|
mise use --global ruby@latest
|
||||||
mise settings add idiomatic_version_file_enable_tools ruby
|
mise settings add idiomatic_version_file_enable_tools ruby
|
||||||
mise x ruby -- gem install rails --no-document
|
mise x ruby -- gem install rails --no-document
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ window-padding-y = 14
|
|||||||
confirm-close-surface=false
|
confirm-close-surface=false
|
||||||
resize-overlay = never
|
resize-overlay = never
|
||||||
|
|
||||||
# Cursor styling
|
# Cursor stlying
|
||||||
cursor-style = "block"
|
cursor-style = "block"
|
||||||
cursor-style-blink = false
|
cursor-style-blink = false
|
||||||
shell-integration-features = no-cursor
|
shell-integration-features = no-cursor
|
||||||
|
|||||||
56
config/nvim/lua/plugins/all-themes.lua
Normal file
56
config/nvim/lua/plugins/all-themes.lua
Normal file
@@ -0,0 +1,56 @@
|
|||||||
|
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,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"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,
|
||||||
|
},
|
||||||
|
}
|
||||||
45
config/nvim/lua/plugins/omarchy-theme-hotreload.lua
Normal file
45
config/nvim/lua/plugins/omarchy-theme-hotreload.lua
Normal file
@@ -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,
|
||||||
|
},
|
||||||
|
}
|
||||||
@@ -1,8 +0,0 @@
|
|||||||
return {
|
|
||||||
{
|
|
||||||
"LazyVim/LazyVim",
|
|
||||||
opts = {
|
|
||||||
colorscheme = "tokyonight",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
}
|
|
||||||
@@ -14,7 +14,6 @@ run_logged $OMARCHY_INSTALL/config/fix-powerprofilesctl-shebang.sh
|
|||||||
run_logged $OMARCHY_INSTALL/config/docker.sh
|
run_logged $OMARCHY_INSTALL/config/docker.sh
|
||||||
run_logged $OMARCHY_INSTALL/config/mimetypes.sh
|
run_logged $OMARCHY_INSTALL/config/mimetypes.sh
|
||||||
run_logged $OMARCHY_INSTALL/config/localdb.sh
|
run_logged $OMARCHY_INSTALL/config/localdb.sh
|
||||||
run_logged $OMARCHY_INSTALL/config/fast-shutdown.sh
|
|
||||||
run_logged $OMARCHY_INSTALL/config/sudoless-asdcontrol.sh
|
run_logged $OMARCHY_INSTALL/config/sudoless-asdcontrol.sh
|
||||||
run_logged $OMARCHY_INSTALL/config/hardware/network.sh
|
run_logged $OMARCHY_INSTALL/config/hardware/network.sh
|
||||||
run_logged $OMARCHY_INSTALL/config/hardware/set-wireless-regdom.sh
|
run_logged $OMARCHY_INSTALL/config/hardware/set-wireless-regdom.sh
|
||||||
|
|||||||
@@ -1,7 +0,0 @@
|
|||||||
sudo mkdir -p /etc/systemd/system.conf.d
|
|
||||||
|
|
||||||
cat <<EOF | sudo tee /etc/systemd/system.conf.d/10-faster-shutdown.conf
|
|
||||||
[Manager]
|
|
||||||
DefaultTimeoutStopSec=5s
|
|
||||||
EOF
|
|
||||||
sudo systemctl daemon-reload
|
|
||||||
14
install/iso.sh
Normal file
14
install/iso.sh
Normal file
@@ -0,0 +1,14 @@
|
|||||||
|
# Called by Omarchy ISO setup before starting configurator and archinstall
|
||||||
|
|
||||||
|
source "$OMARCHY_INSTALL/preflight/set-size-vars.sh"
|
||||||
|
source "$OMARCHY_INSTALL/helpers/logo.sh"
|
||||||
|
source "$OMARCHY_INSTALL/preflight/gum.sh"
|
||||||
|
source "$OMARCHY_INSTALL/helpers/tail-log-output.sh"
|
||||||
|
source "$OMARCHY_INSTALL/helpers/trap-errors.sh"
|
||||||
|
|
||||||
|
source $OMARCHY_INSTALL/helpers/chroot.sh
|
||||||
|
source $OMARCHY_INSTALL/helpers/logo.sh
|
||||||
|
source $OMARCHY_INSTALL/helpers/gum.sh
|
||||||
|
source $OMARCHY_INSTALL/helpers/errors.sh
|
||||||
|
source $OMARCHY_INSTALL/helpers/logging.sh
|
||||||
|
source $OMARCHY_INSTALL/helpers/layout.sh
|
||||||
4
migrations/1758081785.sh
Normal file
4
migrations/1758081785.sh
Normal file
@@ -0,0 +1,4 @@
|
|||||||
|
echo "Add live themeing to neovim"
|
||||||
|
|
||||||
|
cp -f $OMARCHY_PATH/config/nvim/lua/plugins/all-themes.lua ~/.config/nvim/lua/plugins/
|
||||||
|
cp -f $OMARCHY_PATH/config/nvim/lua/plugins/omarchy-theme-hotreload.lua ~/.config/nvim/lua/plugins/
|
||||||
3
migrations/1758318253.sh
Normal file
3
migrations/1758318253.sh
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
echo "Ensure libyaml is available for installing Ruby"
|
||||||
|
|
||||||
|
omarchy-pkg-add libyaml
|
||||||
@@ -1,2 +0,0 @@
|
|||||||
echo "Enable fast shutdown"
|
|
||||||
source $OMARCHY_PATH/install/config/fast-shutdown.sh
|
|
||||||
@@ -3,12 +3,9 @@ return {
|
|||||||
"catppuccin/nvim",
|
"catppuccin/nvim",
|
||||||
name = "catppuccin",
|
name = "catppuccin",
|
||||||
priority = 1000,
|
priority = 1000,
|
||||||
config = function()
|
opts = {
|
||||||
require("catppuccin").setup({
|
flavour = "latte",
|
||||||
flavour = "latte", -- other options: "mocha", "frappe", "macchiato"
|
},
|
||||||
})
|
|
||||||
vim.cmd.colorscheme("catppuccin-latte")
|
|
||||||
end,
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"LazyVim/LazyVim",
|
"LazyVim/LazyVim",
|
||||||
|
|||||||
@@ -1,4 +1,9 @@
|
|||||||
return {
|
return {
|
||||||
|
{
|
||||||
|
"catppuccin/nvim",
|
||||||
|
name = "catppuccin",
|
||||||
|
priority = 1000,
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"LazyVim/LazyVim",
|
"LazyVim/LazyVim",
|
||||||
opts = {
|
opts = {
|
||||||
|
|||||||
@@ -1,9 +1,13 @@
|
|||||||
return {
|
return {
|
||||||
"ribru17/bamboo.nvim",
|
{
|
||||||
lazy = false,
|
"ribru17/bamboo.nvim",
|
||||||
priority = 1000,
|
priority = 1000,
|
||||||
config = function()
|
opts = {},
|
||||||
require("bamboo").setup({})
|
},
|
||||||
require("bamboo").load()
|
{
|
||||||
end,
|
"LazyVim/LazyVim",
|
||||||
|
opts = {
|
||||||
|
colorscheme = "bamboo",
|
||||||
|
},
|
||||||
|
},
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,31 +1,14 @@
|
|||||||
return {
|
return {
|
||||||
{
|
{
|
||||||
"gthelding/monokai-pro.nvim",
|
"loctvl842/monokai-pro.nvim",
|
||||||
config = function()
|
opts = {
|
||||||
require("monokai-pro").setup({
|
filter = "ristretto",
|
||||||
filter = "ristretto",
|
},
|
||||||
override = function()
|
},
|
||||||
return {
|
{
|
||||||
NonText = { fg = "#948a8b" },
|
"LazyVim/LazyVim",
|
||||||
MiniIconsGrey = { fg = "#948a8b" },
|
opts = {
|
||||||
MiniIconsRed = { fg = "#fd6883" },
|
colorscheme = "monokai-pro",
|
||||||
MiniIconsBlue = { fg = "#85dacc" },
|
},
|
||||||
MiniIconsGreen = { fg = "#adda78" },
|
},
|
||||||
MiniIconsYellow = { fg = "#f9cc6c" },
|
|
||||||
MiniIconsOrange = { fg = "#f38d70" },
|
|
||||||
MiniIconsPurple = { fg = "#a8a9eb" },
|
|
||||||
MiniIconsAzure = { fg = "#a8a9eb" },
|
|
||||||
MiniIconsCyan = { fg = "#85dacc" }, -- same value as MiniIconsBlue for consistency
|
|
||||||
}
|
|
||||||
end,
|
|
||||||
})
|
|
||||||
vim.cmd([[colorscheme monokai-pro]])
|
|
||||||
end,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"LazyVim/LazyVim",
|
|
||||||
opts = {
|
|
||||||
colorscheme = "monokai-pro",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,8 +1,12 @@
|
|||||||
return {
|
return {
|
||||||
|
{
|
||||||
|
"folke/tokyonight.nvim",
|
||||||
|
priority = 1000,
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"LazyVim/LazyVim",
|
"LazyVim/LazyVim",
|
||||||
opts = {
|
opts = {
|
||||||
colorscheme = "tokyonight",
|
colorscheme = "tokyonight-night",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user