From 28c97fe189be4b6938f9d6f8ba1108beb8861823 Mon Sep 17 00:00:00 2001 From: retrozinndev Date: Tue, 12 Aug 2025 15:07:51 -0300 Subject: [PATCH] :recycle: refactor: rename src/scripts -> src/modules this is a better name --- src/app.ts | 16 ++++++++-------- src/{scripts => modules}/apps.ts | 0 src/{scripts => modules}/arg-handler.ts | 0 src/{scripts => modules}/auth.ts | 0 src/{scripts => modules}/brightness.ts | 0 src/{scripts => modules}/clipboard.ts | 0 src/{scripts => modules}/compositor.ts | 0 src/{scripts => modules}/config.ts | 0 src/{scripts => modules}/media.ts | 0 src/{scripts => modules}/nightlight.ts | 0 src/{scripts => modules}/notifications.ts | 0 src/{scripts => modules}/recording.ts | 0 src/{scripts => modules}/reload-handler.ts | 0 src/{scripts => modules}/stylesheet.ts | 0 src/{scripts => modules}/utils.ts | 0 src/{scripts => modules}/volume.ts | 0 src/{scripts => modules}/wallpaper.ts | 0 src/runner/Runner.tsx | 2 +- src/runner/plugins/apps.ts | 2 +- src/runner/plugins/clipboard.ts | 2 +- src/runner/plugins/media.ts | 2 +- src/runner/plugins/shell.ts | 2 +- src/runner/plugins/wallpapers.ts | 2 +- src/runner/widgets/ResultWidget.tsx | 4 +++- src/widget/CustomDialog.tsx | 2 +- src/widget/Notification.tsx | 6 +++--- src/widget/PopupWindow.tsx | 2 +- src/widget/bar/Clock.tsx | 2 +- src/widget/bar/FocusedClient.tsx | 4 ++-- src/widget/bar/Media.tsx | 6 +++--- src/widget/bar/Status.tsx | 8 ++++---- src/widget/bar/Tray.tsx | 2 +- src/widget/bar/Workspaces.tsx | 4 ++-- src/widget/center-window/BigMedia.tsx | 6 +++--- src/widget/control-center/NotifHistory.tsx | 2 +- src/widget/control-center/QuickActions.tsx | 4 ++-- src/widget/control-center/Sliders.tsx | 2 +- src/widget/control-center/pages/Bluetooth.tsx | 4 ++-- src/widget/control-center/pages/Microphone.tsx | 4 ++-- src/widget/control-center/pages/Network.tsx | 6 +++--- src/widget/control-center/pages/NightLight.tsx | 4 ++-- src/widget/control-center/pages/Page.tsx | 2 +- src/widget/control-center/pages/Sound.tsx | 6 +++--- src/widget/control-center/tiles/DoNotDisturb.tsx | 2 +- src/widget/control-center/tiles/NightLight.tsx | 4 ++-- src/widget/control-center/tiles/Recording.tsx | 4 ++-- src/widget/control-center/tiles/Tile.tsx | 2 +- src/window/AppsWindow.tsx | 4 ++-- src/window/CenterWindow.tsx | 2 +- src/window/FloatingNotifications.tsx | 2 +- src/window/LogoutMenu.tsx | 6 +++--- src/window/OSD.tsx | 2 +- src/windows.ts | 2 +- 53 files changed, 70 insertions(+), 68 deletions(-) rename src/{scripts => modules}/apps.ts (100%) rename src/{scripts => modules}/arg-handler.ts (100%) rename src/{scripts => modules}/auth.ts (100%) rename src/{scripts => modules}/brightness.ts (100%) rename src/{scripts => modules}/clipboard.ts (100%) rename src/{scripts => modules}/compositor.ts (100%) rename src/{scripts => modules}/config.ts (100%) rename src/{scripts => modules}/media.ts (100%) rename src/{scripts => modules}/nightlight.ts (100%) rename src/{scripts => modules}/notifications.ts (100%) rename src/{scripts => modules}/recording.ts (100%) rename src/{scripts => modules}/reload-handler.ts (100%) rename src/{scripts => modules}/stylesheet.ts (100%) rename src/{scripts => modules}/utils.ts (100%) rename src/{scripts => modules}/volume.ts (100%) rename src/{scripts => modules}/wallpaper.ts (100%) diff --git a/src/app.ts b/src/app.ts index f472a79..333463c 100644 --- a/src/app.ts +++ b/src/app.ts @@ -11,21 +11,21 @@ import { PluginWallpapers, PluginWebSearch } from "./runner/plugins"; -import { Wireplumber } from "./scripts/volume"; -import { handleArguments } from "./scripts/arg-handler"; +import { Wireplumber } from "./modules/volume"; +import { handleArguments } from "./modules/arg-handler"; import { Runner } from "./runner/Runner"; import { Windows } from "./windows"; -import { Notifications } from "./scripts/notifications"; -import { Wallpaper } from "./scripts/wallpaper"; -import { Stylesheet } from "./scripts/stylesheet"; -import { Clipboard } from "./scripts/clipboard"; -import { Config } from "./scripts/config"; +import { Notifications } from "./modules/notifications"; +import { Wallpaper } from "./modules/wallpaper"; +import { Stylesheet } from "./modules/stylesheet"; +import { Clipboard } from "./modules/clipboard"; +import { Config } from "./modules/config"; import { Gdk, Gtk } from "ags/gtk4"; import { createRoot, getScope } from "ags"; import { triggerOSD } from "./window/OSD"; import { programArgs, programInvocationName } from "system"; import { setConsoleLogDomain } from "console"; -import { initPlayer } from "./scripts/media"; +import { initPlayer } from "./modules/media"; import GObject, { register } from "ags/gobject"; import AstalNotifd from "gi://AstalNotifd"; diff --git a/src/scripts/apps.ts b/src/modules/apps.ts similarity index 100% rename from src/scripts/apps.ts rename to src/modules/apps.ts diff --git a/src/scripts/arg-handler.ts b/src/modules/arg-handler.ts similarity index 100% rename from src/scripts/arg-handler.ts rename to src/modules/arg-handler.ts diff --git a/src/scripts/auth.ts b/src/modules/auth.ts similarity index 100% rename from src/scripts/auth.ts rename to src/modules/auth.ts diff --git a/src/scripts/brightness.ts b/src/modules/brightness.ts similarity index 100% rename from src/scripts/brightness.ts rename to src/modules/brightness.ts diff --git a/src/scripts/clipboard.ts b/src/modules/clipboard.ts similarity index 100% rename from src/scripts/clipboard.ts rename to src/modules/clipboard.ts diff --git a/src/scripts/compositor.ts b/src/modules/compositor.ts similarity index 100% rename from src/scripts/compositor.ts rename to src/modules/compositor.ts diff --git a/src/scripts/config.ts b/src/modules/config.ts similarity index 100% rename from src/scripts/config.ts rename to src/modules/config.ts diff --git a/src/scripts/media.ts b/src/modules/media.ts similarity index 100% rename from src/scripts/media.ts rename to src/modules/media.ts diff --git a/src/scripts/nightlight.ts b/src/modules/nightlight.ts similarity index 100% rename from src/scripts/nightlight.ts rename to src/modules/nightlight.ts diff --git a/src/scripts/notifications.ts b/src/modules/notifications.ts similarity index 100% rename from src/scripts/notifications.ts rename to src/modules/notifications.ts diff --git a/src/scripts/recording.ts b/src/modules/recording.ts similarity index 100% rename from src/scripts/recording.ts rename to src/modules/recording.ts diff --git a/src/scripts/reload-handler.ts b/src/modules/reload-handler.ts similarity index 100% rename from src/scripts/reload-handler.ts rename to src/modules/reload-handler.ts diff --git a/src/scripts/stylesheet.ts b/src/modules/stylesheet.ts similarity index 100% rename from src/scripts/stylesheet.ts rename to src/modules/stylesheet.ts diff --git a/src/scripts/utils.ts b/src/modules/utils.ts similarity index 100% rename from src/scripts/utils.ts rename to src/modules/utils.ts diff --git a/src/scripts/volume.ts b/src/modules/volume.ts similarity index 100% rename from src/scripts/volume.ts rename to src/modules/volume.ts diff --git a/src/scripts/wallpaper.ts b/src/modules/wallpaper.ts similarity index 100% rename from src/scripts/wallpaper.ts rename to src/modules/wallpaper.ts diff --git a/src/runner/Runner.tsx b/src/runner/Runner.tsx index d3570d7..61b2462 100644 --- a/src/runner/Runner.tsx +++ b/src/runner/Runner.tsx @@ -1,6 +1,6 @@ import { Astal, Gdk, Gtk } from "ags/gtk4"; import { getPopupWindowContainer, PopupWindow } from "../widget/PopupWindow"; -import { updateApps } from "../scripts/apps"; +import { updateApps } from "../modules/apps"; import { ResultWidget, ResultWidgetProps } from "./widgets/ResultWidget"; import { Windows } from "../windows"; import { timeout } from "ags/time"; diff --git a/src/runner/plugins/apps.ts b/src/runner/plugins/apps.ts index b92251c..87cc22c 100644 --- a/src/runner/plugins/apps.ts +++ b/src/runner/plugins/apps.ts @@ -1,4 +1,4 @@ -import { execApp, getAstalApps, lookupIcon, updateApps } from "../../scripts/apps"; +import { execApp, getAstalApps, lookupIcon, updateApps } from "../../modules/apps"; import { Runner } from "../Runner"; export const PluginApps = { diff --git a/src/runner/plugins/clipboard.ts b/src/runner/plugins/clipboard.ts index d13b6e0..c2fa24e 100644 --- a/src/runner/plugins/clipboard.ts +++ b/src/runner/plugins/clipboard.ts @@ -1,5 +1,5 @@ import { Gtk } from "ags/gtk4"; -import { Clipboard } from "../../scripts/clipboard"; +import { Clipboard } from "../../modules/clipboard"; import { Runner } from "../Runner"; import { jsx } from "ags/gtk4/jsx-runtime"; diff --git a/src/runner/plugins/media.ts b/src/runner/plugins/media.ts index e120cc3..939ab30 100644 --- a/src/runner/plugins/media.ts +++ b/src/runner/plugins/media.ts @@ -1,6 +1,6 @@ import { createBinding, createComputed } from "ags"; import { Runner } from "../Runner"; -import { player } from "../../scripts/media"; +import { player } from "../../modules/media"; import AstalMpris from "gi://AstalMpris"; diff --git a/src/runner/plugins/shell.ts b/src/runner/plugins/shell.ts index cf48e3b..82d1844 100644 --- a/src/runner/plugins/shell.ts +++ b/src/runner/plugins/shell.ts @@ -1,5 +1,5 @@ import { Runner } from "../Runner"; -import { Notifications } from "../../scripts/notifications"; +import { Notifications } from "../../modules/notifications"; import GLib from "gi://GLib?version=2.0"; import Gio from "gi://Gio?version=2.0"; diff --git a/src/runner/plugins/wallpapers.ts b/src/runner/plugins/wallpapers.ts index b5c6872..7e3696c 100644 --- a/src/runner/plugins/wallpapers.ts +++ b/src/runner/plugins/wallpapers.ts @@ -1,4 +1,4 @@ -import { Wallpaper } from "../../scripts/wallpaper"; +import { Wallpaper } from "../../modules/wallpaper"; import { Runner } from "../Runner"; import Gio from "gi://Gio?version=2.0"; diff --git a/src/runner/widgets/ResultWidget.tsx b/src/runner/widgets/ResultWidget.tsx index 50b1fab..409c0c2 100644 --- a/src/runner/widgets/ResultWidget.tsx +++ b/src/runner/widgets/ResultWidget.tsx @@ -1,8 +1,10 @@ import { Accessor, With } from "ags"; import { register } from "ags/gobject"; import { Gtk } from "ags/gtk4"; +import { variableToBoolean } from "../../modules/utils"; + import Pango from "gi://Pango?version=1.0"; -import { variableToBoolean } from "../../scripts/utils"; + export { ResultWidget, ResultWidgetProps }; diff --git a/src/widget/CustomDialog.tsx b/src/widget/CustomDialog.tsx index 537b562..85ea27c 100644 --- a/src/widget/CustomDialog.tsx +++ b/src/widget/CustomDialog.tsx @@ -4,7 +4,7 @@ import { PopupWindow } from "./PopupWindow"; import { Separator } from "./Separator"; import { tr } from "../i18n/intl"; import { Accessor } from "ags"; -import { transformWidget, variableToBoolean, WidgetNodeType } from "../scripts/utils"; +import { transformWidget, variableToBoolean, WidgetNodeType } from "../modules/utils"; export type CustomDialogProps = { diff --git a/src/widget/Notification.tsx b/src/widget/Notification.tsx index 4bc1ba1..6a0cd5c 100644 --- a/src/widget/Notification.tsx +++ b/src/widget/Notification.tsx @@ -1,8 +1,8 @@ import { Gdk, Gtk } from "ags/gtk4"; import { Separator } from "./Separator"; -import { HistoryNotification, Notifications } from "../scripts/notifications"; -import { getAppIcon, getSymbolicIcon } from "../scripts/apps"; -import { escapeUnintendedMarkup, pathToURI } from "../scripts/utils"; +import { HistoryNotification, Notifications } from "../modules/notifications"; +import { getAppIcon, getSymbolicIcon } from "../modules/apps"; +import { escapeUnintendedMarkup, pathToURI } from "../modules/utils"; import { onCleanup } from "ags"; import GObject from "ags/gobject"; diff --git a/src/widget/PopupWindow.tsx b/src/widget/PopupWindow.tsx index 0ca2df7..53deeaf 100644 --- a/src/widget/PopupWindow.tsx +++ b/src/widget/PopupWindow.tsx @@ -1,7 +1,7 @@ import { Astal, Gdk, Gtk } from "ags/gtk4"; import { BackgroundWindow } from "./BackgroundWindow"; import { Accessor, CCProps, createComputed, createRoot, getScope } from "ags"; -import { omitObjectKeys, WidgetNodeType } from "../scripts/utils"; +import { omitObjectKeys, WidgetNodeType } from "../modules/utils"; import GObject from "ags/gobject"; diff --git a/src/widget/bar/Clock.tsx b/src/widget/bar/Clock.tsx index 9d692a9..ed1bb97 100644 --- a/src/widget/bar/Clock.tsx +++ b/src/widget/bar/Clock.tsx @@ -1,7 +1,7 @@ import { Gtk } from "ags/gtk4"; import { Windows } from "../../windows"; import { createBinding } from "ags"; -import { time } from "../../scripts/utils"; +import { time } from "../../modules/utils"; import { generalConfig } from "../../app"; diff --git a/src/widget/bar/FocusedClient.tsx b/src/widget/bar/FocusedClient.tsx index e415674..e9574d8 100644 --- a/src/widget/bar/FocusedClient.tsx +++ b/src/widget/bar/FocusedClient.tsx @@ -1,7 +1,7 @@ import { Gtk } from "ags/gtk4"; import { createBinding, With } from "ags"; -import { variableToBoolean } from "../../scripts/utils"; -import { getAppIcon, getSymbolicIcon } from "../../scripts/apps"; +import { variableToBoolean } from "../../modules/utils"; +import { getAppIcon, getSymbolicIcon } from "../../modules/apps"; import Pango from "gi://Pango?version=1.0"; import AstalHyprland from "gi://AstalHyprland"; diff --git a/src/widget/bar/Media.tsx b/src/widget/bar/Media.tsx index 63c1c5f..544ab1d 100644 --- a/src/widget/bar/Media.tsx +++ b/src/widget/bar/Media.tsx @@ -2,9 +2,9 @@ import { Accessor, createBinding, createConnection, onCleanup, With } from "ags" import { Gtk } from "ags/gtk4"; import { Separator } from "../Separator"; import { Windows } from "../../windows"; -import { Clipboard } from "../../scripts/clipboard"; -import { decoder, getPlayerIconFromBusName, variableToBoolean } from "../../scripts/utils"; -import { player, setPlayer } from "../../scripts/media"; +import { Clipboard } from "../../modules/clipboard"; +import { decoder, getPlayerIconFromBusName, variableToBoolean } from "../../modules/utils"; +import { player, setPlayer } from "../../modules/media"; import GObject from "ags/gobject"; import AstalMpris from "gi://AstalMpris"; diff --git a/src/widget/bar/Status.tsx b/src/widget/bar/Status.tsx index a33d505..c35d955 100644 --- a/src/widget/bar/Status.tsx +++ b/src/widget/bar/Status.tsx @@ -1,10 +1,10 @@ import { Gtk } from "ags/gtk4"; -import { Wireplumber } from "../../scripts/volume"; -import { Notifications } from "../../scripts/notifications"; +import { Wireplumber } from "../../modules/volume"; +import { Notifications } from "../../modules/notifications"; import { Windows } from "../../windows"; -import { Recording } from "../../scripts/recording"; +import { Recording } from "../../modules/recording"; import { Accessor, createBinding, createComputed, With } from "ags"; -import { time, variableToBoolean } from "../../scripts/utils"; +import { time, variableToBoolean } from "../../modules/utils"; import GObject from "ags/gobject"; import AstalBluetooth from "gi://AstalBluetooth"; diff --git a/src/widget/bar/Tray.tsx b/src/widget/bar/Tray.tsx index e3e6734..7121163 100644 --- a/src/widget/bar/Tray.tsx +++ b/src/widget/bar/Tray.tsx @@ -1,6 +1,6 @@ import { createBinding, createComputed, For, With } from "ags"; import { Gdk, Gtk } from "ags/gtk4"; -import { variableToBoolean } from "../../scripts/utils"; +import { variableToBoolean } from "../../modules/utils"; import GObject from "gi://GObject?version=2.0"; import AstalTray from "gi://AstalTray" diff --git a/src/widget/bar/Workspaces.tsx b/src/widget/bar/Workspaces.tsx index a4eed41..1107fac 100644 --- a/src/widget/bar/Workspaces.tsx +++ b/src/widget/bar/Workspaces.tsx @@ -1,10 +1,10 @@ import { Gtk } from "ags/gtk4"; import AstalHyprland from "gi://AstalHyprland"; -import { getAppIcon, getSymbolicIcon } from "../../scripts/apps"; +import { getAppIcon, getSymbolicIcon } from "../../modules/apps"; import { Separator } from "../Separator"; import { generalConfig } from "../../app"; import { createBinding, createComputed, createState, For, With } from "ags"; -import { variableToBoolean } from "../../scripts/utils"; +import { variableToBoolean } from "../../modules/utils"; import GObject from "ags/gobject"; diff --git a/src/widget/center-window/BigMedia.tsx b/src/widget/center-window/BigMedia.tsx index b068d21..7c543d0 100644 --- a/src/widget/center-window/BigMedia.tsx +++ b/src/widget/center-window/BigMedia.tsx @@ -1,10 +1,10 @@ import { timeout } from "ags/time"; import { Astal, Gtk } from "ags/gtk4"; -import { Clipboard } from "../../scripts/clipboard"; +import { Clipboard } from "../../modules/clipboard"; import { getMediaUrl } from "../bar/Media"; -import { player, setPlayer } from "../../scripts/media"; +import { player, setPlayer } from "../../modules/media"; import { createBinding, For } from "ags"; -import { pathToURI, variableToBoolean } from "../../scripts/utils"; +import { pathToURI, variableToBoolean } from "../../modules/utils"; import AstalMpris from "gi://AstalMpris"; import AstalIO from "gi://AstalIO"; diff --git a/src/widget/control-center/NotifHistory.tsx b/src/widget/control-center/NotifHistory.tsx index e852631..5f43207 100644 --- a/src/widget/control-center/NotifHistory.tsx +++ b/src/widget/control-center/NotifHistory.tsx @@ -1,5 +1,5 @@ import { Gtk } from "ags/gtk4"; -import { HistoryNotification, Notifications } from "../../scripts/notifications"; +import { HistoryNotification, Notifications } from "../../modules/notifications"; import { NotificationWidget } from "../Notification"; import { tr } from "../../i18n/intl"; import { createBinding, For } from "ags"; diff --git a/src/widget/control-center/QuickActions.tsx b/src/widget/control-center/QuickActions.tsx index 5271df5..f347b4c 100644 --- a/src/widget/control-center/QuickActions.tsx +++ b/src/widget/control-center/QuickActions.tsx @@ -1,7 +1,7 @@ import { Gtk } from "ags/gtk4"; import { Windows } from "../../windows"; -import { Wallpaper } from "../../scripts/wallpaper"; -import { execApp } from "../../scripts/apps"; +import { Wallpaper } from "../../modules/wallpaper"; +import { execApp } from "../../modules/apps"; import { Accessor } from "ags"; import { createPoll } from "ags/time"; diff --git a/src/widget/control-center/Sliders.tsx b/src/widget/control-center/Sliders.tsx index b253328..4b18ace 100644 --- a/src/widget/control-center/Sliders.tsx +++ b/src/widget/control-center/Sliders.tsx @@ -1,5 +1,5 @@ import { Astal, Gtk } from "ags/gtk4"; -import { Wireplumber } from "../../scripts/volume"; +import { Wireplumber } from "../../modules/volume"; import { Pages } from "./Pages"; import { PageSound } from "./pages/Sound"; import { PageMicrophone } from "./pages/Microphone"; diff --git a/src/widget/control-center/pages/Bluetooth.tsx b/src/widget/control-center/pages/Bluetooth.tsx index 482d128..10b4800 100644 --- a/src/widget/control-center/pages/Bluetooth.tsx +++ b/src/widget/control-center/pages/Bluetooth.tsx @@ -2,8 +2,8 @@ import { Gtk } from "ags/gtk4"; import { Page, PageButton } from "./Page"; import { tr } from "../../../i18n/intl"; import { Windows } from "../../../windows"; -import { Notifications } from "../../../scripts/notifications"; -import { execApp } from "../../../scripts/apps"; +import { Notifications } from "../../../modules/notifications"; +import { execApp } from "../../../modules/apps"; import { createBinding, createComputed, For, With } from "ags"; import AstalNotifd from "gi://AstalNotifd"; diff --git a/src/widget/control-center/pages/Microphone.tsx b/src/widget/control-center/pages/Microphone.tsx index 28f6560..16497f9 100644 --- a/src/widget/control-center/pages/Microphone.tsx +++ b/src/widget/control-center/pages/Microphone.tsx @@ -1,9 +1,9 @@ import { Page, PageButton } from "./Page"; -import { Wireplumber } from "../../../scripts/volume"; +import { Wireplumber } from "../../../modules/volume"; import { Gtk } from "ags/gtk4"; import { tr } from "../../../i18n/intl"; import { createBinding, For } from "ags"; -import { lookupIcon } from "../../../scripts/apps"; +import { lookupIcon } from "../../../modules/apps"; import AstalWp from "gi://AstalWp?version=0.1"; diff --git a/src/widget/control-center/pages/Network.tsx b/src/widget/control-center/pages/Network.tsx index d7752f2..62cb4fa 100644 --- a/src/widget/control-center/pages/Network.tsx +++ b/src/widget/control-center/pages/Network.tsx @@ -2,10 +2,10 @@ import { Gtk } from "ags/gtk4"; import { Page, PageButton } from "./Page"; import { Windows } from "../../../windows"; import { tr } from "../../../i18n/intl"; -import { execApp } from "../../../scripts/apps"; -import { Notifications } from "../../../scripts/notifications"; +import { execApp } from "../../../modules/apps"; +import { Notifications } from "../../../modules/notifications"; import { AskPopup, AskPopupProps } from "../../AskPopup"; -import { encoder, variableToBoolean } from "../../../scripts/utils"; +import { encoder, variableToBoolean } from "../../../modules/utils"; import { createBinding, For, With } from "ags"; import GLib from "gi://GLib?version=2.0"; diff --git a/src/widget/control-center/pages/NightLight.tsx b/src/widget/control-center/pages/NightLight.tsx index 16be810..5a06d7c 100644 --- a/src/widget/control-center/pages/NightLight.tsx +++ b/src/widget/control-center/pages/NightLight.tsx @@ -1,8 +1,8 @@ import { Page } from "./Page"; -import { NightLight } from "../../../scripts/nightlight"; +import { NightLight } from "../../../modules/nightlight"; import { tr } from "../../../i18n/intl"; import { Astal, Gtk } from "ags/gtk4"; -import { addSliderMarksFromMinMax } from "../../../scripts/utils"; +import { addSliderMarksFromMinMax } from "../../../modules/utils"; import { createBinding } from "ags"; export const PageNightLight = new Page({ diff --git a/src/widget/control-center/pages/Page.tsx b/src/widget/control-center/pages/Page.tsx index 74c1dac..4a684d6 100644 --- a/src/widget/control-center/pages/Page.tsx +++ b/src/widget/control-center/pages/Page.tsx @@ -1,7 +1,7 @@ import { Gtk } from "ags/gtk4"; import { Separator } from "../../Separator"; import { Accessor, createRoot } from "ags"; -import { transformWidget, variableToBoolean, WidgetNodeType } from "../../../scripts/utils"; +import { transformWidget, variableToBoolean, WidgetNodeType } from "../../../modules/utils"; import Pango from "gi://Pango?version=1.0"; diff --git a/src/widget/control-center/pages/Sound.tsx b/src/widget/control-center/pages/Sound.tsx index 49e9a0c..c7dd904 100644 --- a/src/widget/control-center/pages/Sound.tsx +++ b/src/widget/control-center/pages/Sound.tsx @@ -1,10 +1,10 @@ import { Page, PageButton } from "./Page"; import { Astal, Gtk } from "ags/gtk4"; -import { getAppIcon, lookupIcon } from "../../../scripts/apps"; -import { Wireplumber } from "../../../scripts/volume"; +import { getAppIcon, lookupIcon } from "../../../modules/apps"; +import { Wireplumber } from "../../../modules/volume"; import { tr } from "../../../i18n/intl"; import { createBinding, For } from "ags"; -import { variableToBoolean } from "../../../scripts/utils"; +import { variableToBoolean } from "../../../modules/utils"; import AstalWp from "gi://AstalWp"; import GObject from "gi://GObject?version=2.0"; diff --git a/src/widget/control-center/tiles/DoNotDisturb.tsx b/src/widget/control-center/tiles/DoNotDisturb.tsx index ed8e440..02568ec 100644 --- a/src/widget/control-center/tiles/DoNotDisturb.tsx +++ b/src/widget/control-center/tiles/DoNotDisturb.tsx @@ -1,4 +1,4 @@ -import { Notifications } from "../../../scripts/notifications"; +import { Notifications } from "../../../modules/notifications"; import { Tile } from "./Tile"; import { tr } from "../../../i18n/intl"; import { createBinding } from "ags"; diff --git a/src/widget/control-center/tiles/NightLight.tsx b/src/widget/control-center/tiles/NightLight.tsx index 5def169..d63ad45 100644 --- a/src/widget/control-center/tiles/NightLight.tsx +++ b/src/widget/control-center/tiles/NightLight.tsx @@ -1,9 +1,9 @@ import { Tile } from "./Tile"; -import { NightLight } from "../../../scripts/nightlight"; +import { NightLight } from "../../../modules/nightlight"; import { PageNightLight } from "../pages/NightLight"; import { tr } from "../../../i18n/intl"; import { TilesPages } from "../Tiles"; -import { isInstalled } from "../../../scripts/utils"; +import { isInstalled } from "../../../modules/utils"; import { createBinding, createComputed } from "ags"; export const TileNightLight = () => diff --git a/src/widget/control-center/tiles/Recording.tsx b/src/widget/control-center/tiles/Recording.tsx index 5dd5bd9..b488741 100644 --- a/src/widget/control-center/tiles/Recording.tsx +++ b/src/widget/control-center/tiles/Recording.tsx @@ -1,7 +1,7 @@ import { Tile } from "./Tile"; -import { Recording } from "../../../scripts/recording"; +import { Recording } from "../../../modules/recording"; import { tr } from "../../../i18n/intl"; -import { isInstalled, time } from "../../../scripts/utils"; +import { isInstalled, time } from "../../../modules/utils"; import { createBinding, createComputed } from "ags"; diff --git a/src/widget/control-center/tiles/Tile.tsx b/src/widget/control-center/tiles/Tile.tsx index 98ec5d4..20bd100 100644 --- a/src/widget/control-center/tiles/Tile.tsx +++ b/src/widget/control-center/tiles/Tile.tsx @@ -1,7 +1,7 @@ import { Gtk } from "ags/gtk4"; import { tr } from "../../../i18n/intl"; import { Accessor, createBinding, createComputed, createState, getScope, onCleanup } from "ags"; -import { omitObjectKeys, variableToBoolean } from "../../../scripts/utils"; +import { omitObjectKeys, variableToBoolean } from "../../../modules/utils"; import GObject, { property, register, signal } from "ags/gobject"; import Pango from "gi://Pango?version=1.0"; diff --git a/src/window/AppsWindow.tsx b/src/window/AppsWindow.tsx index 694edc9..fcddcb0 100644 --- a/src/window/AppsWindow.tsx +++ b/src/window/AppsWindow.tsx @@ -1,11 +1,11 @@ import { Astal, Gdk, Gtk } from "ags/gtk4"; -import { execApp, getAppIcon, getApps, getAstalApps } from "../scripts/apps"; +import { execApp, getAppIcon, getApps, getAstalApps } from "../modules/apps"; import { getPopupWindowContainer, PopupWindow } from "../widget/PopupWindow"; import AstalApps from "gi://AstalApps"; import Pango from "gi://Pango?version=1.0"; import { createState, For } from "ags"; -import { escapeUnintendedMarkup } from "../scripts/utils"; +import { escapeUnintendedMarkup } from "../modules/utils"; const ignoredKeys = [ diff --git a/src/window/CenterWindow.tsx b/src/window/CenterWindow.tsx index b05ec8f..e2f7fb3 100644 --- a/src/window/CenterWindow.tsx +++ b/src/window/CenterWindow.tsx @@ -2,7 +2,7 @@ import { Gtk } from "ags/gtk4"; import { Separator } from "../widget/Separator"; import { PopupWindow } from "../widget/PopupWindow"; import { BigMedia } from "../widget/center-window/BigMedia"; -import { time, variableToBoolean } from "../scripts/utils"; +import { time, variableToBoolean } from "../modules/utils"; import { createBinding } from "ags"; import AstalMpris from "gi://AstalMpris?version=0.1"; diff --git a/src/window/FloatingNotifications.tsx b/src/window/FloatingNotifications.tsx index cb1d339..7621f48 100644 --- a/src/window/FloatingNotifications.tsx +++ b/src/window/FloatingNotifications.tsx @@ -1,6 +1,6 @@ import { Astal, Gtk } from "ags/gtk4"; import { createBinding, For } from "ags"; -import { Notifications } from "../scripts/notifications"; +import { Notifications } from "../modules/notifications"; import { NotificationWidget } from "../widget/Notification"; import AstalNotifd from "gi://AstalNotifd?version=0.1"; diff --git a/src/window/LogoutMenu.tsx b/src/window/LogoutMenu.tsx index c459088..9153bfb 100644 --- a/src/window/LogoutMenu.tsx +++ b/src/window/LogoutMenu.tsx @@ -2,9 +2,9 @@ import { Astal, Gdk, Gtk } from "ags/gtk4"; import { execAsync } from "ags/process"; import { generalConfig } from "../app"; import { AskPopup } from "../widget/AskPopup"; -import { Notifications } from "../scripts/notifications"; -import { NightLight } from "../scripts/nightlight"; -import { time } from "../scripts/utils"; +import { Notifications } from "../modules/notifications"; +import { NightLight } from "../modules/nightlight"; +import { time } from "../modules/utils"; import GObject from "ags/gobject"; import AstalNotifd from "gi://AstalNotifd"; diff --git a/src/window/OSD.tsx b/src/window/OSD.tsx index abe9702..fe2f0f0 100644 --- a/src/window/OSD.tsx +++ b/src/window/OSD.tsx @@ -1,6 +1,6 @@ import { Astal, Gtk } from "ags/gtk4"; import { createBinding, createState } from "ags"; -import { Wireplumber } from "../scripts/volume"; +import { Wireplumber } from "../modules/volume"; import { Windows } from "../windows"; import { Time, timeout } from "ags/time"; diff --git a/src/windows.ts b/src/windows.ts index 493ed44..8e0c511 100644 --- a/src/windows.ts +++ b/src/windows.ts @@ -1,6 +1,6 @@ import { Astal } from "ags/gtk4"; import { Bar } from "./window/Bar"; -import { variableToBoolean } from "./scripts/utils"; +import { variableToBoolean } from "./modules/utils"; import { OSD } from "./window/OSD"; import { ControlCenter } from "./window/ControlCenter"; import { FloatingNotifications } from "./window/FloatingNotifications";