diff --git a/config/ags/colors.json b/config/ags/colors.json index ad03dcbc..ce65474c 100644 --- a/config/ags/colors.json +++ b/config/ags/colors.json @@ -1,106 +1,116 @@ { "colors": { "dark": { - "background": "#111318", + "background": "#0f1416", "error": "#ffb4ab", "error_container": "#93000a", - "inverse_on_surface": "#2e3035", - "inverse_primary": "#3f5f90", - "inverse_surface": "#e1e2e9", - "on_background": "#e1e2e9", + "inverse_on_surface": "#2c3134", + "inverse_primary": "#05677e", + "inverse_surface": "#dee3e6", + "on_background": "#dee3e6", "on_error": "#690005", "on_error_container": "#ffdad6", - "on_primary": "#06305f", - "on_primary_container": "#d5e3ff", - "on_primary_fixed": "#001b3c", - "on_primary_fixed_variant": "#254777", - "on_secondary": "#273141", - "on_secondary_container": "#d9e3f8", - "on_secondary_fixed": "#121c2b", - "on_secondary_fixed_variant": "#3e4758", - "on_surface": "#e1e2e9", - "on_surface_variant": "#c4c6cf", - "on_tertiary": "#3e2845", - "on_tertiary_container": "#f8d8fe", - "on_tertiary_fixed": "#28132f", - "on_tertiary_fixed_variant": "#563e5d", - "outline": "#8e9099", - "outline_variant": "#43474e", - "primary": "#a8c8ff", - "primary_container": "#254777", - "primary_fixed": "#d5e3ff", - "primary_fixed_dim": "#a8c8ff", + "on_primary": "#003543", + "on_primary_container": "#b6ebff", + "on_primary_fixed": "#001f28", + "on_primary_fixed_variant": "#004e60", + "on_secondary": "#1e333b", + "on_secondary_container": "#cfe6f0", + "on_secondary_fixed": "#071e26", + "on_secondary_fixed_variant": "#344a52", + "on_surface": "#dee3e6", + "on_surface_variant": "#bfc8cc", + "on_tertiary": "#2c2e4d", + "on_tertiary_container": "#e0e0ff", + "on_tertiary_fixed": "#161937", + "on_tertiary_fixed_variant": "#424465", + "outline": "#8a9296", + "outline_variant": "#40484c", + "primary": "#87d1eb", + "primary_container": "#004e60", + "primary_fixed": "#b6ebff", + "primary_fixed_dim": "#87d1eb", "scrim": "#000000", - "secondary": "#bdc7dc", - "secondary_container": "#bdc7dc", - "secondary_fixed": "#d9e3f8", - "secondary_fixed_dim": "#bdc7dc", + "secondary": "#b3cad4", + "secondary_container": "#b3cad4", + "secondary_fixed": "#cfe6f0", + "secondary_fixed_dim": "#b3cad4", "shadow": "#000000", - "surface": "#111318", - "surface_bright": "#37393e", - "surface_container": "#1d2024", - "surface_container_high": "#282a2f", - "surface_container_highest": "#33353a", - "surface_container_low": "#191c20", - "surface_container_lowest": "#0c0e13", - "surface_dim": "#111318", - "surface_variant": "#43474e", - "tertiary": "#dbbce1", - "tertiary_container": "#563e5d", - "tertiary_fixed": "#f8d8fe", - "tertiary_fixed_dim": "#dbbce1" + "surface": "#0f1416", + "surface_bright": "#353a3c", + "surface_container": "#1b2023", + "surface_container_high": "#252b2d", + "surface_container_highest": "#303638", + "surface_container_low": "#171c1f", + "surface_container_lowest": "#0a0f11", + "surface_dim": "#0f1416", + "surface_variant": "#40484c", + "tertiary": "#c2c3eb", + "tertiary_container": "#424465", + "tertiary_fixed": "#e0e0ff", + "tertiary_fixed_dim": "#c2c3eb" }, "light": { - "background": "#f9f9ff", + "background": "#f5fafd", "error": "#ba1a1a", "error_container": "#ffdad6", - "inverse_on_surface": "#f0f0f7", - "inverse_primary": "#a8c8ff", - "inverse_surface": "#2e3035", - "on_background": "#191c20", + "inverse_on_surface": "#edf1f4", + "inverse_primary": "#87d1eb", + "inverse_surface": "#2c3134", + "on_background": "#171c1f", "on_error": "#ffffff", "on_error_container": "#410002", "on_primary": "#ffffff", - "on_primary_container": "#001b3c", - "on_primary_fixed": "#001b3c", - "on_primary_fixed_variant": "#254777", + "on_primary_container": "#001f28", + "on_primary_fixed": "#001f28", + "on_primary_fixed_variant": "#004e60", "on_secondary": "#ffffff", - "on_secondary_container": "#121c2b", - "on_secondary_fixed": "#121c2b", - "on_secondary_fixed_variant": "#3e4758", - "on_surface": "#191c20", - "on_surface_variant": "#43474e", + "on_secondary_container": "#071e26", + "on_secondary_fixed": "#071e26", + "on_secondary_fixed_variant": "#344a52", + "on_surface": "#171c1f", + "on_surface_variant": "#40484c", "on_tertiary": "#ffffff", - "on_tertiary_container": "#28132f", - "on_tertiary_fixed": "#28132f", - "on_tertiary_fixed_variant": "#563e5d", - "outline": "#74777f", - "outline_variant": "#c4c6cf", - "primary": "#3f5f90", - "primary_container": "#d5e3ff", - "primary_fixed": "#d5e3ff", - "primary_fixed_dim": "#a8c8ff", + "on_tertiary_container": "#161937", + "on_tertiary_fixed": "#161937", + "on_tertiary_fixed_variant": "#424465", + "outline": "#70787c", + "outline_variant": "#bfc8cc", + "primary": "#05677e", + "primary_container": "#b6ebff", + "primary_fixed": "#b6ebff", + "primary_fixed_dim": "#87d1eb", "scrim": "#000000", - "secondary": "#555f71", - "secondary_container": "#555f71", - "secondary_fixed": "#d9e3f8", - "secondary_fixed_dim": "#bdc7dc", + "secondary": "#4c626a", + "secondary_container": "#4c626a", + "secondary_fixed": "#cfe6f0", + "secondary_fixed_dim": "#b3cad4", "shadow": "#000000", - "source_color": "#22518e", - "surface": "#f9f9ff", - "surface_bright": "#f9f9ff", - "surface_container": "#ededf4", - "surface_container_high": "#e7e8ee", - "surface_container_highest": "#e1e2e9", - "surface_container_low": "#f3f3fa", + "source_color": "#31687a", + "surface": "#f5fafd", + "surface_bright": "#f5fafd", + "surface_container": "#eaeff1", + "surface_container_high": "#e4e9ec", + "surface_container_highest": "#dee3e6", + "surface_container_low": "#eff4f7", "surface_container_lowest": "#ffffff", - "surface_dim": "#d9d9e0", - "surface_variant": "#e0e2ec", - "tertiary": "#6f5675", - "tertiary_container": "#f8d8fe", - "tertiary_fixed": "#f8d8fe", - "tertiary_fixed_dim": "#dbbce1" + "surface_dim": "#d6dbde", + "surface_variant": "#dbe4e8", + "tertiary": "#5a5c7e", + "tertiary_container": "#e0e0ff", + "tertiary_fixed": "#e0e0ff", + "tertiary_fixed_dim": "#c2c3eb" } }, - "harmonized_colors": {} + "harmonized_colors": { + "aqua": "#a5f2ff", + "blue": "#0047a3", + "green": "#00fc94", + "grey": "#dcdcdc", + "light_aqua": "#6effee", + "light_green": "#6bf1ae", + "light_red": "#ff9e93", + "red": "#da006d", + "white": "#f6f9fe" + } } \ No newline at end of file diff --git a/config/ags/config.json b/config/ags/config.json index 853ab3a0..b4aac81b 100644 --- a/config/ags/config.json +++ b/config/ags/config.json @@ -1,7 +1,7 @@ { "wallpaper": { "folder": "{{home}}/Pictures/wallpapers", - "current": "wall-16.png" + "current": "wall-31.png" }, "theme": { "dark_mode": true, @@ -9,7 +9,7 @@ "window": { "margin": "2", "border": false, - "opacity": 0.6 + "opacity": 1 }, "bar": { "position": "bottom", @@ -25,7 +25,7 @@ "padding": "1", "border_radius": "0", "launcher_icon": "󰢚", - "workspace_active_width": "20" + "workspace_active_width": "0" } }, "osd": { diff --git a/config/ags/functions/theme/hyprland.js b/config/ags/functions/theme/hyprland.js index b60e8081..069d7c55 100644 --- a/config/ags/functions/theme/hyprland.js +++ b/config/ags/functions/theme/hyprland.js @@ -10,7 +10,7 @@ export default function setHyprland(theme) { const marginValue = Number( margin[posIndex(configs.theme.bar.position.value)], ); - margin[posIndex(configs.theme.bar.position.value)] = `${marginValue / 2}`; + margin[posIndex(configs.theme.bar.position.value)] = `${marginValue / q}`; margin = margin.join(", "); sendBatch([ `decoration:col.shadow rgb(${bgColor})`, diff --git a/config/ags/style/colors.scss b/config/ags/style/colors.scss index 60d0756a..9e49879d 100644 --- a/config/ags/style/colors.scss +++ b/config/ags/style/colors.scss @@ -1,48 +1,48 @@ -$background: #111318; +$background: #0f1416; $error: #ffb4ab; $error_container: #93000a; -$inverse_on_surface: #2e3035; -$inverse_primary: #3f5f90; -$inverse_surface: #e1e2e9; -$on_background: #e1e2e9; +$inverse_on_surface: #2c3134; +$inverse_primary: #05677e; +$inverse_surface: #dee3e6; +$on_background: #dee3e6; $on_error: #690005; $on_error_container: #ffdad6; -$on_primary: #06305f; -$on_primary_container: #d5e3ff; -$on_primary_fixed: #001b3c; -$on_primary_fixed_variant: #254777; -$on_secondary: #273141; -$on_secondary_container: #d9e3f8; -$on_secondary_fixed: #121c2b; -$on_secondary_fixed_variant: #3e4758; -$on_surface: #e1e2e9; -$on_surface_variant: #c4c6cf; -$on_tertiary: #3e2845; -$on_tertiary_container: #f8d8fe; -$on_tertiary_fixed: #28132f; -$on_tertiary_fixed_variant: #563e5d; -$outline: #8e9099; -$outline_variant: #43474e; -$primary: #a8c8ff; -$primary_container: #254777; -$primary_fixed: #d5e3ff; -$primary_fixed_dim: #a8c8ff; +$on_primary: #003543; +$on_primary_container: #b6ebff; +$on_primary_fixed: #001f28; +$on_primary_fixed_variant: #004e60; +$on_secondary: #1e333b; +$on_secondary_container: #cfe6f0; +$on_secondary_fixed: #071e26; +$on_secondary_fixed_variant: #344a52; +$on_surface: #dee3e6; +$on_surface_variant: #bfc8cc; +$on_tertiary: #2c2e4d; +$on_tertiary_container: #e0e0ff; +$on_tertiary_fixed: #161937; +$on_tertiary_fixed_variant: #424465; +$outline: #8a9296; +$outline_variant: #40484c; +$primary: #87d1eb; +$primary_container: #004e60; +$primary_fixed: #b6ebff; +$primary_fixed_dim: #87d1eb; $scrim: #000000; -$secondary: #bdc7dc; -$secondary_container: #bdc7dc; -$secondary_fixed: #d9e3f8; -$secondary_fixed_dim: #bdc7dc; +$secondary: #b3cad4; +$secondary_container: #b3cad4; +$secondary_fixed: #cfe6f0; +$secondary_fixed_dim: #b3cad4; $shadow: #000000; -$surface: #111318; -$surface_bright: #37393e; -$surface_container: #1d2024; -$surface_container_high: #282a2f; -$surface_container_highest: #33353a; -$surface_container_low: #191c20; -$surface_container_lowest: #0c0e13; -$surface_dim: #111318; -$surface_variant: #43474e; -$tertiary: #dbbce1; -$tertiary_container: #563e5d; -$tertiary_fixed: #f8d8fe; -$tertiary_fixed_dim: #dbbce1; +$surface: #0f1416; +$surface_bright: #353a3c; +$surface_container: #1b2023; +$surface_container_high: #252b2d; +$surface_container_highest: #303638; +$surface_container_low: #171c1f; +$surface_container_lowest: #0a0f11; +$surface_dim: #0f1416; +$surface_variant: #40484c; +$tertiary: #c2c3eb; +$tertiary_container: #424465; +$tertiary_fixed: #e0e0ff; +$tertiary_fixed_dim: #c2c3eb; diff --git a/config/ags/style/vars.scss b/config/ags/style/vars.scss index 55ee92e7..de905821 100644 --- a/config/ags/style/vars.scss +++ b/config/ags/style/vars.scss @@ -1,19 +1,19 @@ -$window_margin: 12px 12px 6px 12px ; +$window_margin: 2px 2px 1px 2px ; $border_radius: 6px 6px 6px 6px ; $bar_border_radius: 0px 0px 0px 0px ; -$bar_margin: 6px 3px 3px 3px ; -$workspace_active_width: 20px; +$bar_margin: 1px 1px 1px 1px ; +$workspace_active_width: 0px; $dark_mode: true; $osd_regular_margin: 0px 12px 60px 0px; $osd_progress_margin: 12px 12px 2px 12px; $bar_opacity: 0; $bar_button_opacity: 0.6; $panel_button_padding: 4px 8px 4px 8px; -$bar_padding: 3px 3px 3px 3px ; +$bar_padding: 1px 1px 1px 1px ; $bar_shadow: false; $bar_button_shadow: false; $bar_button_border_radius: 6px 6px 6px 6px ; -$system_monitor_margin: 12px 12px 12px 12px; +$system_monitor_margin: 2px 2px 2px 2px ; $bar_border: false; -$window_opacity: 0.6; +$window_opacity: 1; $window_border: false; diff --git a/config/ags/style/widgets/overview.scss b/config/ags/style/widgets/overview.scss new file mode 100644 index 00000000..03d3720b --- /dev/null +++ b/config/ags/style/widgets/overview.scss @@ -0,0 +1,139 @@ +.overview-window { + margin-top: 2.727rem; +} + +.overview-search-box { + @include element_decel; + @include large-rounding; + @include elevation-border; + @include elevation2; + min-width: 13.636rem; + min-height: 3.409rem; + padding: 0rem 1.364rem; + padding-right: 2.864rem; + background-color: $background; + color: $onBackground; + + selection { + background-color: $secondary; + color: $onSecondary; + } + + caret-color: transparent; +} + +.overview-search-box-extended { + min-width: 25.909rem; + caret-color: $onSecondaryContainer; +} + +.overview-search-prompt { + color: $subtext; +} + +.overview-search-icon { + margin: 0rem 1.023rem; +} + +.overview-search-prompt-box { + margin-left: -18.545rem; + margin-right: $elevation_margin + 0.068rem; +} + +.overview-search-icon-box { + margin-left: -18.545rem; + margin-right: $elevation_margin + 0.068rem; +} + +.overview-search-results { + // min-height: 2.813rem; + // min-height: 37.5rem; + @include large-rounding; + @include elevation-border; + @include elevation2; + min-width: 28.773rem; + padding: 0.682rem; + background-color: $layer0; + color: $onLayer0; +} + +.overview-search-results-icon { + margin: 0rem 0.682rem; + font-size: 2.386rem; + min-width: 2.386rem; + min-height: 2.386rem; +} + +.overview-search-results-txt { + margin-right: 0.682rem; +} + +.overview-search-results-txt-cmd { + margin-right: 0.682rem; + @include techfont; + font-size: 1.227rem; +} + +.overview-search-result-btn { + @include normal-rounding; + padding: 0.341rem; + min-width: 2.386rem; + min-height: 2.386rem; + + caret-color: transparent; +} + +.overview-search-result-btn:hover, +.overview-search-result-btn:focus { + background-color: $hovercolor; +} + +.overview-search-result-btn:active { + background-color: $activecolor; +} + +.overview-tasks { + @include large-rounding; + @include elevation-border; + @include elevation2; + padding: 0.341rem; + background-color: $background; + color: $onBackground; +} + +.overview-tasks-workspace { + @include normal-rounding; + // @include elevation-border; + margin: 0.341rem; + background-color: $layer1; +} + +.overview-tasks-workspace-number { + @include mainfont; + color: $onSurfaceVariant; +} + +.overview-tasks-window { + @include normal-rounding; + @include menu_decel; + background-color: transparentize($layer3, 0.2); + color: $onSurface; + border: 0.068rem solid $surfaceContainerHighest; +} + +.overview-tasks-window:hover, +.overview-tasks-window:focus { + background-color: transparentize($secondaryContainer, 0.3); +} + +.overview-tasks-window:active { + background-color: transparentize($secondaryContainer, 0); +} + +.overview-tasks-window-selected { + background-color: transparentize($secondaryContainer, 0.3); +} + +.overview-tasks-window-dragging { + opacity: 0.2; +} diff --git a/config/ags/style/widgets/tray.scss b/config/ags/style/widgets/tray.scss new file mode 100644 index 00000000..0b12dc61 --- /dev/null +++ b/config/ags/style/widgets/tray.scss @@ -0,0 +1,11 @@ +.tray__container { + .entry-box { + margin: 10px; + } + &:selected { + background-color: $primary; + border-radius: 0; + color: $background; + border-radius: 6px; + } +} diff --git a/config/ags/style/widgets/workspaces.scss b/config/ags/style/widgets/workspaces.scss index 9ae34c73..c4c14a53 100644 --- a/config/ags/style/widgets/workspaces.scss +++ b/config/ags/style/widgets/workspaces.scss @@ -10,8 +10,8 @@ box-shadow: if($bar_button_shadow, 1px 1px 2px rgba(0, 0, 0, 0.4), none); .workspace-button { - min-height: 10px; - min-width: 10px; + min-height: 5px; + min-width: 5px; border: solid 2px $on_background; border-radius: $bar_button_border_radius; padding: 2px; diff --git a/config/ags/widget/bar/Window.js b/config/ags/widget/bar/Window.js index eb8d791b..78df9d51 100644 --- a/config/ags/widget/bar/Window.js +++ b/config/ags/widget/bar/Window.js @@ -8,6 +8,7 @@ import ControlCenterPanelButton from "../control_center/PanelButton.js"; import ScreenRecordPanelButton from "../screen_record/PanelButton.js"; import NetworkPanelButton from "../network/PanelButton.js"; import AudioPanelButton from "../audio/PanelButton.js"; +import Tray from "../tray/tray.js"; import { configs } from "../../vars.js"; import { isVertical } from "../../functions/utils.js"; const hyprland = await Service.import("hyprland"); @@ -52,6 +53,7 @@ const center = () => }); const endChildren = () => [ + Tray(), ScreenRecordPanelButton(), NetworkSpeedIndicator(), NetworkPanelButton(), diff --git a/config/ags/widget/datemenu/Window.js b/config/ags/widget/datemenu/Window.js index 5f5b15f5..9a345eb9 100644 --- a/config/ags/widget/datemenu/Window.js +++ b/config/ags/widget/datemenu/Window.js @@ -12,7 +12,7 @@ const Container = () => class_names: ["datemenu__container", "window-content"], children: [ Widget.Label({ - label: clock.bind().as((t) => t.format("%T")), + label: clock.bind().as((t) => t.format("%I:%M %p")), class_name: "clock", }), Widget.Label({ diff --git a/config/ags/widget/system_monitor/Window.js b/config/ags/widget/system_monitor/Window.js index 22fd7799..b7054452 100644 --- a/config/ags/widget/system_monitor/Window.js +++ b/config/ags/widget/system_monitor/Window.js @@ -100,32 +100,13 @@ const DayDots = () => class_name: "day-dots", spacing: 8, hpack: "center", - //I guess this is not efficient? children: clock.bind().as((t) => { - const format = Number(t.format("%u")); - const last = 7 - format; - return [ - ...Array(format) - .fill() - .map(() => Widget.Box({ class_name: "fill" })), - ...Array(last) - .fill() - .map(() => Widget.Box({ class_name: "empty" })), - ]; + const format = Number(t.format("%u")) % 7; // Adjust for Sunday being 0 + const dots = [...Array(7).keys()].map((day) => + day <= format ? Widget.Box({ class_name: "fill" }) : Widget.Box({ class_name: "empty" }) + ); + return dots; }), - // setup: (self) => { - // const t = GLib.DateTime.new_now_local(); - // const format = Number(t.format("%u")); - // const last = 7 - format; - // self.children = [ - // ...Array(format) - // .fill() - // .map(() => Widget.Box({ class_name: "fill" })), - // ...Array(last) - // .fill() - // .map(() => Widget.Box({ class_name: "empty" })), - // ]; - // }, }); const Container = () => diff --git a/config/ags/widget/tray/tray.js b/config/ags/widget/tray/tray.js new file mode 100644 index 00000000..92a5fcf6 --- /dev/null +++ b/config/ags/widget/tray/tray.js @@ -0,0 +1,16 @@ +const systemtray = await Service.import("systemtray") + +export default () => Widget.Box({ + class_name: "tray", + children: systemtray.bind("items").as( + items => items.map(item => Widget.Button({ + child: Widget.Icon({icon: item.bind("icon")}), + on_primary_click: (_, event) => item.activate(event), + on_secondary_click: (_, event) => item.openMenu(event), + tooltip_markup: item.bind("tooltip_markup"), + })) + ), + setup: self => self.hook(systemtray, self => { + self.visible = self.children.length > 0 + }) +}) diff --git a/config/ags/widget/wallpaper_picker/Window.js b/config/ags/widget/wallpaper_picker/Window.js index f57f703f..cd50c55e 100644 --- a/config/ags/widget/wallpaper_picker/Window.js +++ b/config/ags/widget/wallpaper_picker/Window.js @@ -150,7 +150,7 @@ export const WallpaperPickerWindow = () => animation: "slide right", child: WallpaperPicker({ width: 300, - spacing: 12, + spacing: 5, }), }); diff --git a/config/ags/widget/workspaces/PanelButton.js b/config/ags/widget/workspaces/PanelButton.js index 7111fb52..7368ffb0 100644 --- a/config/ags/widget/workspaces/PanelButton.js +++ b/config/ags/widget/workspaces/PanelButton.js @@ -7,21 +7,9 @@ const dispatch = (ws) => hyprland.messageAsync(`dispatch workspace ${ws}`); const WorkspaceButton = (ws) => Widget.Button({ class_name: "workspace-button", - child: Widget.Box({ - class_name: "fill", - hexpand: false, - setup: (self) => { - self.hook(configs.theme.bar.position, () => { - self.toggleClassName( - "vert", - isVertical(configs.theme.bar.position.value), - ); - self.toggleClassName( - "hort", - !isVertical(configs.theme.bar.position.value), - ); - }); - }, + child: Widget.Label({ + label: getNerdFontIcon(ws.id), // Use a function to get the icon + class_name: "workspace-icon", }), vpack: "center", hpack: "center", @@ -37,7 +25,39 @@ const WorkspaceButton = (ws) => }, }); -// Within the default function: +function getNerdFontIcon(workspaceId) { + // Return different icons based on workspaceId + const icons = { + 1: '  ', + 2: '  ', + 3: '  ', + 4: '  ', + 5: '  ', + 6: '  ', + 7: '  ', + 8: '  ', + 9: ' 󰚌 ', + }; + return icons[workspaceId] || '  '; // Default icon if workspaceId not found +} + +async function fetchWorkspacesFromServer() { + // Fetch workspaces from a server or other source + // Example return value + return await fetch('/api/workspaces').then(response => response.json()); +} + +function createInitialWorkspaces() { + // Create an initial set of workspaces + return [ + { id: 1, name: "Workspace 1" }, + { id: 2, name: "Workspace 2" }, + { id: 3, name: "Workspace 3" }, + { id: 4, name: "Workspace 4" }, + // Add more initial workspaces as needed + ]; +} + export default () => { const wsBox = Widget.Box({ class_names: ["workspace__container"], @@ -45,18 +65,20 @@ export default () => { hexpand: false, vexpand: false, vertical: configs.theme.bar.position.bind().as(isVertical), - setup: (self) => { - // Ensure workspaces array exists - if (!hyprland.workspaces) { + setup: async (self) => { + // Ensure workspaces array exists and is properly initialized + if (!hyprland.workspaces || !Array.isArray(hyprland.workspaces)) { hyprland.workspaces = []; // Initialize the workspaces array if it doesn't exist } // Fetch or create workspaces if the array is empty if (hyprland.workspaces.length === 0) { - // For example: - // hyprland.workspaces = await fetchWorkspacesFromServer(); - // or - // hyprland.workspaces = createInitialWorkspaces(); + try { + hyprland.workspaces = await fetchWorkspacesFromServer(); + } catch (error) { + console.error("Failed to fetch workspaces from server:", error); + hyprland.workspaces = createInitialWorkspaces(); + } } // Update the workspace buttons whenever there's a change in workspaces @@ -73,6 +95,7 @@ export default () => { ); }, }); + return Widget.EventBox({ child: wsBox, }); diff --git a/config/ags/windows.js b/config/ags/windows.js index 571e7ebe..b9eecedf 100644 --- a/config/ags/windows.js +++ b/config/ags/windows.js @@ -16,6 +16,7 @@ import SetupNetworkWindow from "./widget/network/Window.js"; import SetupBatteryWindow from "./widget/battery/Window.js"; import SetupControlCenterWindow from "./widget/control_center/Window.js"; import SetupBarWindow from "./widget/bar/Window.js"; +import Tray from "./widget/tray/tray.js"; App.addIcons(`${App.configDir}/assets`); @@ -26,6 +27,7 @@ export function setupWindows() { SetupBatteryWindow(); SetupControlCenterWindow(); SetupBarWindow(); + Tray(); } export default [ @@ -35,7 +37,7 @@ export default [ NotificationPopupWindow(), PowerMenuWindow(), VerificationWindow(), - HyprsplashWindow(), + //HyprsplashWindow(), SystemMonitorWindow(), ProgressOsd(), RegularOsd(), diff --git a/setup b/setup index d5bc2b9d..49d70d43 100755 --- a/setup +++ b/setup @@ -99,6 +99,9 @@ pkg=( swayosd-git hyprpicker matugen-bin + power-profile-daemon + dart-sass + sass ) # Creating a new `packages` array packages=( @@ -408,6 +411,19 @@ done echo "" echo "" +#-- Enabling the service ----------------------------------------- +echo "┌──────────────────────────────────────┐" +echo "│ Powerprofile enabled ... │" +echo "└──────────────────────────────────────┘" +echo "" +systemctl unmask power-profiles-daemon.service +systemctl start power-profiles-daemon.service +simulate_output "==> Starting PowerProfile..." +simulate_output "[ \e[32mOK\e[0m ] Started PowerProfileDaemon service" +sleep 2 + +echo "" +echo "" #-- Enabling the service ----------------------------------------- echo "┌──────────────────────────────────────┐" echo "│ Bluetooth enabled ... │"