Merge pull request #48 from InioX/dev

Dev

Cargo.toml

@@ -18,11 +18,10 @@ edition = "2021"
 [target.'cfg(windows)'.dependencies]
 winapi = { version = "0.3", features = ["winuser"] }
 
-[target.'cfg(macos)'.dependencies]
+[dependencies]
+# This is here because of #43
 enquote = "1.1.0"
 
-[dependencies]
-material-color-utilities-rs = { version = "0.5.0",package = "ini-material-color-utilities-rs", path = "material-color-utilities-rs", features = ["serde", "clap"] }
 image = "0.24.6"
 owo-colors = "4.0.0"
 clap = { version = "4.2.4", features = ["derive"] }
@@ -40,6 +39,5 @@ serde_json = "1.0.107"
 update-informer = "1.1.0"
 upon = "0.8.0"
 reqwest = { version = "0.11.23", default_features=false, features = ["blocking", "rustls-tls"] }
-
-[workspace]
-members = ["material-color-utilities-rs"]
+material-colors = "0.1.4"
+ahash = "0.8.7"

example/colors.whatever-extension

@@ -0,0 +1,50 @@
+source_color {{colors.source_color.default.hex}};
+
+primary {{colors.primary.default.hex}};
+on_primary {{colors.on_primary.default.hex}};
+primary_container {{colors.primary_container.default.hex}};
+on_primary_container {{colors.on_primary_container.default.hex}};
+inverse_primary {{colors.inverse_primary.default.hex}};
+primary_fixed {{colors.primary_fixed.default.hex}};
+primary_fixed_dim {{colors.primary_fixed_dim.default.hex}};
+on_primary_fixed {{colors.on_primary_fixed.default.hex}};
+on_primary_fixed_variant {{colors.on_primary_fixed_variant.default.hex}};
+secondary {{colors.secondary.default.hex}};
+on_secondary {{colors.on_secondary.default.hex}};
+secondary_container {{colors.secondary_container.default.hex}};
+on_secondary_container {{colors.on_secondary_container.default.hex}};
+secondary_fixed {{colors.secondary_fixed.default.hex}};
+secondary_fixed_dim {{colors.secondary_fixed_dim.default.hex}};
+on_secondary_fixed {{colors.on_secondary_fixed.default.hex}};
+on_secondary_fixed_variant {{colors.on_secondary_fixed_variant.default.hex}};
+tertiary {{colors.tertiary.default.hex}};
+on_tertiary {{colors.on_tertiary.default.hex}};
+tertiary_container {{colors.tertiary_container.default.hex}};
+on_tertiary_container {{colors.on_tertiary_container.default.hex}};
+tertiary_fixed {{colors.tertiary_fixed.default.hex}};
+tertiary_fixed_dim {{colors.tertiary_fixed_dim.default.hex}};
+on_tertiary_fixed {{colors.on_tertiary_fixed.default.hex}};
+on_tertiary_fixed_variant {{colors.on_tertiary_fixed_variant.default.hex}};
+error {{colors.error.default.hex}};
+on_error {{colors.on_error.default.hex}};
+error_container {{colors.error_container.default.hex}};
+on_error_container {{colors.on_error_container.default.hex}};
+surface_dim {{colors.surface_dim.default.hex}};
+surface {{colors.surface.default.hex}};
+surface_bright {{colors.surface_bright.default.hex}};
+surface_container_lowest {{colors.surface_container_lowest.default.hex}};
+surface_container_low {{colors.surface_container_low.default.hex}};
+surface_container {{colors.surface_container.default.hex}};
+surface_container_high {{colors.surface_container_high.default.hex}};
+surface_container_highest {{colors.surface_container_highest.default.hex}};
+on_surface {{colors.on_surface.default.hex}};
+on_surface_variant {{colors.on_surface_variant.default.hex}};
+outline {{colors.outline.default.hex}};
+outline_variant {{colors.outline_variant.default.hex}};
+inverse_surface {{colors.inverse_surface.default.hex}};
+inverse_on_surface {{colors.inverse_on_surface.default.hex}};
+surface_variant {{colors.surface_variant.default.hex}};
+background {{colors.background.default.hex}};
+on_background {{colors.on_background.default.hex}};
+shadow {{colors.shadow.default.hex}};
+scrim {{colors.scrim.default.hex}};

example/config.toml

@@ -8,5 +8,5 @@ swww_options = [
 ]
 
 [templates.name1]
-input_path = "example/colors.css"
-output_path = "example/a/colors-generated.css"
+input_path = "example/colors.whatever-extension"
+output_path = "example/a/colors-generated.whatever-extension"

module.nix

@@ -47,7 +47,7 @@ matugen: {
       else ""
     } \
       --mode ${cfg.variant} \
-      --palette ${cfg.palette} \
+      --type ${cfg.type} \
       --json ${cfg.jsonFormat} \
       --quiet \
       > $out/theme.json
@@ -89,10 +89,10 @@ in {
       '';
     };
 
-    palette = lib.mkOption {
+    type = lib.mkOption {
       description = "Palette used when generating the colorschemes.";
-      type = lib.types.enum ["default" "triadic" "adjacent"];
-      default = osCfg.palette or "default";
+      type = lib.types.enum ["scheme-content" "scheme-expressive" "scheme-fidelity" "scheme-fruit-salad" "scheme-monochrome" "scheme-neutral" "scheme-rainbow" "scheme-tonal-spot"];
+      default = osCfg.palette or "scheme-tonal-spot";
       example = "triadic";
     };