minor changes to workflows to prevent preemptive exits/failures
This commit is contained in:
@@ -18,9 +18,10 @@ jobs:
|
||||
git
|
||||
|
||||
- name: Prettier
|
||||
continue-on-error: true
|
||||
run: |
|
||||
if [ -n "$(find . \( -iname "*.js" -o -iname "*.jsx" -o -iname "*.ts" -o -iname "*.tsx" -o -iname "*.mjs" -o -iname "*.cjs" \) -print -quit)" ]; then
|
||||
npx --yes prettier --check "**/*.{js,jsx,ts,tsx,mjs,cjs}" --ignore-path .gitignore
|
||||
npx --yes prettier --check "**/*.{js,jsx,ts,tsx,mjs,cjs}" --ignore-path .prettierignore
|
||||
else
|
||||
echo "No JS/TS files found"
|
||||
fi
|
||||
|
||||
@@ -23,6 +23,7 @@ jobs:
|
||||
pip install --no-cache-dir ruff
|
||||
|
||||
- name: Format check
|
||||
continue-on-error: true
|
||||
run: |
|
||||
. .venv/bin/activate
|
||||
ruff format --check .
|
||||
|
||||
@@ -18,9 +18,11 @@ jobs:
|
||||
git \
|
||||
cargo \
|
||||
rust \
|
||||
rustfmt \
|
||||
rust-clippy
|
||||
|
||||
- name: Format check
|
||||
continue-on-error: true
|
||||
run: |
|
||||
if [ -n "$(find . -name "Cargo.toml" -print -quit)" ]; then
|
||||
find . -name "Cargo.toml" -print0 | while IFS= read -r -d '' manifest; do
|
||||
|
||||
@@ -1,2 +1,3 @@
|
||||
.venv/
|
||||
scripts/fzf.js
|
||||
scripts/fuzzysort.js
|
||||
|
||||
@@ -9,14 +9,8 @@ _data = {
|
||||
"variants": {
|
||||
"type": "multi",
|
||||
"defaults": {
|
||||
"dark": {
|
||||
"m3flavor": "mocha",
|
||||
"m3accent": "mauve"
|
||||
},
|
||||
"light": {
|
||||
"m3flavor": "latte",
|
||||
"m3accent": "mauve"
|
||||
}
|
||||
"dark": {"m3flavor": "mocha", "m3accent": "mauve"},
|
||||
"light": {"m3flavor": "latte", "m3accent": "mauve"},
|
||||
},
|
||||
"flavors": [
|
||||
{
|
||||
@@ -35,8 +29,8 @@ _data = {
|
||||
"m3surfaceContainerHighest": "#dce0e8",
|
||||
"m3error": "#d20f39",
|
||||
"m3warning": "#fe640b",
|
||||
"m3info": "#1e66f5"
|
||||
}
|
||||
"m3info": "#1e66f5",
|
||||
},
|
||||
},
|
||||
{
|
||||
"id": "frappe",
|
||||
@@ -54,8 +48,8 @@ _data = {
|
||||
"m3surfaceContainerHighest": "#232634",
|
||||
"m3error": "#e78284",
|
||||
"m3warning": "#ef9f76",
|
||||
"m3info": "#8caaee"
|
||||
}
|
||||
"m3info": "#8caaee",
|
||||
},
|
||||
},
|
||||
{
|
||||
"id": "macchiato",
|
||||
@@ -73,8 +67,8 @@ _data = {
|
||||
"m3surfaceContainerHighest": "#181926",
|
||||
"m3error": "#ed8796",
|
||||
"m3warning": "#f5a97f",
|
||||
"m3info": "#8aadf4"
|
||||
}
|
||||
"m3info": "#8aadf4",
|
||||
},
|
||||
},
|
||||
{
|
||||
"id": "mocha",
|
||||
@@ -92,9 +86,9 @@ _data = {
|
||||
"m3surfaceContainerHighest": "#11111b",
|
||||
"m3error": "#f38ba8",
|
||||
"m3warning": "#fab387",
|
||||
"m3info": "#89b4fa"
|
||||
}
|
||||
}
|
||||
"m3info": "#89b4fa",
|
||||
},
|
||||
},
|
||||
],
|
||||
"accents": [
|
||||
{
|
||||
@@ -105,29 +99,29 @@ _data = {
|
||||
"m3primaryText": "#eff1f5",
|
||||
"m3primaryContainer": "#e1a99d",
|
||||
"m3secondary": "#d8c7c4",
|
||||
"m3surfaceTint": "#e1a99d"
|
||||
"m3surfaceTint": "#e1a99d",
|
||||
},
|
||||
"frappe": {
|
||||
"m3primary": "#f2d5cf",
|
||||
"m3primaryText": "#303446",
|
||||
"m3primaryContainer": "#b8a5a6",
|
||||
"m3secondary": "#a2748b",
|
||||
"m3surfaceTint": "#b8a5a6"
|
||||
"m3surfaceTint": "#b8a5a6",
|
||||
},
|
||||
"macchiato": {
|
||||
"m3primary": "#f4dbd6",
|
||||
"m3primaryText": "#24273a",
|
||||
"m3primaryContainer": "#b6a6a7",
|
||||
"m3secondary": "#9f6f8d",
|
||||
"m3surfaceTint": "#b6a6a7"
|
||||
"m3surfaceTint": "#b6a6a7",
|
||||
},
|
||||
"mocha": {
|
||||
"m3primary": "#f5e0dc",
|
||||
"m3primaryText": "#1e1e2e",
|
||||
"m3primaryContainer": "#b5a6a8",
|
||||
"m3secondary": "#9d6d87",
|
||||
"m3surfaceTint": "#b5a6a8"
|
||||
}
|
||||
"m3surfaceTint": "#b5a6a8",
|
||||
},
|
||||
},
|
||||
{
|
||||
"id": "flamingo",
|
||||
@@ -137,29 +131,29 @@ _data = {
|
||||
"m3primaryText": "#eff1f5",
|
||||
"m3primaryContainer": "#e29c9d",
|
||||
"m3secondary": "#d7c3c4",
|
||||
"m3surfaceTint": "#e29c9d"
|
||||
"m3surfaceTint": "#e29c9d",
|
||||
},
|
||||
"frappe": {
|
||||
"m3primary": "#eebebe",
|
||||
"m3primaryText": "#303446",
|
||||
"m3primaryContainer": "#b5949a",
|
||||
"m3secondary": "#9d6b80",
|
||||
"m3surfaceTint": "#b5949a"
|
||||
"m3surfaceTint": "#b5949a",
|
||||
},
|
||||
"macchiato": {
|
||||
"m3primary": "#f0c6c6",
|
||||
"m3primaryText": "#24273a",
|
||||
"m3primaryContainer": "#b3979c",
|
||||
"m3secondary": "#996780",
|
||||
"m3surfaceTint": "#b3979c"
|
||||
"m3surfaceTint": "#b3979c",
|
||||
},
|
||||
"mocha": {
|
||||
"m3primary": "#f2cdcd",
|
||||
"m3primaryText": "#1e1e2e",
|
||||
"m3primaryContainer": "#b3999e",
|
||||
"m3secondary": "#98667c",
|
||||
"m3surfaceTint": "#b3999e"
|
||||
}
|
||||
"m3surfaceTint": "#b3999e",
|
||||
},
|
||||
},
|
||||
{
|
||||
"id": "pink",
|
||||
@@ -169,29 +163,29 @@ _data = {
|
||||
"m3primaryText": "#eff1f5",
|
||||
"m3primaryContainer": "#eb9bd7",
|
||||
"m3secondary": "#d9c7d5",
|
||||
"m3surfaceTint": "#eb9bd7"
|
||||
"m3surfaceTint": "#eb9bd7",
|
||||
},
|
||||
"frappe": {
|
||||
"m3primary": "#f4b8e4",
|
||||
"m3primaryText": "#303446",
|
||||
"m3primaryContainer": "#b990b5",
|
||||
"m3secondary": "#996e9e",
|
||||
"m3surfaceTint": "#b990b5"
|
||||
"m3surfaceTint": "#b990b5",
|
||||
},
|
||||
"macchiato": {
|
||||
"m3primary": "#f5bde6",
|
||||
"m3primaryText": "#24273a",
|
||||
"m3primaryContainer": "#b791b2",
|
||||
"m3secondary": "#95689a",
|
||||
"m3surfaceTint": "#b791b2"
|
||||
"m3surfaceTint": "#b791b2",
|
||||
},
|
||||
"mocha": {
|
||||
"m3primary": "#f5c2e7",
|
||||
"m3primaryText": "#1e1e2e",
|
||||
"m3primaryContainer": "#b591b0",
|
||||
"m3secondary": "#966597",
|
||||
"m3surfaceTint": "#b591b0"
|
||||
}
|
||||
"m3surfaceTint": "#b591b0",
|
||||
},
|
||||
},
|
||||
{
|
||||
"id": "mauve",
|
||||
@@ -201,29 +195,29 @@ _data = {
|
||||
"m3primaryText": "#eff1f5",
|
||||
"m3primaryContainer": "#a670f1",
|
||||
"m3secondary": "#c2b8d0",
|
||||
"m3surfaceTint": "#a670f1"
|
||||
"m3surfaceTint": "#a670f1",
|
||||
},
|
||||
"frappe": {
|
||||
"m3primary": "#ca9ee6",
|
||||
"m3primaryText": "#303446",
|
||||
"m3primaryContainer": "#9c7eb6",
|
||||
"m3secondary": "#7d6799",
|
||||
"m3surfaceTint": "#9c7eb6"
|
||||
"m3surfaceTint": "#9c7eb6",
|
||||
},
|
||||
"macchiato": {
|
||||
"m3primary": "#c6a0f6",
|
||||
"m3primaryText": "#24273a",
|
||||
"m3primaryContainer": "#967cbe",
|
||||
"m3secondary": "#766597",
|
||||
"m3surfaceTint": "#967cbe"
|
||||
"m3surfaceTint": "#967cbe",
|
||||
},
|
||||
"mocha": {
|
||||
"m3primary": "#cba6f7",
|
||||
"m3primaryText": "#1e1e2e",
|
||||
"m3primaryContainer": "#977ebb",
|
||||
"m3secondary": "#756294",
|
||||
"m3surfaceTint": "#977ebb"
|
||||
}
|
||||
"m3surfaceTint": "#977ebb",
|
||||
},
|
||||
},
|
||||
{
|
||||
"id": "red",
|
||||
@@ -233,29 +227,29 @@ _data = {
|
||||
"m3primaryText": "#eff1f5",
|
||||
"m3primaryContainer": "#da5371",
|
||||
"m3secondary": "#c0a0a8",
|
||||
"m3surfaceTint": "#da5371"
|
||||
"m3surfaceTint": "#da5371",
|
||||
},
|
||||
"frappe": {
|
||||
"m3primary": "#e78284",
|
||||
"m3primaryText": "#303446",
|
||||
"m3primaryContainer": "#b06a72",
|
||||
"m3secondary": "#8b5d66",
|
||||
"m3surfaceTint": "#b06a72"
|
||||
"m3surfaceTint": "#b06a72",
|
||||
},
|
||||
"macchiato": {
|
||||
"m3primary": "#ed8796",
|
||||
"m3primaryText": "#24273a",
|
||||
"m3primaryContainer": "#b16b7a",
|
||||
"m3secondary": "#865a69",
|
||||
"m3surfaceTint": "#b16b7a"
|
||||
"m3surfaceTint": "#b16b7a",
|
||||
},
|
||||
"mocha": {
|
||||
"m3primary": "#f38ba8",
|
||||
"m3primaryText": "#1e1e2e",
|
||||
"m3primaryContainer": "#b46b84",
|
||||
"m3secondary": "#85596b",
|
||||
"m3surfaceTint": "#b46b84"
|
||||
}
|
||||
"m3surfaceTint": "#b46b84",
|
||||
},
|
||||
},
|
||||
{
|
||||
"id": "maroon",
|
||||
@@ -265,29 +259,29 @@ _data = {
|
||||
"m3primaryText": "#eff1f5",
|
||||
"m3primaryContainer": "#e87883",
|
||||
"m3secondary": "#cfb7ba",
|
||||
"m3surfaceTint": "#e87883"
|
||||
"m3surfaceTint": "#e87883",
|
||||
},
|
||||
"frappe": {
|
||||
"m3primary": "#ea999c",
|
||||
"m3primaryText": "#303446",
|
||||
"m3primaryContainer": "#b27a83",
|
||||
"m3secondary": "#92626f",
|
||||
"m3surfaceTint": "#b27a83"
|
||||
"m3surfaceTint": "#b27a83",
|
||||
},
|
||||
"macchiato": {
|
||||
"m3primary": "#ee99a0",
|
||||
"m3primaryText": "#24273a",
|
||||
"m3primaryContainer": "#b27781",
|
||||
"m3secondary": "#8c5e6c",
|
||||
"m3surfaceTint": "#b27781"
|
||||
"m3surfaceTint": "#b27781",
|
||||
},
|
||||
"mocha": {
|
||||
"m3primary": "#eba0ac",
|
||||
"m3primaryText": "#1e1e2e",
|
||||
"m3primaryContainer": "#ae7987",
|
||||
"m3secondary": "#895b6c",
|
||||
"m3surfaceTint": "#ae7987"
|
||||
}
|
||||
"m3surfaceTint": "#ae7987",
|
||||
},
|
||||
},
|
||||
{
|
||||
"id": "peach",
|
||||
@@ -297,29 +291,29 @@ _data = {
|
||||
"m3primaryText": "#eff1f5",
|
||||
"m3primaryContainer": "#f98e51",
|
||||
"m3secondary": "#c9b7ad",
|
||||
"m3surfaceTint": "#f98e51"
|
||||
"m3surfaceTint": "#f98e51",
|
||||
},
|
||||
"frappe": {
|
||||
"m3primary": "#ef9f76",
|
||||
"m3primaryText": "#303446",
|
||||
"m3primaryContainer": "#b67f68",
|
||||
"m3secondary": "#8f6a5f",
|
||||
"m3surfaceTint": "#b67f68"
|
||||
"m3surfaceTint": "#b67f68",
|
||||
},
|
||||
"macchiato": {
|
||||
"m3primary": "#f5a97f",
|
||||
"m3primaryText": "#24273a",
|
||||
"m3primaryContainer": "#b7836a",
|
||||
"m3secondary": "#8c695e",
|
||||
"m3surfaceTint": "#b7836a"
|
||||
"m3surfaceTint": "#b7836a",
|
||||
},
|
||||
"mocha": {
|
||||
"m3primary": "#fab387",
|
||||
"m3primaryText": "#1e1e2e",
|
||||
"m3primaryContainer": "#b8876d",
|
||||
"m3secondary": "#8b6a5d",
|
||||
"m3surfaceTint": "#b8876d"
|
||||
}
|
||||
"m3surfaceTint": "#b8876d",
|
||||
},
|
||||
},
|
||||
{
|
||||
"id": "yellow",
|
||||
@@ -329,29 +323,29 @@ _data = {
|
||||
"m3primaryText": "#eff1f5",
|
||||
"m3primaryContainer": "#e4ac5d",
|
||||
"m3secondary": "#c6baaa",
|
||||
"m3surfaceTint": "#e4ac5d"
|
||||
"m3surfaceTint": "#e4ac5d",
|
||||
},
|
||||
"frappe": {
|
||||
"m3primary": "#e5c890",
|
||||
"m3primaryText": "#303446",
|
||||
"m3primaryContainer": "#af9b7a",
|
||||
"m3secondary": "#948062",
|
||||
"m3surfaceTint": "#af9b7a"
|
||||
"m3surfaceTint": "#af9b7a",
|
||||
},
|
||||
"macchiato": {
|
||||
"m3primary": "#eed49f",
|
||||
"m3primaryText": "#24273a",
|
||||
"m3primaryContainer": "#b2a181",
|
||||
"m3secondary": "#947e62",
|
||||
"m3surfaceTint": "#b2a181"
|
||||
"m3surfaceTint": "#b2a181",
|
||||
},
|
||||
"mocha": {
|
||||
"m3primary": "#f9e2af",
|
||||
"m3primaryText": "#1e1e2e",
|
||||
"m3primaryContainer": "#b8a889",
|
||||
"m3secondary": "#978265",
|
||||
"m3surfaceTint": "#b8a889"
|
||||
}
|
||||
"m3surfaceTint": "#b8a889",
|
||||
},
|
||||
},
|
||||
{
|
||||
"id": "green",
|
||||
@@ -361,29 +355,29 @@ _data = {
|
||||
"m3primaryText": "#eff1f5",
|
||||
"m3primaryContainer": "#74b867",
|
||||
"m3secondary": "#9fbd9b",
|
||||
"m3surfaceTint": "#74b867"
|
||||
"m3surfaceTint": "#74b867",
|
||||
},
|
||||
"frappe": {
|
||||
"m3primary": "#a6d189",
|
||||
"m3primaryText": "#303446",
|
||||
"m3primaryContainer": "#83a275",
|
||||
"m3secondary": "#648e5e",
|
||||
"m3surfaceTint": "#83a275"
|
||||
"m3surfaceTint": "#83a275",
|
||||
},
|
||||
"macchiato": {
|
||||
"m3primary": "#a6da95",
|
||||
"m3primaryText": "#24273a",
|
||||
"m3primaryContainer": "#80a57a",
|
||||
"m3secondary": "#5c8a61",
|
||||
"m3surfaceTint": "#80a57a"
|
||||
"m3surfaceTint": "#80a57a",
|
||||
},
|
||||
"mocha": {
|
||||
"m3primary": "#a6e3a1",
|
||||
"m3primaryText": "#1e1e2e",
|
||||
"m3primaryContainer": "#7ea87f",
|
||||
"m3secondary": "#5b8964",
|
||||
"m3surfaceTint": "#7ea87f"
|
||||
}
|
||||
"m3surfaceTint": "#7ea87f",
|
||||
},
|
||||
},
|
||||
{
|
||||
"id": "teal",
|
||||
@@ -393,29 +387,29 @@ _data = {
|
||||
"m3primaryText": "#eff1f5",
|
||||
"m3primaryContainer": "#57aeb4",
|
||||
"m3secondary": "#93b4b7",
|
||||
"m3surfaceTint": "#57aeb4"
|
||||
"m3surfaceTint": "#57aeb4",
|
||||
},
|
||||
"frappe": {
|
||||
"m3primary": "#81c8be",
|
||||
"m3primaryText": "#303446",
|
||||
"m3primaryContainer": "#699b9a",
|
||||
"m3secondary": "#588084",
|
||||
"m3surfaceTint": "#699b9a"
|
||||
"m3surfaceTint": "#699b9a",
|
||||
},
|
||||
"macchiato": {
|
||||
"m3primary": "#8bd5ca",
|
||||
"m3primaryText": "#24273a",
|
||||
"m3primaryContainer": "#6da29f",
|
||||
"m3secondary": "#577e83",
|
||||
"m3surfaceTint": "#6da29f"
|
||||
"m3surfaceTint": "#6da29f",
|
||||
},
|
||||
"mocha": {
|
||||
"m3primary": "#94e2d5",
|
||||
"m3primaryText": "#1e1e2e",
|
||||
"m3primaryContainer": "#71a8a4",
|
||||
"m3secondary": "#588284",
|
||||
"m3surfaceTint": "#71a8a4"
|
||||
}
|
||||
"m3surfaceTint": "#71a8a4",
|
||||
},
|
||||
},
|
||||
{
|
||||
"id": "sky",
|
||||
@@ -425,29 +419,29 @@ _data = {
|
||||
"m3primaryText": "#eff1f5",
|
||||
"m3primaryContainer": "#4abcea",
|
||||
"m3secondary": "#a4b9c2",
|
||||
"m3surfaceTint": "#4abcea"
|
||||
"m3surfaceTint": "#4abcea",
|
||||
},
|
||||
"frappe": {
|
||||
"m3primary": "#99d1db",
|
||||
"m3primaryText": "#303446",
|
||||
"m3primaryContainer": "#79a2af",
|
||||
"m3secondary": "#628494",
|
||||
"m3surfaceTint": "#79a2af"
|
||||
"m3surfaceTint": "#79a2af",
|
||||
},
|
||||
"macchiato": {
|
||||
"m3primary": "#91d7e3",
|
||||
"m3primaryText": "#24273a",
|
||||
"m3primaryContainer": "#71a3b0",
|
||||
"m3secondary": "#5e7e8c",
|
||||
"m3surfaceTint": "#71a3b0"
|
||||
"m3surfaceTint": "#71a3b0",
|
||||
},
|
||||
"mocha": {
|
||||
"m3primary": "#89dceb",
|
||||
"m3primaryText": "#1e1e2e",
|
||||
"m3primaryContainer": "#69a3b3",
|
||||
"m3secondary": "#5a7b88",
|
||||
"m3surfaceTint": "#69a3b3"
|
||||
}
|
||||
"m3surfaceTint": "#69a3b3",
|
||||
},
|
||||
},
|
||||
{
|
||||
"id": "sapphire",
|
||||
@@ -457,29 +451,29 @@ _data = {
|
||||
"m3primaryText": "#eff1f5",
|
||||
"m3primaryContainer": "#5db8c8",
|
||||
"m3secondary": "#9eb9be",
|
||||
"m3surfaceTint": "#5db8c8"
|
||||
"m3surfaceTint": "#5db8c8",
|
||||
},
|
||||
"frappe": {
|
||||
"m3primary": "#85c1dc",
|
||||
"m3primaryText": "#303446",
|
||||
"m3primaryContainer": "#6b96af",
|
||||
"m3secondary": "#5e7b8e",
|
||||
"m3surfaceTint": "#6b96af"
|
||||
"m3surfaceTint": "#6b96af",
|
||||
},
|
||||
"macchiato": {
|
||||
"m3primary": "#7dc4e4",
|
||||
"m3primaryText": "#24273a",
|
||||
"m3primaryContainer": "#6396b1",
|
||||
"m3secondary": "#5a7486",
|
||||
"m3surfaceTint": "#6396b1"
|
||||
"m3surfaceTint": "#6396b1",
|
||||
},
|
||||
"mocha": {
|
||||
"m3primary": "#74c7ec",
|
||||
"m3primaryText": "#1e1e2e",
|
||||
"m3primaryContainer": "#5a95b4",
|
||||
"m3secondary": "#567080",
|
||||
"m3surfaceTint": "#5a95b4"
|
||||
}
|
||||
"m3surfaceTint": "#5a95b4",
|
||||
},
|
||||
},
|
||||
{
|
||||
"id": "blue",
|
||||
@@ -489,29 +483,29 @@ _data = {
|
||||
"m3primaryText": "#eff1f5",
|
||||
"m3primaryContainer": "#5c90f5",
|
||||
"m3secondary": "#b1bacb",
|
||||
"m3surfaceTint": "#5c90f5"
|
||||
"m3surfaceTint": "#5c90f5",
|
||||
},
|
||||
"frappe": {
|
||||
"m3primary": "#8caaee",
|
||||
"m3primaryText": "#303446",
|
||||
"m3primaryContainer": "#7086bc",
|
||||
"m3secondary": "#637195",
|
||||
"m3surfaceTint": "#7086bc"
|
||||
"m3surfaceTint": "#7086bc",
|
||||
},
|
||||
"macchiato": {
|
||||
"m3primary": "#8aadf4",
|
||||
"m3primaryText": "#24273a",
|
||||
"m3primaryContainer": "#6c85bc",
|
||||
"m3secondary": "#5f6d8f",
|
||||
"m3surfaceTint": "#6c85bc"
|
||||
"m3surfaceTint": "#6c85bc",
|
||||
},
|
||||
"mocha": {
|
||||
"m3primary": "#89b4fa",
|
||||
"m3primaryText": "#1e1e2e",
|
||||
"m3primaryContainer": "#6987bd",
|
||||
"m3secondary": "#5d6c8b",
|
||||
"m3surfaceTint": "#6987bd"
|
||||
}
|
||||
"m3surfaceTint": "#6987bd",
|
||||
},
|
||||
},
|
||||
{
|
||||
"id": "lavender",
|
||||
@@ -521,30 +515,30 @@ _data = {
|
||||
"m3primaryText": "#eff1f5",
|
||||
"m3primaryContainer": "#97a7fb",
|
||||
"m3secondary": "#cdcfdd",
|
||||
"m3surfaceTint": "#97a7fb"
|
||||
"m3surfaceTint": "#97a7fb",
|
||||
},
|
||||
"frappe": {
|
||||
"m3primary": "#babbf1",
|
||||
"m3primaryText": "#303446",
|
||||
"m3primaryContainer": "#9192be",
|
||||
"m3secondary": "#7175a1",
|
||||
"m3surfaceTint": "#9192be"
|
||||
"m3surfaceTint": "#9192be",
|
||||
},
|
||||
"macchiato": {
|
||||
"m3primary": "#b7bdf8",
|
||||
"m3primaryText": "#24273a",
|
||||
"m3primaryContainer": "#8b91bf",
|
||||
"m3secondary": "#6b709d",
|
||||
"m3surfaceTint": "#8b91bf"
|
||||
"m3surfaceTint": "#8b91bf",
|
||||
},
|
||||
"mocha": {
|
||||
"m3primary": "#b4befe",
|
||||
"m3primaryText": "#1e1e2e",
|
||||
"m3primaryContainer": "#878ec0",
|
||||
"m3secondary": "#676d99",
|
||||
"m3surfaceTint": "#878ec0"
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
"m3surfaceTint": "#878ec0",
|
||||
},
|
||||
},
|
||||
],
|
||||
},
|
||||
}
|
||||
|
||||
@@ -23,64 +23,71 @@ app = typer.Typer()
|
||||
@app.command()
|
||||
def generate(
|
||||
# image inputs (optional - used for image mode)
|
||||
image_path: Optional[Path] = typer.Option(
|
||||
None, help="Path to source image. Required for image mode."),
|
||||
image_path: Optional[Path] = typer.Option(None, help="Path to source image. Required for image mode."),
|
||||
scheme: Optional[str] = typer.Option(
|
||||
None, help="Color scheme algorithm to use for image mode. Ignored in preset mode."),
|
||||
None, help="Color scheme algorithm to use for image mode. Ignored in preset mode."
|
||||
),
|
||||
# preset inputs (optional - used for preset mode)
|
||||
preset: Optional[str] = typer.Option(
|
||||
None, help="Name of a premade scheme in this format: <preset_name>:<preset_flavor>"),
|
||||
mode: Optional[str] = typer.Option(
|
||||
None, help="Mode of the preset scheme (dark or light)."),
|
||||
None, help="Name of a premade scheme in this format: <preset_name>:<preset_flavor>"
|
||||
),
|
||||
mode: Optional[str] = typer.Option(None, help="Mode of the preset scheme (dark or light)."),
|
||||
):
|
||||
|
||||
HOME = str(os.getenv("HOME"))
|
||||
OUTPUT = Path(HOME + "/.local/state/zshell/scheme.json")
|
||||
SEQ_STATE = Path(HOME + "/.local/state/zshell/sequences.txt")
|
||||
THUMB_PATH = Path(HOME +
|
||||
"/.cache/zshell/imagecache/thumbnail.jpg")
|
||||
WALL_DIR_PATH = Path(HOME +
|
||||
"/.local/state/zshell/wallpaper_path.json")
|
||||
THUMB_PATH = Path(HOME + "/.cache/zshell/imagecache/thumbnail.jpg")
|
||||
WALL_DIR_PATH = Path(HOME + "/.local/state/zshell/wallpaper_path.json")
|
||||
|
||||
TEMPLATE_DIR = Path(HOME + "/.config/zshell/templates")
|
||||
WALL_PATH = Path()
|
||||
CONFIG = Path(HOME + "/.config/zshell/config.json")
|
||||
|
||||
if preset is not None and image_path is not None:
|
||||
raise typer.BadParameter(
|
||||
"Use either --image-path or --preset, not both.")
|
||||
raise typer.BadParameter("Use either --image-path or --preset, not both.")
|
||||
|
||||
def get_scheme_class(scheme_name: str):
|
||||
match scheme_name:
|
||||
case "fruit-salad":
|
||||
from materialyoucolor.scheme.scheme_fruit_salad import SchemeFruitSalad
|
||||
|
||||
return SchemeFruitSalad
|
||||
case "expressive":
|
||||
from materialyoucolor.scheme.scheme_expressive import SchemeExpressive
|
||||
|
||||
return SchemeExpressive
|
||||
case "monochrome":
|
||||
from materialyoucolor.scheme.scheme_monochrome import SchemeMonochrome
|
||||
|
||||
return SchemeMonochrome
|
||||
case "rainbow":
|
||||
from materialyoucolor.scheme.scheme_rainbow import SchemeRainbow
|
||||
|
||||
return SchemeRainbow
|
||||
case "tonal-spot":
|
||||
from materialyoucolor.scheme.scheme_tonal_spot import SchemeTonalSpot
|
||||
|
||||
return SchemeTonalSpot
|
||||
case "neutral":
|
||||
from materialyoucolor.scheme.scheme_neutral import SchemeNeutral
|
||||
|
||||
return SchemeNeutral
|
||||
case "fidelity":
|
||||
from materialyoucolor.scheme.scheme_fidelity import SchemeFidelity
|
||||
|
||||
return SchemeFidelity
|
||||
case "content":
|
||||
from materialyoucolor.scheme.scheme_content import SchemeContent
|
||||
|
||||
return SchemeContent
|
||||
case "vibrant":
|
||||
from materialyoucolor.scheme.scheme_vibrant import SchemeVibrant
|
||||
|
||||
return SchemeVibrant
|
||||
case _:
|
||||
from materialyoucolor.scheme.scheme_fruit_salad import SchemeFruitSalad
|
||||
|
||||
return SchemeFruitSalad
|
||||
|
||||
def hex_to_hct(hex_color: str) -> Hct:
|
||||
@@ -163,16 +170,11 @@ def generate(
|
||||
def harmonize(from_hct: Hct, to_hct: Hct, tone_boost: float) -> Hct:
|
||||
diff = difference_degrees(from_hct.hue, to_hct.hue)
|
||||
rotation = min(diff * 0.8, 100)
|
||||
output_hue = sanitize_degrees_double(
|
||||
from_hct.hue
|
||||
+ rotation * rotation_direction(from_hct.hue, to_hct.hue)
|
||||
)
|
||||
output_hue = sanitize_degrees_double(from_hct.hue + rotation * rotation_direction(from_hct.hue, to_hct.hue))
|
||||
tone = max(0.0, min(100.0, from_hct.tone * (1 + tone_boost)))
|
||||
return Hct.from_hct(output_hue, from_hct.chroma, tone)
|
||||
|
||||
def terminal_palette(
|
||||
colors: dict[str, str], mode: str, variant: str
|
||||
) -> dict[str, str]:
|
||||
def terminal_palette(colors: dict[str, str], mode: str, variant: str) -> dict[str, str]:
|
||||
light = mode.lower() == "light"
|
||||
|
||||
key_hex = (
|
||||
@@ -307,7 +309,7 @@ def generate(
|
||||
"seed": seed.to_int(),
|
||||
"flavor": flavor,
|
||||
"variant": variant,
|
||||
"colors": colors
|
||||
"colors": colors,
|
||||
}
|
||||
|
||||
for k, v in colors.items():
|
||||
@@ -349,7 +351,7 @@ def generate(
|
||||
|
||||
def tmux_wrap_sequences(seq: str) -> str:
|
||||
ESC = "\x1b"
|
||||
return f"{ESC}Ptmux;{seq.replace(ESC, ESC+ESC)}{ESC}\\"
|
||||
return f"{ESC}Ptmux;{seq.replace(ESC, ESC + ESC)}{ESC}\\"
|
||||
|
||||
def parse_output_directive(first_line: str) -> Optional[Path]:
|
||||
s = first_line.strip()
|
||||
@@ -406,8 +408,7 @@ def generate(
|
||||
template = env.from_string(body)
|
||||
text = template.render(**context)
|
||||
except Exception as e:
|
||||
raise RuntimeError(
|
||||
f"Template render failed for '{rel}': {e}") from e
|
||||
raise RuntimeError(f"Template render failed for '{rel}': {e}") from e
|
||||
|
||||
out_path.write_text(text, encoding="utf-8")
|
||||
|
||||
@@ -435,18 +436,13 @@ def generate(
|
||||
try:
|
||||
return PRESETS[name].primary
|
||||
except KeyError:
|
||||
raise typer.BadParameter(
|
||||
f"Preset '{name}' not found. Available presets: {', '.join(PRESETS.keys())}")
|
||||
raise typer.BadParameter(f"Preset '{name}' not found. Available presets: {', '.join(PRESETS.keys())}")
|
||||
|
||||
def generate_color_scheme(seed: Hct, mode: str, scheme_class) -> dict[str, str]:
|
||||
|
||||
is_dark = mode.lower() == "dark"
|
||||
|
||||
scheme = scheme_class(
|
||||
seed,
|
||||
is_dark,
|
||||
0.0
|
||||
)
|
||||
scheme = scheme_class(seed, is_dark, 0.0)
|
||||
|
||||
color_dict = {}
|
||||
for color in vars(MaterialDynamicColors).keys():
|
||||
@@ -499,7 +495,7 @@ def generate(
|
||||
"mode": effective_mode,
|
||||
"variant": scheme,
|
||||
"colors": colors,
|
||||
"seed": seed.to_int()
|
||||
"seed": seed.to_int(),
|
||||
}
|
||||
|
||||
if TEMPLATE_DIR is not None:
|
||||
@@ -511,7 +507,7 @@ def generate(
|
||||
wallpaper_path=wp,
|
||||
name=name,
|
||||
flavor=flavor,
|
||||
variant=scheme
|
||||
variant=scheme,
|
||||
)
|
||||
|
||||
rendered = render_all_templates(
|
||||
|
||||
@@ -8,11 +8,9 @@ app = typer.Typer()
|
||||
|
||||
@app.command()
|
||||
def start():
|
||||
subprocess.run(args + ["ipc"] + ["call"] +
|
||||
["picker"] + ["open"], check=True)
|
||||
subprocess.run(args + ["ipc"] + ["call"] + ["picker"] + ["open"], check=True)
|
||||
|
||||
|
||||
@app.command()
|
||||
def start_freeze():
|
||||
subprocess.run(args + ["ipc"] + ["call"] +
|
||||
["picker"] + ["openFreeze"], check=True)
|
||||
subprocess.run(args + ["ipc"] + ["call"] + ["picker"] + ["openFreeze"], check=True)
|
||||
|
||||
@@ -33,5 +33,4 @@ def lock():
|
||||
|
||||
@app.command()
|
||||
def call(target: str, method: str, method_args: list[str] = typer.Argument(None)):
|
||||
subprocess.run(args + ["ipc"] + ["call"] + [target] +
|
||||
[method] + method_args, check=True)
|
||||
subprocess.run(args + ["ipc"] + ["call"] + [target] + [method] + method_args, check=True)
|
||||
|
||||
@@ -12,8 +12,7 @@ app = typer.Typer()
|
||||
|
||||
@app.command()
|
||||
def set(wallpaper: Path):
|
||||
subprocess.run(args + ["ipc"] + ["call"] +
|
||||
["wallpaper"] + ["set"] + [wallpaper], check=True)
|
||||
subprocess.run(args + ["ipc"] + ["call"] + ["wallpaper"] + ["set"] + [wallpaper], check=True)
|
||||
|
||||
|
||||
@app.command()
|
||||
@@ -26,15 +25,15 @@ def lockscreen(
|
||||
Path,
|
||||
typer.Option(),
|
||||
],
|
||||
blur_amount: int = 20
|
||||
blur_amount: int = 20,
|
||||
):
|
||||
img = Image.open(input_image)
|
||||
size = img.size
|
||||
if (blur_amount == 0):
|
||||
if blur_amount == 0:
|
||||
img.save(output_path, "PNG")
|
||||
return
|
||||
|
||||
if (size[0] < 3840 or size[1] < 2160):
|
||||
if size[0] < 3840 or size[1] < 2160:
|
||||
img = img.resize((size[0] // 2, size[1] // 2), Image.NEAREST)
|
||||
else:
|
||||
img = img.resize((size[0] // 4, size[1] // 4), Image.NEAREST)
|
||||
|
||||
Reference in New Issue
Block a user