Update theme system

README.md

@@ -69,21 +69,39 @@ Omarchy-nix includes several predefined themes:
 - `gruvbox`
 - `gruvbox-light`
 
-You can also generate a custom theme from any wallpaper image:
+You can also generate themes from wallpaper images using:
+- `generated_light` - generates a light color scheme from wallpaper
+- `generated_dark` - generates a dark color scheme from wallpaper
+
+Generated themes require a wallpaper path to be specified:
 
 ```nix
 {
   omarchy = {
-    theme = "custom";
-    customTheme = {
-      wallpaperPath = ./path/to/your/wallpaper.png;
-      variant = "dark"; # or "light" for light themes
+    theme = "generated_dark"; # or "generated_light"
+    theme_overrides = {
+      wallpaper_path = ./path/to/your/wallpaper.png;
     };
   };
 }
 ```
 
-This will automatically extract colors from your wallpaper and generate a matching color scheme for all Omarchy applications (terminal, editor, launcher, etc.). 
+#### Wallpaper Overrides
+
+Any theme can be customized with a custom wallpaper by specifying `wallpaper_path` in theme_overrides. For predefined themes, this will only change the wallpaper but keep the original color scheme:
+
+```nix
+{
+  omarchy = {
+    theme = "tokyo-night"; # or any other predefined theme
+    theme_overrides = {
+      wallpaper_path = ./path/to/your/wallpaper.png;
+    };
+  };
+}
+```
+
+Generated themes automatically extract colors from the wallpaper and create a matching color scheme for all Omarchy applications (terminal, editor, launcher, etc.). 
 
 ## License
 

config.nix

@@ -17,27 +17,23 @@ lib: {
         "nord"
         "gruvbox"
         "gruvbox-light"
-        "custom"
+        "generated_light"
+        "generated_dark"
       ]) lib.types.str;
       default = "tokyo-night";
       description = "Theme to use for Omarchy configuration";
     };
-    customTheme = lib.mkOption {
+    theme_overrides = lib.mkOption {
       type = lib.types.submodule {
         options = {
-          wallpaperPath = lib.mkOption {
+          wallpaper_path = lib.mkOption {
             type = lib.types.path;
             description = "Path to the wallpaper image to extract colors from";
           };
-          variant = lib.mkOption {
-            type = lib.types.enum [ "light" "dark" ];
-            default = "dark";
-            description = "Color scheme variant to extract (light or dark)";
-          };
         };
       };
       default = {};
-      description = "Custom theme configuration when theme is set to 'custom'";
+      description = "Theme overrides including wallpaper path for generated themes";
     };
     primary_font = lib.mkOption {
       type = lib.types.str;

lib/selected-wallpaper.nix

@@ -21,9 +21,9 @@ config: let
     ];
   };
 
-  # Handle custom wallpaper path
-  wallpaper_path = if cfg.theme == "custom"
-    then toString cfg.customTheme.wallpaperPath
+  # Handle wallpaper path for generated themes and overrides
+  wallpaper_path = if (cfg.theme == "generated_light" || cfg.theme == "generated_dark") || (cfg.theme_overrides ? wallpaper_path)
+    then toString cfg.theme_overrides.wallpaper_path
     else let
       selected_wallpaper = builtins.elemAt (wallpapers.${cfg.theme}) 0;
     in "~/Pictures/Wallpapers/${selected_wallpaper}";

modules/home-manager/default.nix

@@ -8,16 +8,16 @@ inputs: {
 
   themes = import ../themes.nix;
   
-  # Handle theme selection - either predefined or custom
-  selectedTheme = if config.omarchy.theme == "custom"
-    then themes.custom
+  # Handle theme selection - either predefined or generated
+  selectedTheme = if (config.omarchy.theme == "generated_light" || config.omarchy.theme == "generated_dark")
+    then null
     else themes.${config.omarchy.theme};
   
-  # Generate color scheme - either from predefined or from wallpaper
-  generatedColorScheme = if config.omarchy.theme == "custom"
+  # 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)
     then (inputs.nix-colors.lib.contrib { inherit pkgs; }).colorSchemeFromPicture {
-      path = config.omarchy.customTheme.wallpaperPath;
-      variant = config.omarchy.customTheme.variant;
+      path = config.omarchy.theme_overrides.wallpaper_path;
+      variant = if config.omarchy.theme == "generated_light" then "light" else "dark";
     }
     else null;
 in {
@@ -47,7 +47,7 @@ in {
   };
   home.packages = packages.homePackages;
 
-  colorScheme = if config.omarchy.theme == "custom"
+  colorScheme = if (config.omarchy.theme == "generated_light" || config.omarchy.theme == "generated_dark") || (config.omarchy.theme_overrides ? wallpaper_path)
     then generatedColorScheme
     else inputs.nix-colors.colorSchemes.${selectedTheme.base16-theme};
 

modules/home-manager/waybar.nix

@@ -6,6 +6,7 @@ inputs: {
   palette = config.colorScheme.palette;
   convert = inputs.nix-colors.lib.conversions.hexToRGBString;
   backgroundRgb = "rgb(${convert ", " palette.base00})";
+  foregroundRgb = "rgb(${convert ", " palette.base05})";
 in {
   home.file = {
     ".config/waybar/" = {
@@ -16,7 +17,7 @@ in {
       text = ''
         @define-color background ${backgroundRgb};
         * {
-          color: white; 
+          color: ${foregroundRgb}; 
         }
 
         window#waybar {