diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..1471c73 --- /dev/null +++ b/.gitignore @@ -0,0 +1,20 @@ +# Python +__pycache__/ +*.pyc +*.pyo +*.pyd + +# Poetry +.venv/ +dist/ +build/ + +# IDE +.vscode/ +.idea/ + +# OS +.DS_Store + +# logs +*.log \ No newline at end of file diff --git a/README.md b/README.md index 79fd677..7d9c076 100644 --- a/README.md +++ b/README.md @@ -46,7 +46,7 @@ - Q: **_"How do I configure Wayle ?"_**\ A: Take a look to the [wayle repository](https://github.com/wayle-rs/wayle) or to *~/.config/wayle/config.toml.example*. You will see all the available options, try them, and enjoy ! - Q: **_"How can I choose between other colors than the ones already implemented ?"_**\ - A: Either wait for the CLI configurator (WIP), or just select your favourite colors from the [catppuccin palette](https://catppuccin.com/palette/) and manually apply them into *~/.config/wayle/config/toml* + A: Check releases, or just select your favourite colors from the [catppuccin palette](https://catppuccin.com/palette/) and manually apply them into *~/.config/wayle/config/toml* ## 💝 Thanks to diff --git a/cli/README.md b/cli/README.md deleted file mode 100644 index e69de29..0000000 diff --git a/cli/pyproject.toml b/cli/pyproject.toml deleted file mode 100644 index ec64af5..0000000 --- a/cli/pyproject.toml +++ /dev/null @@ -1,22 +0,0 @@ -[project] -name = "cli" -version = "0.1.0" -description = "" -authors = [ - {name = "GaetanQu",email = "gaetan.quenouille.gq@gmail.com"} -] -readme = "README.md" -requires-python = ">=3.14,<4.0" -dependencies = [ - "catppuccin (>=2.5.0,<3.0.0)", - "inquirerpy (>=0.3.4,<0.4.0)", - "rich (>=14.3.3,<15.0.0)", - "tomlkit (>=0.14.0,<0.15.0)", -] - -[tool.poetry] -packages = [{include = "cli", from = "src"}] - -[build-system] -requires = ["poetry-core>=2.0.0,<3.0.0"] -build-backend = "poetry.core.masonry.api" diff --git a/cli/src/cli/__pycache__/cli_helpers.cpython-314.pyc b/cli/src/cli/__pycache__/cli_helpers.cpython-314.pyc deleted file mode 100644 index d3683c9..0000000 Binary files a/cli/src/cli/__pycache__/cli_helpers.cpython-314.pyc and /dev/null differ diff --git a/cli/src/cli/__pycache__/config.cpython-314.pyc b/cli/src/cli/__pycache__/config.cpython-314.pyc deleted file mode 100644 index 8b87e1c..0000000 Binary files a/cli/src/cli/__pycache__/config.cpython-314.pyc and /dev/null differ diff --git a/cli/src/cli/__pycache__/config_manager.cpython-314.pyc b/cli/src/cli/__pycache__/config_manager.cpython-314.pyc deleted file mode 100644 index 558c8f7..0000000 Binary files a/cli/src/cli/__pycache__/config_manager.cpython-314.pyc and /dev/null differ diff --git a/cli/src/cli/__pycache__/defaults.cpython-314.pyc b/cli/src/cli/__pycache__/defaults.cpython-314.pyc deleted file mode 100644 index 1150f43..0000000 Binary files a/cli/src/cli/__pycache__/defaults.cpython-314.pyc and /dev/null differ diff --git a/cli/src/cli/__pycache__/palette_utils.cpython-314.pyc b/cli/src/cli/__pycache__/palette_utils.cpython-314.pyc deleted file mode 100644 index 8f2c1a8..0000000 Binary files a/cli/src/cli/__pycache__/palette_utils.cpython-314.pyc and /dev/null differ diff --git a/cli/src/cli/__pycache__/recommended.cpython-314.pyc b/cli/src/cli/__pycache__/recommended.cpython-314.pyc deleted file mode 100644 index 565959e..0000000 Binary files a/cli/src/cli/__pycache__/recommended.cpython-314.pyc and /dev/null differ diff --git a/cli/src/cli/__pycache__/recommended_colors.cpython-314.pyc b/cli/src/cli/__pycache__/recommended_colors.cpython-314.pyc deleted file mode 100644 index 1e0ae95..0000000 Binary files a/cli/src/cli/__pycache__/recommended_colors.cpython-314.pyc and /dev/null differ diff --git a/cli/poetry.lock b/poetry.lock similarity index 56% rename from cli/poetry.lock rename to poetry.lock index 88f2a84..e5bc9f3 100644 --- a/cli/poetry.lock +++ b/poetry.lock @@ -37,42 +37,6 @@ prompt-toolkit = ">=3.0.1,<4.0.0" [package.extras] docs = ["Sphinx (>=4.1.2,<5.0.0)", "furo (>=2021.8.17b43,<2022.0.0)", "myst-parser (>=0.15.1,<0.16.0)", "sphinx-autobuild (>=2021.3.14,<2022.0.0)", "sphinx-copybutton (>=0.4.0,<0.5.0)"] -[[package]] -name = "markdown-it-py" -version = "4.0.0" -description = "Python port of markdown-it. Markdown parsing, done right!" -optional = false -python-versions = ">=3.10" -groups = ["main"] -files = [ - {file = "markdown_it_py-4.0.0-py3-none-any.whl", hash = "sha256:87327c59b172c5011896038353a81343b6754500a08cd7a4973bb48c6d578147"}, - {file = "markdown_it_py-4.0.0.tar.gz", hash = "sha256:cb0a2b4aa34f932c007117b194e945bd74e0ec24133ceb5bac59009cda1cb9f3"}, -] - -[package.dependencies] -mdurl = ">=0.1,<1.0" - -[package.extras] -benchmarking = ["psutil", "pytest", "pytest-benchmark"] -compare = ["commonmark (>=0.9,<1.0)", "markdown (>=3.4,<4.0)", "markdown-it-pyrs", "mistletoe (>=1.0,<2.0)", "mistune (>=3.0,<4.0)", "panflute (>=2.3,<3.0)"] -linkify = ["linkify-it-py (>=1,<3)"] -plugins = ["mdit-py-plugins (>=0.5.0)"] -profiling = ["gprof2dot"] -rtd = ["ipykernel", "jupyter_sphinx", "mdit-py-plugins (>=0.5.0)", "myst-parser", "pyyaml", "sphinx", "sphinx-book-theme (>=1.0,<2.0)", "sphinx-copybutton", "sphinx-design"] -testing = ["coverage", "pytest", "pytest-cov", "pytest-regressions", "requests"] - -[[package]] -name = "mdurl" -version = "0.1.2" -description = "Markdown URL utilities" -optional = false -python-versions = ">=3.7" -groups = ["main"] -files = [ - {file = "mdurl-0.1.2-py3-none-any.whl", hash = "sha256:84008a41e51615a49fc9966191ff91509e3c40b939176e643fd50a5c2196b8f8"}, - {file = "mdurl-0.1.2.tar.gz", hash = "sha256:bb413d29f5eea38f31dd4754dd7377d4465116fb207585f97bf925588687c1ba"}, -] - [[package]] name = "pfzy" version = "0.3.4" @@ -103,40 +67,6 @@ files = [ [package.dependencies] wcwidth = "*" -[[package]] -name = "pygments" -version = "2.20.0" -description = "Pygments is a syntax highlighting package written in Python." -optional = false -python-versions = ">=3.9" -groups = ["main"] -files = [ - {file = "pygments-2.20.0-py3-none-any.whl", hash = "sha256:81a9e26dd42fd28a23a2d169d86d7ac03b46e2f8b59ed4698fb4785f946d0176"}, - {file = "pygments-2.20.0.tar.gz", hash = "sha256:6757cd03768053ff99f3039c1a36d6c0aa0b263438fcab17520b30a303a82b5f"}, -] - -[package.extras] -windows-terminal = ["colorama (>=0.4.6)"] - -[[package]] -name = "rich" -version = "14.3.3" -description = "Render rich text, tables, progress bars, syntax highlighting, markdown and more to the terminal" -optional = false -python-versions = ">=3.8.0" -groups = ["main"] -files = [ - {file = "rich-14.3.3-py3-none-any.whl", hash = "sha256:793431c1f8619afa7d3b52b2cdec859562b950ea0d4b6b505397612db8d5362d"}, - {file = "rich-14.3.3.tar.gz", hash = "sha256:b8daa0b9e4eef54dd8cf7c86c03713f53241884e814f4e2f5fb342fe520f639b"}, -] - -[package.dependencies] -markdown-it-py = ">=2.2.0" -pygments = ">=2.13.0,<3.0.0" - -[package.extras] -jupyter = ["ipywidgets (>=7.5.1,<9)"] - [[package]] name = "tomlkit" version = "0.14.0" @@ -164,4 +94,4 @@ files = [ [metadata] lock-version = "2.1" python-versions = ">=3.14,<4.0" -content-hash = "5506c0c118f4ac50022b587a3b6d521681b3159b7251ee76d4fe16cca5518145" +content-hash = "d5638dbe9fbeb11b331b2d761390e9374b26ba1b62a3c8afafb25294b3edc98d" diff --git a/pyproject.toml b/pyproject.toml new file mode 100644 index 0000000..0fbf5fa --- /dev/null +++ b/pyproject.toml @@ -0,0 +1,21 @@ +[tool.poetry] +name = "wayle-ctp" +version = "0.1.0" +description = "" +authors = ["GaetanQu "] +readme = "README.md" + +packages = [{include = "cli", from = "src"}] + +[tool.poetry.dependencies] +python = ">=3.14,<4.0" +catppuccin = ">=2.5.0,<3.0.0" +inquirerpy = ">=0.3.4,<0.4.0" +tomlkit = ">=0.14.0,<0.15.0" + +[tool.poetry.scripts] +wayle-ctp = "cli.main:main" + +[build-system] +requires = ["poetry-core>=2.0.0,<3.0.0"] +build-backend = "poetry.core.masonry.api" diff --git a/release/themes/catppuccin-frappe.toml b/release/themes/catppuccin-frappe.toml new file mode 100644 index 0000000..7a091a9 --- /dev/null +++ b/release/themes/catppuccin-frappe.toml @@ -0,0 +1,16 @@ +[styling.palette] +# Background +bg = "#303446" +surface = "#292c3c" +elevated = "#414559" + +# Foreground & text +primary = "#c6d0f5" +fg = "#c6d0f5" +fg-muted = "#a5adce" + +# Color palette +blue = "#8caaee" +green = "#a6d189" +red = "#e78284" +yellow = "#e5c890" diff --git a/release/themes/catppuccin-latte.toml b/release/themes/catppuccin-latte.toml new file mode 100644 index 0000000..b0c86e9 --- /dev/null +++ b/release/themes/catppuccin-latte.toml @@ -0,0 +1,16 @@ +[styling.palette] +# Background +bg = "#eff1f5" +surface = "#e6e9ef" +elevated = "#ccd0da" + +# Foreground & text +primary = "#4c4f69" +fg = "#4c4f69" +fg-muted = "#6c6f85" + +# Color palette +blue = "#1e66f5" +green = "#40a02b" +red = "#d20f39" +yellow = "#df8e1d" diff --git a/release/themes/catppuccin-macchiato.toml b/release/themes/catppuccin-macchiato.toml new file mode 100644 index 0000000..6092169 --- /dev/null +++ b/release/themes/catppuccin-macchiato.toml @@ -0,0 +1,16 @@ +[styling.palette] +# Background +bg = "#24273a" +surface = "#1e2030" +elevated = "#363a4f" + +# Foreground & text +primary = "#cad3f5" +fg = "#cad3f5" +fg-muted = "#a5adcb" + +# Color palette +blue = "#8aadf4" +green = "#a6da95" +red = "#ed8796" +yellow = "#eed49f" diff --git a/release/themes/catppuccin-mocha.toml b/release/themes/catppuccin-mocha.toml new file mode 100644 index 0000000..94183f2 --- /dev/null +++ b/release/themes/catppuccin-mocha.toml @@ -0,0 +1,16 @@ +[styling.palette] +# Background +bg = "#1e1e2e" +surface = "#181825" +elevated = "#313244" + +# Foreground & text +primary = "#cdd6f4" +fg = "#cdd6f4" +fg-muted = "#a6adc8" + +# Color palette +blue = "#89b4fa" +green = "#a6e3a1" +red = "#f38ba8" +yellow = "#f9e2af" diff --git a/release/wayle_ctp-0.1.0-py3-none-any.whl b/release/wayle_ctp-0.1.0-py3-none-any.whl new file mode 100644 index 0000000..951a364 Binary files /dev/null and b/release/wayle_ctp-0.1.0-py3-none-any.whl differ diff --git a/release/wayle_ctp-0.1.0.tar.gz b/release/wayle_ctp-0.1.0.tar.gz new file mode 100644 index 0000000..5f50571 Binary files /dev/null and b/release/wayle_ctp-0.1.0.tar.gz differ diff --git a/cli/src/cli/__init__.py b/src/cli/__init__.py similarity index 100% rename from cli/src/cli/__init__.py rename to src/cli/__init__.py diff --git a/cli/src/cli/cli_helpers.py b/src/cli/cli_helpers.py similarity index 98% rename from cli/src/cli/cli_helpers.py rename to src/cli/cli_helpers.py index 1bcb41f..73df5cf 100644 --- a/cli/src/cli/cli_helpers.py +++ b/src/cli/cli_helpers.py @@ -1,7 +1,7 @@ from InquirerPy import inquirer from InquirerPy.separator import Separator -import palette_utils -from config_manager import ConfigManager +import cli.palette_utils +from cli.config_manager import ConfigManager class MenuOption(): def __init__(self, label:str, action:callable = None, value:str = None): diff --git a/cli/src/cli/config.py b/src/cli/config.py similarity index 97% rename from cli/src/cli/config.py rename to src/cli/config.py index 9db23e3..056c56d 100644 --- a/cli/src/cli/config.py +++ b/src/cli/config.py @@ -1,5 +1,5 @@ from catppuccin import PALETTE -from recommended import Recommended +from cli.recommended import Recommended Recommended = Recommended() diff --git a/cli/src/cli/config_manager.py b/src/cli/config_manager.py similarity index 100% rename from cli/src/cli/config_manager.py rename to src/cli/config_manager.py diff --git a/cli/src/cli/main.py b/src/cli/main.py similarity index 78% rename from cli/src/cli/main.py rename to src/cli/main.py index 40630c9..12b9ef3 100644 --- a/cli/src/cli/main.py +++ b/src/cli/main.py @@ -1,8 +1,8 @@ # Functions imports -from cli_helpers import * +from cli.cli_helpers import * # Config import -from config import config +from cli.config import config def main(): main_menu = Menu( diff --git a/cli/src/cli/palette_utils.py b/src/cli/palette_utils.py similarity index 100% rename from cli/src/cli/palette_utils.py rename to src/cli/palette_utils.py diff --git a/cli/src/cli/recommended.py b/src/cli/recommended.py similarity index 100% rename from cli/src/cli/recommended.py rename to src/cli/recommended.py diff --git a/cli/tests/__init__.py b/tests/__init__.py similarity index 100% rename from cli/tests/__init__.py rename to tests/__init__.py