From 07ad1cddbe48bf1dd4b4fa4ed28be213634ff53c Mon Sep 17 00:00:00 2001 From: matt1432 Date: Mon, 4 Sep 2023 21:41:06 -0400 Subject: [PATCH] refactor(ags): start rearranging ags files --- config/ags/{scripts => bin}/heart.sh | 0 config/ags/{scripts => bin}/osk-toggle.sh | 0 config/ags/config.js | 14 +-- .../bar}/current-window.js | 0 .../{traybuttons => js/bar}/traybuttons.js | 4 +- .../ags/{workspaces => js/bar}/workspaces.js | 0 config/ags/{closer/closer.js => js/common.js} | 0 config/ags/{powermenu => js}/powermenu.js | 0 config/ags/{colors.scss => scss/common.scss} | 0 config/ags/scss/main.scss | 8 ++ .../widgets}/powermenu.scss | 0 .../widgets}/traybuttons.scss | 0 .../widgets}/workspaces.scss | 0 config/ags/style.css | 116 ++++++++++++++++++ config/ags/style.scss | 8 -- nixos/home/dotfiles.nix | 3 +- 16 files changed, 134 insertions(+), 19 deletions(-) rename config/ags/{scripts => bin}/heart.sh (100%) rename config/ags/{scripts => bin}/osk-toggle.sh (100%) rename config/ags/{current-window => js/bar}/current-window.js (100%) rename config/ags/{traybuttons => js/bar}/traybuttons.js (94%) rename config/ags/{workspaces => js/bar}/workspaces.js (100%) rename config/ags/{closer/closer.js => js/common.js} (100%) rename config/ags/{powermenu => js}/powermenu.js (100%) rename config/ags/{colors.scss => scss/common.scss} (100%) create mode 100644 config/ags/scss/main.scss rename config/ags/{powermenu => scss/widgets}/powermenu.scss (100%) rename config/ags/{traybuttons => scss/widgets}/traybuttons.scss (100%) rename config/ags/{workspaces => scss/widgets}/workspaces.scss (100%) create mode 100644 config/ags/style.css delete mode 100644 config/ags/style.scss diff --git a/config/ags/scripts/heart.sh b/config/ags/bin/heart.sh similarity index 100% rename from config/ags/scripts/heart.sh rename to config/ags/bin/heart.sh diff --git a/config/ags/scripts/osk-toggle.sh b/config/ags/bin/osk-toggle.sh similarity index 100% rename from config/ags/scripts/osk-toggle.sh rename to config/ags/bin/osk-toggle.sh diff --git a/config/ags/config.js b/config/ags/config.js index dfcdd5a4..da692cb1 100644 --- a/config/ags/config.js +++ b/config/ags/config.js @@ -1,13 +1,13 @@ -import { execAsync, writeFile } from 'resource:///com/github/Aylur/ags/utils.js'; -import { Powermenu } from 'file:///home/matt/.nix/config/ags/powermenu/powermenu.js'; -import { LeftBar } from 'file:///home/matt/.nix/config/ags/traybuttons/traybuttons.js'; -import { Closer } from 'file:///home/matt/.nix/config/ags/closer/closer.js'; +import { exec } from 'resource:///com/github/Aylur/ags/utils.js'; +import { Powermenu } from './js/powermenu.js'; +import { LeftBar } from './js/bar/traybuttons.js'; +import { Closer } from './js/common.js'; -const scss = ags.App.configDir + '/style.scss'; +const scss = ags.App.configDir + '/scss/main.scss'; const css = ags.App.configDir + '/style.css'; -ags.Utils.exec(`touch ${css}`); -ags.Utils.exec(`sassc ${scss} ${css}`); +exec(`touch ${css}`); +exec(`sassc ${scss} ${css}`); export default { style: css, diff --git a/config/ags/current-window/current-window.js b/config/ags/js/bar/current-window.js similarity index 100% rename from config/ags/current-window/current-window.js rename to config/ags/js/bar/current-window.js diff --git a/config/ags/traybuttons/traybuttons.js b/config/ags/js/bar/traybuttons.js similarity index 94% rename from config/ags/traybuttons/traybuttons.js rename to config/ags/js/bar/traybuttons.js index 2c12e268..25456e20 100644 --- a/config/ags/traybuttons/traybuttons.js +++ b/config/ags/js/bar/traybuttons.js @@ -1,7 +1,7 @@ import Gdk from 'gi://Gdk'; const display = Gdk.Display.get_default(); -import { CurrentWindow } from 'file:///home/matt/.nix/config/ags/current-window/current-window.js'; -import { Workspaces } from 'file:///home/matt/.nix/config/ags/workspaces/workspaces.js'; +import { CurrentWindow } from './current-window.js'; +import { Workspaces } from './workspaces.js'; const Separator = width => ags.Widget.Box({ style: `min-width: ${width}px;`, diff --git a/config/ags/workspaces/workspaces.js b/config/ags/js/bar/workspaces.js similarity index 100% rename from config/ags/workspaces/workspaces.js rename to config/ags/js/bar/workspaces.js diff --git a/config/ags/closer/closer.js b/config/ags/js/common.js similarity index 100% rename from config/ags/closer/closer.js rename to config/ags/js/common.js diff --git a/config/ags/powermenu/powermenu.js b/config/ags/js/powermenu.js similarity index 100% rename from config/ags/powermenu/powermenu.js rename to config/ags/js/powermenu.js diff --git a/config/ags/colors.scss b/config/ags/scss/common.scss similarity index 100% rename from config/ags/colors.scss rename to config/ags/scss/common.scss diff --git a/config/ags/scss/main.scss b/config/ags/scss/main.scss new file mode 100644 index 00000000..509df54e --- /dev/null +++ b/config/ags/scss/main.scss @@ -0,0 +1,8 @@ +* { + all: unset; +} + +@import "./common.scss"; +@import "./widgets/powermenu.scss"; +@import "./widgets/traybuttons.scss"; +@import "./widgets/workspaces.scss"; diff --git a/config/ags/powermenu/powermenu.scss b/config/ags/scss/widgets/powermenu.scss similarity index 100% rename from config/ags/powermenu/powermenu.scss rename to config/ags/scss/widgets/powermenu.scss diff --git a/config/ags/traybuttons/traybuttons.scss b/config/ags/scss/widgets/traybuttons.scss similarity index 100% rename from config/ags/traybuttons/traybuttons.scss rename to config/ags/scss/widgets/traybuttons.scss diff --git a/config/ags/workspaces/workspaces.scss b/config/ags/scss/widgets/workspaces.scss similarity index 100% rename from config/ags/workspaces/workspaces.scss rename to config/ags/scss/widgets/workspaces.scss diff --git a/config/ags/style.css b/config/ags/style.css new file mode 100644 index 00000000..5a312371 --- /dev/null +++ b/config/ags/style.css @@ -0,0 +1,116 @@ +* { + all: unset; } + +.powermenu { + background-color: rgba(40, 42, 54, 0.8); + color: #a5b6cf; + padding: 10px; + font-family: MesloLGS NF; + /*font-family: Iosevka Nerd Font;*/ + font-size: 70px; + border-radius: 30px; + border: 2px solid rgba(189, 147, 249, 0.8); } + .powermenu label { + min-width: 140px; + min-height: 130px; } + .powermenu button { + margin-right: 10px; + margin-left: 10px; + margin-top: 5px; + margin-bottom: 5px; + border-radius: 12px; + min-width: 80px; + transition: all ease .2s; } + .powermenu button:hover { + background-color: #11131c; } + .powermenu button:active { + background-color: #11131c; } + .powermenu button .content { + border-radius: 4px; + padding: 0px 15px 0px 15px; } + .powermenu .shutdown { + color: #dd6777; } + .powermenu .reboot { + color: #c296eb; } + .powermenu .logout { + color: #ecd3a0; } + +.powermenu-clickhandler { + background-color: black; } + +.osk-toggle, +.tablet-toggle, +.heart-toggle { + font-size: 28px; + min-height: 40px; + min-width: 53px; } + +.notif-panel { + font-size: 20px; + border-radius: 80px; + min-height: 37px; + min-width: 105px; + padding: 1px 0px 1px 5px; } + .notif-panel .toggle-on { + border-top-left-radius: 22px; + border-top-right-radius: 22px; + border-bottom-left-radius: 0px; + border-bottom-right-radius: 0px; + border-bottom: 0px solid rgba(40, 42, 54, 0.8); } + +.filler { + border-left: 2px solid rgba(189, 147, 249, 0.8); + border-right: 2px solid rgba(189, 147, 249, 0.8); + min-height: 14px; + min-width: 105px; + background-color: rgba(40, 42, 54, 0.8); + transition: all 0.5s; } + +.quick-settings-toggle { + font-size: 24px; + min-height: 40px; + min-width: 40px; + padding: 0px 0px 0px 0px; } + +.toggle-off { + background-color: rgba(40, 42, 54, 0.8); + color: #CBA6F7; + border-radius: 80px; + border: 2px solid #1b1b2b; + transition: background-color 0.5s ease-in-out, border 0.5s ease-in-out; } + +.toggle-on { + background-color: rgba(40, 42, 54, 0.8); + color: #CBA6F7; + border-radius: 80px; + border: 2px solid rgba(189, 147, 249, 0.8); + transition: background-color 0.5s ease-in-out, border 0.5s ease-in-out; } + +.toggle-on:hover, .toggle-off:hover { + background-color: rgba(127, 132, 156, 0.4); + transition: background-color 0.5s ease-in-out, border 0.5s ease-in-out; } + +.workspaces { + background-color: rgba(40, 42, 54, 0.8); + border-radius: 80px; + border: 2px solid #1b1b1b; + padding-top: 3px; + padding-bottom: 3px; + padding-left: 12px; + padding-right: 12px; } + .workspaces .button { + margin: 2px; + min-width: 20px; + border-radius: 100%; } + .workspaces .button * { + color: transparent; } + .workspaces .empty { + border: none; + transition: border-color 0.25s linear; } + .workspaces .occupied { + border: 2px solid rgba(40, 42, 54, 0.8); + background: rgba(189, 147, 249, 0.8); + transition: border-color 0.25s linear; } + .workspaces .active { + border: 2px solid #50fa7b; + transition: border-color 0.25s linear; } diff --git a/config/ags/style.scss b/config/ags/style.scss deleted file mode 100644 index 22ca53cb..00000000 --- a/config/ags/style.scss +++ /dev/null @@ -1,8 +0,0 @@ -* { - all: unset; -} - -@import "/home/matt/.nix/config/ags/colors.scss"; -@import "/home/matt/.nix/config/ags/powermenu/powermenu.scss"; -@import "/home/matt/.nix/config/ags/traybuttons/traybuttons.scss"; -@import "/home/matt/.nix/config/ags/workspaces/workspaces.scss"; diff --git a/nixos/home/dotfiles.nix b/nixos/home/dotfiles.nix index 5eb5c6c3..617c286f 100644 --- a/nixos/home/dotfiles.nix +++ b/nixos/home/dotfiles.nix @@ -14,8 +14,7 @@ in "gtklock/config.ini".source = config.lib.file.mkOutOfStoreSymlink "${configDir}/gtklock/config.ini"; "gtklock/style.css".source = config.lib.file.mkOutOfStoreSymlink "${configDir}/gtklock/style.css"; - "ags/config.js".source = config.lib.file.mkOutOfStoreSymlink "${configDir}/ags/config.js"; - "ags/style.scss".source = config.lib.file.mkOutOfStoreSymlink "${configDir}/ags/style.scss"; + "ags".source = config.lib.file.mkOutOfStoreSymlink "${configDir}/ags"; }; programs = {