diff --git a/devices/wim/config/ags/config.js b/devices/wim/config/ags/config.js index 83a30f9..f06c1d2 100644 --- a/devices/wim/config/ags/config.js +++ b/devices/wim/config/ags/config.js @@ -4,11 +4,11 @@ import { exec } from 'resource:///com/github/Aylur/ags/utils.js'; import Setup from './js/setup.js'; import Powermenu from './js/powermenu.js'; import * as Bar from './js/bar/main.js'; -import NotifCenter from './js/notifications/center.js'; -import NotifPopups from './js/notifications/popup.js'; +//import NotifCenter from './js/notifications/center.js'; +//import NotifPopups from './js/notifications/popup.js'; import Calendar from './js/date.js'; import QuickSettings from './js/quick-settings/main.js'; -import Overview from './js/overview/main.js'; +//import Overview from './js/overview/main.js'; import AppLauncher from './js/applauncher/main.js'; import * as Corners from './js/screen-corners.js'; @@ -18,6 +18,7 @@ exec(`sassc ${scss} ${css}`); Setup(); +// FIXME: notification and overview stuff are bugged as of this ags commit export default { style: css, notificationPopupTimeout: 5000, @@ -33,8 +34,8 @@ export default { windows: [ AppLauncher(), Calendar(), - NotifCenter(), - Overview(), + //NotifCenter(), + //Overview(), Powermenu(), QuickSettings(), @@ -42,6 +43,6 @@ export default { Bar.BgGradient(), Corners.Bottomleft(), Corners.Bottomright(), - NotifPopups(), + //NotifPopups(), ], }; diff --git a/devices/wim/config/ags/js/applauncher/main.js b/devices/wim/config/ags/js/applauncher/main.js index 56042c5..2e78cc1 100644 --- a/devices/wim/config/ags/js/applauncher/main.js +++ b/devices/wim/config/ags/js/applauncher/main.js @@ -40,7 +40,7 @@ const AppItem = (app, window) => { className: 'title', label: app.name, xalign: 0, - valign: 'center', + vpack: 'center', ellipsize: 3, }), Label({ @@ -49,7 +49,7 @@ const AppItem = (app, window) => { wrap: true, xalign: 0, justification: 'left', - valign: 'center', + vpack: 'center', }), ], }), diff --git a/devices/wim/config/ags/js/bar/audio.js b/devices/wim/config/ags/js/bar/audio.js index aaeec64..450f095 100644 --- a/devices/wim/config/ags/js/bar/audio.js +++ b/devices/wim/config/ags/js/bar/audio.js @@ -1,5 +1,6 @@ import Audio from 'resource:///com/github/Aylur/ags/service/audio.js'; import { Label, Box, Icon } from 'resource:///com/github/Aylur/ags/widget.js'; +import { execAsync } from 'resource:///com/github/Aylur/ags/utils.js'; import Separator from '../misc/separator.js'; import EventBox from '../misc/cursorbox.js'; @@ -43,7 +44,7 @@ const SpeakerPercentLabel = props => Label({ }); export default () => EventBox({ - onPrimaryClickRelease: 'pavucontrol', + onPrimaryClickRelease: () => execAsync(['pavucontrol']).catch(print), className: 'toggle-off', child: Box({ className: 'audio', diff --git a/devices/wim/config/ags/js/bar/brightness.js b/devices/wim/config/ags/js/bar/brightness.js index df8f03d..47a96ee 100644 --- a/devices/wim/config/ags/js/bar/brightness.js +++ b/devices/wim/config/ags/js/bar/brightness.js @@ -23,7 +23,7 @@ export default () => Overlay({ }), overlays: [ Box({ - style: 'color: #CBA6F7;', + css: 'color: #CBA6F7;', children: [ Separator(25), Heart(), diff --git a/devices/wim/config/ags/js/bar/current-window.js b/devices/wim/config/ags/js/bar/current-window.js index 5b49931..46919f6 100644 --- a/devices/wim/config/ags/js/bar/current-window.js +++ b/devices/wim/config/ags/js/bar/current-window.js @@ -3,7 +3,7 @@ import { Label } from 'resource:///com/github/Aylur/ags/widget.js'; export default () => Label({ - style: 'color: #CBA6F7; font-size: 18px', + css: 'color: #CBA6F7; font-size: 18px', truncate: 'end', binds: [['label', Hyprland.active.client, 'title']], }); diff --git a/devices/wim/config/ags/js/bar/fullscreen.js b/devices/wim/config/ags/js/bar/fullscreen.js index 1a4e8f8..54ff60d 100644 --- a/devices/wim/config/ags/js/bar/fullscreen.js +++ b/devices/wim/config/ags/js/bar/fullscreen.js @@ -27,7 +27,7 @@ export default props => Overlay({ ], child: Box({ - style: 'min-height: 1px', + css: 'min-height: 1px', hexpand: true, vertical: true, children: [ @@ -38,7 +38,7 @@ export default props => Overlay({ properties: [['timeouts', []]], connections: [[Revealed, self => { const Bar = App.getWindow('bar'); - Bar.setStyle(Revealed.value ? '' : wStyle); + Bar.setCss(Revealed.value ? '' : wStyle); const BgGradient = App.getWindow('bg-gradient'); BgGradient.visible = !Revealed.value; @@ -90,7 +90,7 @@ export default props => Overlay({ self.get_parent().revealChild = false; }, child: Box({ - style: 'min-height: 50px;', + css: 'min-height: 50px;', }), }), }), diff --git a/devices/wim/config/ags/js/bar/heart.js b/devices/wim/config/ags/js/bar/heart.js index 2c7fbea..7753a26 100644 --- a/devices/wim/config/ags/js/bar/heart.js +++ b/devices/wim/config/ags/js/bar/heart.js @@ -5,7 +5,7 @@ import EventBox from '../misc/cursorbox.js'; export default () => EventBox({ - halign: 'center', + hpack: 'center', onPrimaryClickRelease: () => { execAsync(['bash', '-c', '$AGS_PATH/heart.sh toggle']).catch(print); diff --git a/devices/wim/config/ags/js/bar/keyboard-layout.js b/devices/wim/config/ags/js/bar/keyboard-layout.js index 063a6be..aa9d7b4 100644 --- a/devices/wim/config/ags/js/bar/keyboard-layout.js +++ b/devices/wim/config/ags/js/bar/keyboard-layout.js @@ -9,7 +9,7 @@ export default () => Box({ children: [ Icon({ icon: 'input-keyboard-symbolic', - style: 'margin-right: 4px;', + css: 'margin-right: 4px;', }), Label({ connections: [[Hyprland, (self, _n, layout) => { diff --git a/devices/wim/config/ags/js/bar/main.js b/devices/wim/config/ags/js/bar/main.js index 8a52dda..2101e4b 100644 --- a/devices/wim/config/ags/js/bar/main.js +++ b/devices/wim/config/ags/js/bar/main.js @@ -20,7 +20,7 @@ export const BgGradient = () => Window({ name: 'bg-gradient', layer: 'background', anchor: ['top', 'bottom', 'left', 'right'], - style: ` + css: ` background-image: -gtk-gradient (linear, left top, left bottom, from(rgba(0, 0, 0, 0.5)), @@ -39,7 +39,7 @@ export const Bar = () => Window({ vertical: false, startWidget: Box({ - halign: 'start', + hpack: 'start', children: [ OskToggle(), @@ -76,7 +76,7 @@ export const Bar = () => Window({ }), endWidget: Box({ - halign: 'end', + hpack: 'end', children: [ Battery(), diff --git a/devices/wim/config/ags/js/bar/workspaces.js b/devices/wim/config/ags/js/bar/workspaces.js index 55fe6ce..f00cdb3 100644 --- a/devices/wim/config/ags/js/bar/workspaces.js +++ b/devices/wim/config/ags/js/bar/workspaces.js @@ -17,7 +17,7 @@ const Workspace = ({ i } = {}) => .catch(print); }, child: Box({ - valign: 'center', + vpack: 'center', className: 'button', setup: self => { self.update = addr => { @@ -53,21 +53,24 @@ export default () => { if (currentIndex < 0) return; - highlight.setStyle(`margin-left: ${16 + currentIndex * 30}px`); + highlight.setCss(`margin-left: ${16 + currentIndex * 30}px`); }; const highlight = Box({ - valign: 'center', - halign: 'start', + vpack: 'center', + hpack: 'start', className: 'button active', connections: [[Hyprland.active.workspace, updateHighlight]], }); const widget = Overlay({ setup: self => { - self.set_overlay_pass_through( - self.get_children()[1], - true, - ); + // FIXME: see if we can get rid of this timeout + timeout(1, () => { + self.set_overlay_pass_through( + self.get_children()[1], + true, + ); + }); }, overlays: [highlight], child: EventBox({ diff --git a/devices/wim/config/ags/js/date.js b/devices/wim/config/ags/js/date.js index 5612f02..954f423 100644 --- a/devices/wim/config/ags/js/date.js +++ b/devices/wim/config/ags/js/date.js @@ -1,6 +1,5 @@ -import { Widget, Box, Label } from 'resource:///com/github/Aylur/ags/widget.js'; +import { Box, Calendar, Label } from 'resource:///com/github/Aylur/ags/widget.js'; -import Gtk from 'gi://Gtk'; import GLib from 'gi://GLib'; const { DateTime } = GLib; @@ -19,8 +18,8 @@ const Time = () => Box({ Box({ className: 'time-container', - halign: 'center', - valign: 'center', + hpack: 'center', + vpack: 'center', children: [ Label({ @@ -46,9 +45,9 @@ const Time = () => Box({ Box({ className: 'date-container', - halign: 'center', + hpack: 'center', child: Label({ - style: 'font-size: 20px', + css: 'font-size: 20px', label: 'complete date', connections: [[1000, self => { var time = DateTime.new_now_local(); @@ -64,8 +63,7 @@ const Time = () => Box({ const CalendarWidget = () => Box({ className: 'cal-box', - child: Widget({ - type: Gtk.Calendar, + child: Calendar({ showDayNames: true, showHeading: true, className: 'cal', @@ -74,7 +72,7 @@ const CalendarWidget = () => Box({ export default () => PopupWindow({ anchor: ['top', 'right'], - margin: [6, 182, 0, 0], + margins: [6, 182, 0, 0], name: 'calendar', child: Box({ className: 'date', diff --git a/devices/wim/config/ags/js/media-player/gesture.js b/devices/wim/config/ags/js/media-player/gesture.js index 3d68721..d45f8f9 100644 --- a/devices/wim/config/ags/js/media-player/gesture.js +++ b/devices/wim/config/ags/js/media-player/gesture.js @@ -40,7 +40,7 @@ export default ({ // Slide right if (offset >= 0) { - playerBox.setStyle(` + playerBox.setCss(` margin-left: ${offset}px; margin-right: -${offset}px; ${playerBox._bgStyle} @@ -50,7 +50,7 @@ export default ({ // Slide left else { offset = Math.abs(offset); - playerBox.setStyle(` + playerBox.setCss(` margin-left: -${offset}px; margin-right: ${offset}px; ${playerBox._bgStyle} @@ -75,7 +75,7 @@ export default ({ // Slide away right if (offset >= 0) { - playerBox.setStyle(` + playerBox.setCss(` ${TRANSITION} margin-left: ${OFFSCREEN}px; margin-right: -${OFFSCREEN}px; @@ -85,7 +85,7 @@ export default ({ // Slide away left else { - playerBox.setStyle(` + playerBox.setCss(` ${TRANSITION} margin-left: -${OFFSCREEN}px; margin-right: ${OFFSCREEN}px; @@ -96,14 +96,14 @@ export default ({ // Put the player in the back after anim overlay.reorder_overlay(playerBox, 0); // Recenter player - playerBox.setStyle(playerBox._bgStyle); + playerBox.setCss(playerBox._bgStyle); widget.sensitive = true; }); } else { // Recenter with transition for animation - playerBox.setStyle(`${TRANSITION} ${playerBox._bgStyle}`); + playerBox.setCss(`${TRANSITION} ${playerBox._bgStyle}`); } }, 'drag-end'], ], diff --git a/devices/wim/config/ags/js/media-player/mpris.js b/devices/wim/config/ags/js/media-player/mpris.js index 5348818..0390a07 100644 --- a/devices/wim/config/ags/js/media-player/mpris.js +++ b/devices/wim/config/ags/js/media-player/mpris.js @@ -52,7 +52,7 @@ export const CoverArt = (player, props) => CenterBox({ background-size: cover; background-position: center; `; - self.setStyle(self._bgStyle); + self.setCss(self._bgStyle); } }); }, @@ -75,7 +75,7 @@ export const CoverArt = (player, props) => CenterBox({ `; if (!self.get_parent()._dragging) - self.setStyle(self._bgStyle); + self.setCss(self._bgStyle); }).catch(err => { if (err !== '') print(err); @@ -200,7 +200,7 @@ const PlayerButton = ({ player, items, onClick, prop }) => Button({ if (prop == 'playBackStatus') { items.forEach(item => { - item[1].setStyle(` + item[1].setCss(` background-color: ${player.colors.value.hoverAccent}; color: ${player.colors.value.buttonText}; min-height: 40px; @@ -216,7 +216,7 @@ const PlayerButton = ({ player, items, onClick, prop }) => Button({ self.window.set_cursor(null); if (prop == 'playBackStatus') { items.forEach(item => { - item[1].setStyle(` + item[1].setCss(` background-color: ${player.colors.value.buttonAccent}; color: ${player.colors.value.buttonText}; min-height: 42px; @@ -238,7 +238,7 @@ const PlayerButton = ({ player, items, onClick, prop }) => Button({ if (prop == 'playBackStatus') { if (button._hovered) { items.forEach(item => { - item[1].setStyle(` + item[1].setCss(` background-color: ${player.colors.value.hoverAccent}; color: ${player.colors.value.buttonText}; min-height: 40px; @@ -250,7 +250,7 @@ const PlayerButton = ({ player, items, onClick, prop }) => Button({ } else { items.forEach(item => { - item[1].setStyle(` + item[1].setCss(` background-color: ${player.colors.value.buttonAccent}; color: ${player.colors.value.buttonText}; min-height: 42px; diff --git a/devices/wim/config/ags/js/media-player/player.js b/devices/wim/config/ags/js/media-player/player.js index bc6c493..5dc4210 100644 --- a/devices/wim/config/ags/js/media-player/player.js +++ b/devices/wim/config/ags/js/media-player/player.js @@ -11,8 +11,8 @@ const FAVE_PLAYER = 'org.mpris.MediaPlayer2.spotify'; const Top = player => Box({ className: 'top', - halign: 'start', - valign: 'start', + hpack: 'start', + vpack: 'start', children: [ mpris.PlayerIcon(player, { symbolic: false, @@ -30,8 +30,8 @@ const Center = player => Box({ Box({ className: 'metadata', vertical: true, - halign: 'start', - valign: 'center', + hpack: 'start', + vpack: 'center', hexpand: true, children: [ mpris.TitleLabel(player), @@ -59,8 +59,8 @@ const Bottom = player => Box({ className: 'bottom', children: [ mpris.PreviousButton(player, { - valign: 'end', - halign: 'start', + vpack: 'end', + hpack: 'start', }), Separator(8), diff --git a/devices/wim/config/ags/js/misc/cursorbox.js b/devices/wim/config/ags/js/misc/cursorbox.js index faa6b6a..cc820d8 100644 --- a/devices/wim/config/ags/js/misc/cursorbox.js +++ b/devices/wim/config/ags/js/misc/cursorbox.js @@ -5,11 +5,11 @@ const display = Gdk.Display.get_default(); export default ({ - type = 'EventBox', + isButton = false, reset = true, ...props }) => { - if (type === 'EventBox') { + if (!isButton) { return Widget.EventBox({ ...props, onHover: self => { diff --git a/devices/wim/config/ags/js/misc/popup.js b/devices/wim/config/ags/js/misc/popup.js index b27d6cf..9c88d47 100644 --- a/devices/wim/config/ags/js/misc/popup.js +++ b/devices/wim/config/ags/js/misc/popup.js @@ -36,9 +36,9 @@ export default ({ // Wrapping the revealer inside a box is needed // to allocate some space for it even when not revealed child: Box({ - style: `min-height:1px; - min-width:1px; - padding: 1px;`, + css: `min-height:1px; + min-width:1px; + padding: 1px;`, child: Revealer({ transition, transitionDuration, diff --git a/devices/wim/config/ags/js/misc/separator.js b/devices/wim/config/ags/js/misc/separator.js index f5a7ebe..306f36c 100644 --- a/devices/wim/config/ags/js/misc/separator.js +++ b/devices/wim/config/ags/js/misc/separator.js @@ -2,14 +2,14 @@ import { Box } from 'resource:///com/github/Aylur/ags/widget.js'; export default (size, { vertical = false } = {}) => { - if (vertical) { + if (vertical) { return Box({ - style: `min-height: ${size}px;`, + css: `min-height: ${size}px;`, }); } else { return Box({ - style: `min-width: ${size}px;`, + css: `min-width: ${size}px;`, }); } }; diff --git a/devices/wim/config/ags/js/powermenu.js b/devices/wim/config/ags/js/powermenu.js index 9df97de..fa68fe4 100644 --- a/devices/wim/config/ags/js/powermenu.js +++ b/devices/wim/config/ags/js/powermenu.js @@ -1,4 +1,5 @@ import { CenterBox, Label } from 'resource:///com/github/Aylur/ags/widget.js'; +import { execAsync } from 'resource:///com/github/Aylur/ags/utils.js'; import PopupWindow from './misc/popup.js'; import Button from './misc/cursorbox.js'; @@ -9,9 +10,9 @@ const PowermenuWidget = () => CenterBox({ vertical: false, startWidget: Button({ - type: 'Button', + isButton: true, className: 'shutdown', - onPrimaryClickRelease: 'systemctl poweroff', + onPrimaryClickRelease: () => execAsync(['systemctl', 'poweroff']).catch(print), child: Label({ label: '襤', @@ -19,9 +20,9 @@ const PowermenuWidget = () => CenterBox({ }), centerWidget: Button({ - type: 'Button', + isButton: true, className: 'reboot', - onPrimaryClickRelease: 'systemctl reboot', + onPrimaryClickRelease: () => execAsync(['systemctl', 'reboot']).catch(print), child: Label({ label: '勒', @@ -29,9 +30,9 @@ const PowermenuWidget = () => CenterBox({ }), endWidget: Button({ - type: 'Button', + isButton: true, className: 'logout', - onPrimaryClickRelease: 'hyprctl dispatch exit', + onPrimaryClickRelease: () => execAsync(['hyprctl', 'dispatch', 'exit']).catch(print), child: Label({ label: '', diff --git a/devices/wim/config/ags/js/quick-settings/button-grid.js b/devices/wim/config/ags/js/quick-settings/button-grid.js index 14d4ba9..077e67b 100644 --- a/devices/wim/config/ags/js/quick-settings/button-grid.js +++ b/devices/wim/config/ags/js/quick-settings/button-grid.js @@ -36,8 +36,8 @@ const GridButton = ({ const FirstRow = () => Box({ className: 'button-row', - halign: 'center', - style: 'margin-top: 15px; margin-bottom: 7px;', + hpack: 'center', + css: 'margin-top: 15px; margin-bottom: 7px;', children: [ GridButton({ @@ -108,7 +108,7 @@ const FirstRow = () => Box({ }); const SubRow = () => CenterBox({ - halign: 'start', + hpack: 'start', children: [ Label({ @@ -154,8 +154,8 @@ const itemsMic = { const SecondRow = () => Box({ className: 'button-row', - halign: 'center', - style: 'margin-top: 7px; margin-bottom: 15px;', + hpack: 'center', + css: 'margin-top: 7px; margin-bottom: 15px;', children: [ GridButton({ @@ -236,7 +236,7 @@ const SecondRow = () => Box({ export default () => Box({ className: 'button-grid', vertical: true, - halign: 'center', + hpack: 'center', children: [ FirstRow(), SubRow(), diff --git a/devices/wim/config/ags/js/quick-settings/main.js b/devices/wim/config/ags/js/quick-settings/main.js index 87a4316..a192723 100644 --- a/devices/wim/config/ags/js/quick-settings/main.js +++ b/devices/wim/config/ags/js/quick-settings/main.js @@ -20,8 +20,8 @@ const QuickSettingsWidget = () => Box({ Label({ label: 'Control Center', className: 'title', - halign: 'start', - style: 'margin-left: 20px', + hpack: 'start', + css: 'margin-left: 20px', }), ButtonGrid(), @@ -44,6 +44,6 @@ const QuickSettingsWidget = () => Box({ export default () => PopupWindow({ name: 'quick-settings', anchor: ['top', 'right'], - margin: [6, 5, 0], + margins: [6, 5, 0], child: QuickSettingsWidget(), }); diff --git a/devices/wim/config/ags/js/quick-settings/slider-box.js b/devices/wim/config/ags/js/quick-settings/slider-box.js index 024585f..12c7fb5 100644 --- a/devices/wim/config/ags/js/quick-settings/slider-box.js +++ b/devices/wim/config/ags/js/quick-settings/slider-box.js @@ -14,13 +14,13 @@ const items = { export default () => Box({ className: 'slider-box', vertical: true, - halign: 'center', + hpack: 'center', children: [ Box({ className: 'slider', - valign: 'start', - halign: 'center', + vpack: 'start', + hpack: 'center', children: [ Icon({ size: 26, @@ -55,8 +55,8 @@ export default () => Box({ Box({ className: 'slider', - valign: 'start', - halign: 'center', + vpack: 'start', + hpack: 'center', children: [ Icon({ className: 'slider-label', diff --git a/devices/wim/config/ags/js/quick-settings/toggle-button.js b/devices/wim/config/ags/js/quick-settings/toggle-button.js index e86bebc..d74a985 100644 --- a/devices/wim/config/ags/js/quick-settings/toggle-button.js +++ b/devices/wim/config/ags/js/quick-settings/toggle-button.js @@ -11,7 +11,7 @@ export default () => { toggleButton.add(Icon({ icon: 'go-down-symbolic', className: 'arrow', - style: '-gtk-icon-transform: rotate(180deg);', + css: '-gtk-icon-transform: rotate(180deg);', })); // Setup @@ -26,12 +26,12 @@ export default () => { if (toggleButton.get_active()) { toggleButton.get_children()[0] - .setStyle('-gtk-icon-transform: rotate(0deg);'); + .setCss('-gtk-icon-transform: rotate(0deg);'); rev.revealChild = true; } else { toggleButton.get_children()[0] - .setStyle('-gtk-icon-transform: rotate(180deg);'); + .setCss('-gtk-icon-transform: rotate(180deg);'); rev.revealChild = false; } }); diff --git a/devices/wim/config/ags/js/screen-corners.js b/devices/wim/config/ags/js/screen-corners.js index 5c0d255..5bbb817 100644 --- a/devices/wim/config/ags/js/screen-corners.js +++ b/devices/wim/config/ags/js/screen-corners.js @@ -1,18 +1,19 @@ -import { Widget } from 'resource:///com/github/Aylur/ags/widget.js'; +import { Box, DrawingArea, Window } from 'resource:///com/github/Aylur/ags/widget.js'; import Gtk from 'gi://Gtk'; const Lang = imports.lang; -export const RoundedCorner = (place, props) => Widget.Box({ - halign: place.includes('left') ? 'start' : 'end', - valign: place.includes('top') ? 'start' : 'end', - style: `padding: 1px; margin: - ${place.includes('top') ? '-1px' : '0'} - ${place.includes('right') ? '-1px' : '0'} - ${place.includes('bottom') ? '-1px' : '0'} - ${place.includes('left') ? '-1px' : '0'};`, - child: Widget({ +export const RoundedCorner = (place, props) => Box({ + hpack: place.includes('left') ? 'start' : 'end', + vpack: place.includes('top') ? 'start' : 'end', + css: ` + padding: 1px; margin: + ${place.includes('top') ? '-1px' : '0'} + ${place.includes('right') ? '-1px' : '0'} + ${place.includes('bottom') ? '-1px' : '0'} + ${place.includes('left') ? '-1px' : '0'}; + `, + child: DrawingArea({ ...props, - type: Gtk.DrawingArea, setup: widget => { const r = widget.get_style_context() .get_property('border-radius', Gtk.StateFlags.NORMAL); @@ -69,7 +70,7 @@ export const RoundedCorner = (place, props) => Widget.Box({ }), }); -export const Topleft = () => Widget.Window({ +export const Topleft = () => Window({ name: 'cornertl', layer: 'overlay', anchor: ['top', 'left'], @@ -77,7 +78,7 @@ export const Topleft = () => Widget.Window({ visible: true, child: RoundedCorner('topleft', { className: 'corner' }), }); -export const Topright = () => Widget.Window({ +export const Topright = () => Window({ name: 'cornertr', layer: 'overlay', anchor: ['top', 'right'], @@ -85,7 +86,7 @@ export const Topright = () => Widget.Window({ visible: true, child: RoundedCorner('topright', { className: 'corner' }), }); -export const Bottomleft = () => Widget.Window({ +export const Bottomleft = () => Window({ name: 'cornerbl', layer: 'overlay', anchor: ['bottom', 'left'], @@ -93,7 +94,7 @@ export const Bottomleft = () => Widget.Window({ visible: true, child: RoundedCorner('bottomleft', { className: 'corner' }), }); -export const Bottomright = () => Widget.Window({ +export const Bottomright = () => Window({ name: 'cornerbr', layer: 'overlay', anchor: ['bottom', 'right'], diff --git a/flake.lock b/flake.lock index d09cc98..9339758 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1698970509, - "narHash": "sha256-5n048xWGUgvqGfnVszh7/8Bv75czYO12gaZWx/KImGg=", + "lastModified": 1699229982, + "narHash": "sha256-jaBKnLnUsXzIS8v/6TZO/+2S+HAfHWI3S+Vgv8ox2Ug=", "owner": "Aylur", "repo": "ags", - "rev": "7720f98f1aaa73b2a85f70652eb9c3c1cd4485e2", + "rev": "c8f77f33e0abd077648e904a677c27f75c9bd5b7", "type": "github" }, "original": { @@ -216,11 +216,11 @@ ] }, "locked": { - "lastModified": 1698165573, - "narHash": "sha256-cnMTgCDnZiQKsf+wVzigpexskqRCFTKgS58Wx2rNU1c=", + "lastModified": 1699216084, + "narHash": "sha256-IjuxIYOigZGTmnbqcsWgKjl5wlYyiStp0MyPMx+FKBw=", "owner": "hercules-ci", "repo": "hercules-ci-effects", - "rev": "300e0af24a1bbe32d115beb182efb01785582c45", + "rev": "82a40e14dce72bcb6718f473756c9cc9ad2e87cf", "type": "github" }, "original": { @@ -236,11 +236,11 @@ ] }, "locked": { - "lastModified": 1699025595, - "narHash": "sha256-e+o4PoSu2Z6Ww8y/AVUmMU200rNZoRK+p2opQ7Db8Rg=", + "lastModified": 1699290318, + "narHash": "sha256-weH8oEJo+g0yJtGGU+Zo2pg5kOxPUCAFl8v/5dEnH00=", "owner": "nix-community", "repo": "home-manager", - "rev": "8765d4e38aa0be53cdeee26f7386173e6c65618d", + "rev": "c067d57fc4552835987fd7611c3a6741ee32ebd5", "type": "github" }, "original": { @@ -256,11 +256,11 @@ ] }, "locked": { - "lastModified": 1698496990, - "narHash": "sha256-3KOSa+u2H0Y9hBHWtjLPzkXuZW4+e8FdkiGpRWJ4nhU=", + "lastModified": 1699271265, + "narHash": "sha256-u+Do1GSMXKj8hnuF6NCP2wCjoQbqvM+bP9utdB5DLRs=", "owner": "horriblename", "repo": "hyprgrass", - "rev": "773c0a2bcc7759e5c4099ba1fe105ae9118a91f3", + "rev": "ba85cbd127371adf35d0e57cc481f7bab8ab1aa8", "type": "github" }, "original": { @@ -278,11 +278,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1699214243, - "narHash": "sha256-Qf7gKEGDTE9jbcMjJJXuJwEJHTsJQM+e2DpXC6LFnTo=", + "lastModified": 1699296543, + "narHash": "sha256-9MYwT+vVmitFIjPZhzn5ZsKNCwgKGU98SW1gAX5bvXs=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "ecf98069f655a4e54943ec70d638ddcf429211d1", + "rev": "29e0a7112ef5c412e4af640b9d80f80b81a26c94", "type": "github" }, "original": { @@ -346,11 +346,11 @@ ] }, "locked": { - "lastModified": 1699183738, - "narHash": "sha256-sB26+v7LQyqzY2zhctvToBXIzGYYCVln4soWNo47ArY=", + "lastModified": 1699282964, + "narHash": "sha256-uIalDDBUjjX3HINnL+MB6Mf95JDakhfBLm+M1XNlL6w=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "9b45b7f15512d85556f03667e25beee4a450d9f0", + "rev": "0036c74db3c3dc3026c275d4814debf9105106b2", "type": "github" }, "original": { @@ -369,11 +369,11 @@ }, "locked": { "dir": "contrib", - "lastModified": 1699181322, - "narHash": "sha256-Kp7k9MrkxG19jHtwVn8DniZa+2YAG/KNQKuK2Fcunm0=", + "lastModified": 1699268588, + "narHash": "sha256-qiJ0049VYw2rw6AeWDk22QDJYvMkWGfSq3dFyLKFZjQ=", "owner": "neovim", "repo": "neovim", - "rev": "4d757bbfbb6c0e5280563779c4b4ee1ce9142cf0", + "rev": "0774d0cfe1d5efb4bdd34cc8cf3799af5c947d2e", "type": "github" }, "original": { @@ -413,11 +413,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1699060277, - "narHash": "sha256-As0PilG8NEQzIMOFIzfI3zkBNH2CJHZJXRL5Rc36Ojc=", + "lastModified": 1699261003, + "narHash": "sha256-wkOVJ2wkPpTYqipDF693bEAUQ838xjloUcs6WNsTMlw=", "owner": "nix-community", "repo": "nix-eval-jobs", - "rev": "20a24e8b1004d3293525334ccf3254c083d6fbaa", + "rev": "2b55f473c960d38a40678d9831fc1dcb87615a98", "type": "github" }, "original": { @@ -571,11 +571,11 @@ }, "nixpkgs-staging": { "locked": { - "lastModified": 1699106880, - "narHash": "sha256-dPXRT/S+Av4+YTMI/LFVxlWHyFD7BP3fNVqsJJc0Q1g=", + "lastModified": 1699244619, + "narHash": "sha256-SS/6vxpp19Axs6xQqa4inwFiuItMLqAT2DPCyVyGhpc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b0cd63ea041313c0e2a20520a6dfa34e844c17db", + "rev": "5a803b4198b59d6bd6f983f77307618e4f25af12", "type": "github" }, "original": { @@ -593,11 +593,11 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1699222410, - "narHash": "sha256-qGuDXk991Mlws0f8DXNua82G+22jMBwoFG80o1sF66M=", + "lastModified": 1699294820, + "narHash": "sha256-XJmvNGOS1kIcbCvMjWOF9+3KqyFJU6vZyPTM9sQv9tg=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "74717cb06fc24dbf57002bb1cf6d36fc50293d34", + "rev": "780125b61dadc14c5d025018d2607cb33a80e6c9", "type": "github" }, "original": { @@ -640,11 +640,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1698977350, - "narHash": "sha256-OUDOHWrX3EjX/MlOoCHEb3JMONklbpu4Wa+Xf5s/U+s=", + "lastModified": 1699236715, + "narHash": "sha256-oel+a6B5mBO7vA1A/I9A9VTK2jW5shnYAuu08RYhmxQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4285a2a67daf39e63d9564a47773a1c2081c36a8", + "rev": "0d93ec62e06faec6c52331a8a87bd5721b38ce14", "type": "github" }, "original": { @@ -672,11 +672,11 @@ }, "nur": { "locked": { - "lastModified": 1699220832, - "narHash": "sha256-i89TLmU1aNsZsSbMg63RoWrKWaYPCXUQQsfxg+bj2nY=", + "lastModified": 1699310700, + "narHash": "sha256-ikf86iIwAyGoJVuJhdX32yKseCzerxcuehJnq/peuZk=", "owner": "nix-community", "repo": "NUR", - "rev": "d0c6e2ebb941d9141e68fd8922173d65d201b4b7", + "rev": "53caf62f38d288c3ee1d11e8c5c94b6168343784", "type": "github" }, "original": { @@ -692,11 +692,11 @@ ] }, "locked": { - "lastModified": 1698771340, - "narHash": "sha256-MmTHSc2epsMN1thvKTwfAveCE54jHC+boWkCcP/Lmac=", + "lastModified": 1699296867, + "narHash": "sha256-2PXGu6YrqppJGj7SzhstL5EEu/DG1hwrV18JED2Dafs=", "owner": "nix-community", "repo": "nurl", - "rev": "0812d73c1724af0dab7d567ec5db9ea32683d33a", + "rev": "99f93c8e6eddfaa851c9fb8ae206305da9cd2614", "type": "github" }, "original": {