From 3f6682a7e38bfc15ba5596cf0b5f497019077204 Mon Sep 17 00:00:00 2001
From: matt1432 <matt@nelim.org>
Date: Tue, 5 Sep 2023 19:57:34 -0400
Subject: [PATCH] refactor(ags): change some stuff

---
 config/ags/js/bar/bar.js        | 6 +++---
 config/ags/js/bar/clock.js      | 8 ++++++--
 config/ags/js/bar/workspaces.js | 8 +++++---
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/config/ags/js/bar/bar.js b/config/ags/js/bar/bar.js
index c292b9d..e5dd7d9 100644
--- a/config/ags/js/bar/bar.js
+++ b/config/ags/js/bar/bar.js
@@ -8,7 +8,7 @@ import { Heart }          from './heart.js';
 import { TabletToggle }   from './tablet-toggle.js';
 import { QsToggle }       from './quick-settings.js';
 import { NotifButton }    from './notif-button.js';
-import { Clock }    from './clock.js';
+import { Clock }          from './clock.js';
 
 export const Bar = Window({
   name: 'left-bar',
@@ -19,7 +19,7 @@ export const Bar = Window({
   child: CenterBox({
     className: 'transparent',
     halign: 'fill',
-    style: 'margin-top: 5px; margin-left: 5px; margin-right: 5px',
+    style: 'margin: 5px',
     vertical: false,
     
     children: [
@@ -41,7 +41,7 @@ export const Bar = Window({
 
           Separator(12),
 
-          Workspaces(),
+          Workspaces,
 
         ],
       }),
diff --git a/config/ags/js/bar/clock.js b/config/ags/js/bar/clock.js
index 4e3d9fa..3d575fb 100644
--- a/config/ags/js/bar/clock.js
+++ b/config/ags/js/bar/clock.js
@@ -3,13 +3,17 @@ const { execAsync } = ags.Utils;
 const { DateTime } = imports.gi.GLib;
 
 const ClockModule = ({
-    format = '%a. %e %b. %H:%M',
     interval = 1000,
     ...props
 }) => Label({
     ...props,
     className: 'clock',
-    connections: [[interval, label => label.label = DateTime.new_now_local().format(format)]],
+    connections: [
+      [interval, label => {
+        var time = DateTime.new_now_local();
+        label.label = time.format('%a. ') + time.get_day_of_month() + time.format(' %b. %H:%M');
+      }],
+    ],
 });
 
 export const Clock = Box({
diff --git a/config/ags/js/bar/workspaces.js b/config/ags/js/bar/workspaces.js
index 3bd4966..62e1909 100644
--- a/config/ags/js/bar/workspaces.js
+++ b/config/ags/js/bar/workspaces.js
@@ -4,7 +4,7 @@ const { Box, Button, Label, Revealer } = ags.Widget;
 
 import { EventBox } from '../common.js';
 
-const Workspace = ({ i } = {}) =>
+const WorkspaceModule = ({ i } = {}) =>
 Revealer({
   transition: "slide_right",
   child: EventBox({
@@ -25,11 +25,11 @@ Revealer({
   }),
 });
 
-export const Workspaces = props => Box({
+const Workspace = props => Box({
   className: 'workspaces',
   children: [EventBox({
     child: Box({
-      children: Array.from({ length: 15 }, (_, i) => i + 1).map(i => Workspace({ i: i})),
+      children: Array.from({ length: 15 }, (_, i) => i + 1).map(i => WorkspaceModule({ i: i})),
       connections: [[Hyprland, box => {
         let workspaces = [];
         Hyprland.workspaces.forEach(ws => {
@@ -44,3 +44,5 @@ export const Workspaces = props => Box({
     }),
   })],
 });
+
+export const Workspaces = Workspace();