From 7bcd9b27b20ae29ab089e57c085ecf510c11a0ce Mon Sep 17 00:00:00 2001 From: S4NKALP Date: Tue, 29 Jul 2025 00:49:03 +0545 Subject: [PATCH] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20refactor(dock):=20use=20Hy?= =?UTF-8?q?prlandWorkspaces=20and=20HyprlandLanguage=20widgets?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/hypr/colors.conf | 38 +++++++++++++-------------- modules/dock/components/__init__.py | 4 +-- modules/dock/components/workspaces.py | 10 +++---- 3 files changed, 26 insertions(+), 26 deletions(-) diff --git a/config/hypr/colors.conf b/config/hypr/colors.conf index 7b1e021..21d1017 100644 --- a/config/hypr/colors.conf +++ b/config/hypr/colors.conf @@ -1,27 +1,27 @@ -$wallpaper = /home/sankalp/Pictures/wallpapers/spidy2.jpg -$background = 161217 -$foreground = eae0e7 +$wallpaper = /home/sankalp/Pictures/wallpapers/spiderverse.jpg +$background = 0f1416 +$foreground = dee3e6 -$primary = e7b6f0 -$secondary = d5c0d6 -$tertiary = f5b7b2 -$surface = 161217 -$surface_bright = 3d373d -$outline = 988e97 +$primary = 88d1ec +$secondary = b3cad4 +$tertiary = c3c3eb +$surface = 0f1416 +$surface_bright = 353a3d +$outline = 8a9296 $error = ff5945 $shadow = 000000 $red = ffb2b9 -$green = b7d085 -$yellow = dec56e -$blue = cebdfe -$magenta = ecb4ec -$cyan = 82d3e2 +$green = 95d5a7 +$yellow = b8cf84 +$blue = afc6ff +$magenta = e4b7f3 +$cyan = 82d3e1 $white = 82d3e0 $red_dim = ff4c5c -$green_dim = 89ad42 -$yellow_dim = bb9b2b -$blue_dim = 8359fc -$magenta_dim = d763d7 -$cyan_dim = 30b5ce +$green_dim = 4cb86a +$yellow_dim = 8baa43 +$blue_dim = 497dff +$magenta_dim = c360e4 +$cyan_dim = 31b5cc diff --git a/modules/dock/components/__init__.py b/modules/dock/components/__init__.py index 8d685fe..9410f86 100644 --- a/modules/dock/components/__init__.py +++ b/modules/dock/components/__init__.py @@ -5,7 +5,7 @@ import os import gi from fabric.hyprland.service import HyprlandEvent -from fabric.hyprland.widgets import Language, get_hyprland_connection +from fabric.hyprland.widgets import HyprlandLanguage, get_hyprland_connection from fabric.utils import get_relative_path from fabric.widgets.box import Box from fabric.widgets.button import Button @@ -174,7 +174,7 @@ class DockComponents(Box): lang_data = ( event.data[1] if event and event.data and len(event.data) > 1 - else Language().get_label() + else HyprlandLanguage().get_label() ) self.language.set_tooltip_text(lang_data) if not data.VERTICAL: diff --git a/modules/dock/components/workspaces.py b/modules/dock/components/workspaces.py index 408a1bd..0ba3de3 100644 --- a/modules/dock/components/workspaces.py +++ b/modules/dock/components/workspaces.py @@ -2,7 +2,7 @@ import json import subprocess from fabric.hyprland.service import Hyprland -from fabric.hyprland.widgets import WorkspaceButton, Workspaces +from fabric.hyprland.widgets import WorkspaceButton, HyprlandWorkspaces from fabric.widgets.box import Box from fabric.widgets.button import Button @@ -83,7 +83,7 @@ class Workspace(Button): self.set_label(str(self.activeWorkspace)) -workspaces = Workspaces( +workspaces = HyprlandWorkspaces( name="workspaces", invert_scroll=True, empty_scroll=True, @@ -104,10 +104,10 @@ workspaces = Workspaces( ], buttons_factory=None if data.DOCK_HIDE_SPECIAL_WORKSPACE - else Workspaces.default_buttons_factory, + else HyprlandWorkspaces.default_buttons_factory, ) -workspaces_num = Workspaces( +workspaces_num = HyprlandWorkspaces( name="workspaces-num", invert_scroll=True, empty_scroll=True, @@ -129,7 +129,7 @@ workspaces_num = Workspaces( ], buttons_factory=None if data.DOCK_HIDE_SPECIAL_WORKSPACE - else Workspaces.default_buttons_factory, + else HyprlandWorkspaces.default_buttons_factory, )