diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 673a898..0000000 --- a/.gitignore +++ /dev/null @@ -1,176 +0,0 @@ -# ---> Python -# Byte-compiled / optimized / DLL files -**/__pycache__/** -*.py[cod] -*$py.class - -# C extensions -*.so - -# Distribution / packaging -.Python -build/ -develop-eggs/ -dist/ -downloads/ -eggs/ -.eggs/ -lib/ -lib64/ -parts/ -sdist/ -var/ -wheels/ -share/python-wheels/ -*.egg-info/ -.installed.cfg -*.egg -MANIFEST - -# PyInstaller -# Usually these files are written by a python script from a template -# before PyInstaller builds the exe, so as to inject date/other infos into it. -*.manifest -*.spec - -# Installer logs -pip-log.txt -pip-delete-this-directory.txt - -# Unit test / coverage reports -htmlcov/ -.tox/ -.nox/ -.coverage -.coverage.* -.cache -nosetests.xml -coverage.xml -*.cover -*.py,cover -.hypothesis/ -.pytest_cache/ -cover/ - -# Translations -*.mo -*.pot - -# Django stuff: -*.log -local_settings.py -db.sqlite3 -db.sqlite3-journal - -# Flask stuff: -instance/ -.webassets-cache - -# Scrapy stuff: -.scrapy - -# Sphinx documentation -docs/_build/ - -# PyBuilder -.pybuilder/ -target/ - -# Jupyter Notebook -.ipynb_checkpoints - -# IPython -profile_default/ -ipython_config.py - -# pyenv -# For a library or package, you might want to ignore these files since the code is -# intended to run in multiple environments; otherwise, check them in: -# .python-version - -# pipenv -# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control. -# However, in case of collaboration, if having platform-specific dependencies or dependencies -# having no cross-platform support, pipenv may install dependencies that don't work, or not -# install all needed dependencies. -#Pipfile.lock - -# UV -# Similar to Pipfile.lock, it is generally recommended to include uv.lock in version control. -# This is especially recommended for binary packages to ensure reproducibility, and is more -# commonly ignored for libraries. -#uv.lock - -# poetry -# Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control. -# This is especially recommended for binary packages to ensure reproducibility, and is more -# commonly ignored for libraries. -# https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control -#poetry.lock - -# pdm -# Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control. -#pdm.lock -# pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it -# in version control. -# https://pdm.fming.dev/latest/usage/project/#working-with-version-control -.pdm.toml -.pdm-python -.pdm-build/ - -# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm -__pypackages__/ - -# Celery stuff -celerybeat-schedule -celerybeat.pid - -# SageMath parsed files -*.sage.py - -# Environments -.env -.venv -env/ -venv/ -ENV/ -env.bak/ -venv.bak/ - -# Spyder project settings -.spyderproject -.spyproject - -# Rope project settings -.ropeproject - -# mkdocs documentation -/site - -# mypy -.mypy_cache/ -.dmypy.json -dmypy.json - -# Pyre type checker -.pyre/ - -# pytype static type analyzer -.pytype/ - -# Cython debug symbols -cython_debug/ - -# PyCharm -# JetBrains specific template is maintained in a separate JetBrains.gitignore that can -# be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore -# and can be added to the global gitignore or merged into this file. For a more nuclear -# option (not recommended) you can uncomment the following to ignore the entire idea folder. -#.idea/ - -# Ruff stuff: -.ruff_cache/ - -# PyPI configuration file -.pypirc - diff --git a/modules/screens.py b/modules/screens.py index b03f973..7037695 100644 --- a/modules/screens.py +++ b/modules/screens.py @@ -22,7 +22,7 @@ from popups.calendar import calendar from popups.mpris2_layout import MPRIS2_LAYOUT from popups.volume_notification import VOL_POPUP -from res.themes.colors import gruvbox_dark +from res.themes.colors import gruvbox_dark as THEME # -------------------------------------------------------- @@ -31,14 +31,10 @@ from res.themes.colors import gruvbox_dark def get_groupbox_rules(monitor_specific=True): # Base rules applied to all GroupBoxes rules = [ - GroupBoxRule(text_colour=gruvbox_dark["bg3"]).when( - focused=False, occupied=True - ), - GroupBoxRule(text_colour=gruvbox_dark["aqua"]).when( - focused=False, occupied=False - ), - GroupBoxRule(text_colour=gruvbox_dark["fg3"]).when(focused=True), - GroupBoxRule(text_colour=gruvbox_dark["red"]).when( + GroupBoxRule(text_colour=THEME["bg3"]).when(focused=False, occupied=True), + GroupBoxRule(text_colour=THEME["aqua"]).when(focused=False, occupied=False), + GroupBoxRule(text_colour=THEME["fg3"]).when(focused=True), + GroupBoxRule(text_colour=THEME["red"]).when( focused=False, occupied=True, urgent=True ), GroupBoxRule(visible=False).when(focused=False, occupied=False), @@ -56,7 +52,7 @@ def get_groupbox_rules(monitor_specific=True): widget_defaults = dict( font="Roboto Flex", fontsize=20, - foreground=gruvbox_dark["fg1"], + foreground=THEME["fg1"], ) extension_defaults = widget_defaults.copy() @@ -79,7 +75,7 @@ screens = [ widget.TextBox( text="", fontsize=24, - foreground=gruvbox_dark["blue"], + foreground=THEME["blue"], mouse_callbacks={"Button1": lazy.function(start_menu)}, ), widget.GroupBox2( @@ -122,10 +118,17 @@ screens = [ popup_show_args={"relative_to": 8, "y": -70}, ), ], +<<<<<<< HEAD background=BACKGROUND, opacity=OPACITY, size=SIZE, margin=MARGIN, +======= + background=THEME["bg0_hard"], + opacity=0.75, + size=32, + margin=[3, 3, 0, 3], +>>>>>>> unify_colors ), ), Screen( @@ -135,7 +138,7 @@ screens = [ widget.TextBox( text="", fontsize=24, - foreground=gruvbox_dark["blue"], + foreground=THEME["blue"], mouse_callbacks={"Button1": lazy.function(start_menu)}, ), widget.GroupBox2( @@ -174,10 +177,17 @@ screens = [ mouse_callbacks={"Button1": lazy.function(power_menu)}, ), ], +<<<<<<< HEAD background=BACKGROUND, opacity=OPACITY, size=SIZE, margin=MARGIN, +======= + background=THEME["bg0_hard"], + opacity=0.75, + size=32, + margin=[3, 3, 0, 3], +>>>>>>> unify_colors ), ), Screen( @@ -187,7 +197,7 @@ screens = [ widget.TextBox( text="", fontsize=24, - foreground=gruvbox_dark["blue"], + foreground=THEME["blue"], mouse_callbacks={"Button1": lazy.function(start_menu)}, ), widget.GroupBox2( @@ -212,7 +222,7 @@ screens = [ width=350, scroll=True, scroll_clear=True, - foreground=gruvbox_dark["fg1"], + foreground=THEME["fg1"], format="{xesam:title} - {xesam:artist}", paused_text="{track} ", popup_layout=MPRIS2_LAYOUT, @@ -229,10 +239,17 @@ screens = [ mouse_callbacks={"Button1": lazy.function(power_menu)}, ), ], +<<<<<<< HEAD background=BACKGROUND, opacity=OPACITY, size=SIZE, margin=MARGIN, +======= + background=THEME["bg0_hard"], + opacity=0.75, + size=32, + margin=[3, 3, 0, 3], +>>>>>>> unify_colors ), ), ] @@ -242,12 +259,17 @@ notifier = Notifier( width=350, height=80, format="{summary}\n{app_name}\n{body}", +<<<<<<< HEAD # file_name="/home/cerberus/.config/qtile/res/images/normal.png", # Not working foreground=gruvbox_dark["fg1"], +======= + # file_name='/home/cerberus/.config/qtile/normal.png', # Not working + foreground=THEME["fg1"], +>>>>>>> unify_colors background=( - gruvbox_dark["bg0_hard"], - gruvbox_dark["bg0_hard"], - gruvbox_dark["orange"], + THEME["bg0_hard"], + THEME["bg0_hard"], + THEME["orange"], ), horizontal_padding=10, vertical_padding=10, diff --git a/res/themes/colors.py b/res/themes/colors.py index 31b1a77..4e7fec9 100644 --- a/res/themes/colors.py +++ b/res/themes/colors.py @@ -4,22 +4,67 @@ gruvbox_dark = { "bg0_hard": "#1d2021", # Background, hard "bg0_soft": "#32302f", # Background, soft - "bg0_normal": "#282828", # Background, normal + "bg0_normal": "#282828", # Background, normal "bg1": "#3c3836", # Secondary background "bg2": "#504945", # Background, darker "bg3": "#665c54", # Background, lighter "bg4": "#7c6f64", # Background, lightest - "fg0": "#fbf1c7", # Foreground, light "fg1": "#ebdbb2", # Foreground, normal "fg2": "#d5c4a1", # Foreground, slightly dark "fg3": "#bdae93", # Foreground, dark + "red": "#cc241d", # Red + "orange": "#d65d0e", # Orange + "yellow": "#d79921", # Yellow + "green": "#98971a", # Green + "aqua": "#689d6a", # Aqua + "blue": "#458588", # Blue + "purple": "#b16286", # Purple +} +gruvbox_light = { + # Backgrounds (Helle Töne) + "bg0_hard": "#f9f5d7", # Background, hard (sehr helles Beige) + "bg0_soft": "#f2e5bc", # Background, soft + "bg0_normal": "#fbf1c7", # Background, normal (der Standard-Look) + "bg1": "#ebdbb2", # Secondary background + "bg2": "#d5c4a1", # Background, darker (UI Elemente) + "bg3": "#bdae93", # Background, lighter + "bg4": "#a89984", # Background, lightest + # Foregrounds (Dunkle Töne für Text) + "fg0": "#282828", # Foreground, light (eigentlich dunkelster Text) + "fg1": "#3c3836", # Foreground, normal + "fg2": "#504945", # Foreground, slightly dark + "fg3": "#665c54", # Foreground, dark + # Colors (Angepasst für Kontrast auf hellem Grund) + "red": "#9d0006", # Red + "orange": "#af3a03", # Orange + "yellow": "#b57614", # Yellow + "green": "#79740e", # Green + "aqua": "#427b58", # Aqua + "blue": "#076678", # Blue + "purple": "#8f3f71", # Purple +} +everforest_dark = { + # Backgrounds + "bg0_hard": "#272e33", # Background, hard + "bg0_soft": "#333c43", # Background, soft + "bg0_normal": "#2d353b", # Background, normal + "bg1": "#3d484d", # Secondary background + "bg2": "#475258", # Background, darker (UI elements) + "bg3": "#4f585e", # Background, lighter + "bg4": "#56635f", # Background, lightest + # Foregrounds + "fg0": "#d3c6aa", # Foreground, light + "fg1": "#e6e2cc", # Foreground, normal + "fg2": "#dbd6bd", # Foreground, slightly dark + "fg3": "#9da9a0", # Foreground, dark + # Colors + "red": "#e67e80", # Red + "orange": "#e69875", # Orange + "yellow": "#dbbc7f", # Yellow + "green": "#a7c080", # Green + "aqua": "#83c092", # Aqua + "blue": "#7fbbb3", # Blue + "purple": "#d699b6", # Purple +} - "red": "#cc241d", # Red - "orange": "#d65d0e", # Orange - "yellow": "#d79921", # Yellow - "green": "#98971a", # Green - "aqua": "#689d6a", # Aqua - "blue": "#458588", # Blue - "purple": "#b16286" # Purple -} \ No newline at end of file