kenji/omarchy-nix
1
0
Fork 0
forked from Shinonome/omarchy-nix
Code Pull Requests Activity

Fixes

Browse Source
This commit is contained in:
Henry Sipp
2025-07-28 10:15:50 -05:00
parent e3f8ea40cf
commit ad2dfc9af3
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config.nix
+2 -1
View File
@@ -27,7 +27,8 @@ lib: {
type = lib.types.submodule { type = lib.types.submodule {
options = { options = {
wallpaper_path = lib.mkOption { wallpaper_path = lib.mkOption {
type = lib.types.path; type = lib.types.nullOr lib.types.path;
default = null;
description = "Path to the wallpaper image to extract colors from"; description = "Path to the wallpaper image to extract colors from";
}; };
}; };
lib/selected-wallpaper.nix
+1 -1
View File
@@ -22,7 +22,7 @@ config: let
}; };
# Handle wallpaper path for generated themes and overrides # Handle wallpaper path for generated themes and overrides
wallpaper_path = if (cfg.theme == "generated_light" || cfg.theme == "generated_dark") || (cfg.theme_overrides ? wallpaper_path) wallpaper_path = if (cfg.theme == "generated_light" || cfg.theme == "generated_dark") || (cfg.theme_overrides.wallpaper_path != null)
then toString cfg.theme_overrides.wallpaper_path then toString cfg.theme_overrides.wallpaper_path
else let else let
selected_wallpaper = builtins.elemAt (wallpapers.${cfg.theme}) 0; selected_wallpaper = builtins.elemAt (wallpapers.${cfg.theme}) 0;
modules/home-manager/default.nix
+2 -2
View File
@@ -14,7 +14,7 @@ inputs: {
else themes.${config.omarchy.theme}; else themes.${config.omarchy.theme};
# Generate color scheme from wallpaper for generated themes # Generate color scheme from wallpaper for generated themes
generatedColorScheme = if (config.omarchy.theme == "generated_light" || config.omarchy.theme == "generated_dark") || (config.omarchy.theme_overrides ? wallpaper_path) generatedColorScheme = if (config.omarchy.theme == "generated_light" || config.omarchy.theme == "generated_dark")
then (inputs.nix-colors.lib.contrib { inherit pkgs; }).colorSchemeFromPicture { then (inputs.nix-colors.lib.contrib { inherit pkgs; }).colorSchemeFromPicture {
path = config.omarchy.theme_overrides.wallpaper_path; path = config.omarchy.theme_overrides.wallpaper_path;
variant = if config.omarchy.theme == "generated_light" then "light" else "dark"; variant = if config.omarchy.theme == "generated_light" then "light" else "dark";
@@ -47,7 +47,7 @@ in {
}; };
home.packages = packages.homePackages; home.packages = packages.homePackages;
colorScheme = if (config.omarchy.theme == "generated_light" || config.omarchy.theme == "generated_dark") || (config.omarchy.theme_overrides ? wallpaper_path) colorScheme = if (config.omarchy.theme == "generated_light" || config.omarchy.theme == "generated_dark")
then generatedColorScheme then generatedColorScheme
else inputs.nix-colors.colorSchemes.${selectedTheme.base16-theme}; else inputs.nix-colors.colorSchemes.${selectedTheme.base16-theme};