diff --git a/.config/ags/config.js b/.config/ags/config.js index d5614b7d0..25df63fbc 100644 --- a/.config/ags/config.js +++ b/.config/ags/config.js @@ -1,12 +1,11 @@ "strict mode"; // Import import { App, Utils } from './imports.js'; -import { firstRunWelcome } from './services/messages.js'; // Widgets import Bar from './widgets/bar/main.js'; import Cheatsheet from './widgets/cheatsheet/main.js'; -import DesktopBackground from './widgets/desktopbackground/main.js'; -import Dock from './widgets/dock/main.js'; +// import DesktopBackground from './widgets/desktopbackground/main.js'; +// import Dock from './widgets/dock/main.js'; import { CornerTopleft, CornerTopright, CornerBottomleft, CornerBottomright } from './widgets/screencorners/main.js'; import Indicator from './widgets/indicators/main.js'; import Osk from './widgets/onscreenkeyboard/main.js'; @@ -15,18 +14,20 @@ import Session from './widgets/session/main.js'; import SideLeft from './widgets/sideleft/main.js'; import SideRight from './widgets/sideright/main.js'; -// Longer than actual anim time (see styles) to make sure widgets animate fully -const CLOSE_ANIM_TIME = 210; +const CLOSE_ANIM_TIME = 210; // Longer than actual anim time (see styles) to make sure widgets animate fully -// Init cache and check first run +// Init cache Utils.exec(`bash -c 'mkdir -p ~/.cache/ags/user/colorschemes'`); - // SCSS compilation Utils.exec(`bash -c 'echo "" > ${App.configDir}/scss/_musicwal.scss'`); // reset music styles Utils.exec(`bash -c 'echo "" > ${App.configDir}/scss/_musicmaterial.scss'`); // reset music styles -Utils.exec(`sassc ${App.configDir}/scss/main.scss ${App.configDir}/style.css`); -App.resetCss(); -App.applyCss(`${App.configDir}/style.css`); +function applyStyle() { + Utils.exec(`sassc ${App.configDir}/scss/main.scss ${App.configDir}/style.css`); + App.resetCss(); + App.applyCss(`${App.configDir}/style.css`); + console.log('[LOG] Styles loaded') +} +applyStyle(); // Config object export default { @@ -38,13 +39,12 @@ export default { 'osk': CLOSE_ANIM_TIME, }, windows: [ - // Bar() is below CornerTopleft(), CornerTopright(), CornerBottomleft(), CornerBottomright(), - DesktopBackground(), - Dock(), // Buggy + // DesktopBackground(), + // Dock(), // Buggy Overview(), Indicator(), Cheatsheet(), @@ -52,13 +52,6 @@ export default { SideRight(), Osk(), // On-screen keyboard Session(), // Power menu, if that's what you like to call it + Bar(), ], }; - -// We don't want context menus of the bar's tray go under the rounded corner below, -// So bar is returned after 1ms, making it get spawned after the corner -// And having an Utils.timeout in that window array just gives an error -// Not having it in default export is fine since we don't need to toggle it -Bar(); - -// uwu \ No newline at end of file diff --git a/.config/ags/data/keyboardlayouts.js b/.config/ags/data/keyboardlayouts.js index f58e378a4..26cb23d63 100644 --- a/.config/ags/data/keyboardlayouts.js +++ b/.config/ags/data/keyboardlayouts.js @@ -111,4 +111,4 @@ export const oskLayouts = { ] ] } -} \ No newline at end of file +} diff --git a/.config/ags/data/sourceviewtheme.xml b/.config/ags/data/sourceviewtheme.xml index cecf966b8..61b3324d1 100644 --- a/.config/ags/data/sourceviewtheme.xml +++ b/.config/ags/data/sourceviewtheme.xml @@ -29,7 +29,7 @@