diff --git a/modules/bar/bluetooth/index.js b/modules/bar/bluetooth/index.js index 22832fc..f491b34 100644 --- a/modules/bar/bluetooth/index.js +++ b/modules/bar/bluetooth/index.js @@ -3,12 +3,12 @@ import { closeAllMenus } from "../bar.js"; const Bluetooth = () => { const btIcon = Widget.Label({ - label: bluetooth.bind("enabled").as((v) => v ? "󰂯 " : "󰂲 "), + label: bluetooth.bind("enabled").as((v) => v ? "󰂯" : "󰂲"), class_name: "bar-bt_icon", }); const btText = Widget.Label({ - label: bluetooth.bind("enabled").as((v) => v ? "On" : "Off"), + label: bluetooth.bind("enabled").as((v) => v ? " On" : " Off"), class_name: "bar-bt_label", }); diff --git a/modules/bar/clock/index.js b/modules/bar/clock/index.js index 4b6dd24..ad0a41f 100644 --- a/modules/bar/clock/index.js +++ b/modules/bar/clock/index.js @@ -1,5 +1,5 @@ const date = Variable("", { - poll: [1000, 'date "+󰃭 %a %b %d 󱑍 %I:%M:%S %p"'], + poll: [1000, 'date "+󰃭 %a %b %d  %I:%M:%S %p"'], }); const Clock = () => { diff --git a/modules/bar/media/index.js b/modules/bar/media/index.js index 807431d..a4f6dd4 100644 --- a/modules/bar/media/index.js +++ b/modules/bar/media/index.js @@ -31,14 +31,14 @@ const Media = () => { const getIconForPlayer = (playerName) => { const windowTitleMap = [ - ["Mozilla Firefox", "󰈹"], - ["Microsoft Edge", "󰇩"], - ["(.*)Discord(.*)", ""], - ["Plex", "󰚺 Plex"], - ["(.*) Spotify Free", "󰓇"], - ["(.*)Spotify Premium", "󰓇"], - ["Spotify", "󰓇"], - ["(.*)", "󰝚"], + ["Mozilla Firefox", "󰈹 "], + ["Microsoft Edge", "󰇩 "], + ["(.*)Discord(.*)", " "], + ["Plex", "󰚺 "], + ["(.*) Spotify Free", "󰓇 "], + ["(.*)Spotify Premium", "󰓇 "], + ["Spotify", "󰓇 "], + ["(.*)", "󰝚 "], ]; const foundMatch = windowTitleMap.find((wt) => diff --git a/modules/bar/network/index.js b/modules/bar/network/index.js index 4eb3d6d..dc0ee1b 100644 --- a/modules/bar/network/index.js +++ b/modules/bar/network/index.js @@ -17,12 +17,13 @@ const Network = () => { const wiredIndicator = [ Widget.Label({ - label: network.bind("wired").as(() => "󰈀 Wired"), + label: network.bind("wired").as(() => "󰈀 Wired"), }), ]; return { component: Widget.Box({ + vpack: "center", class_name: "bar-network", children: network .bind("primary") diff --git a/modules/bar/power/index.js b/modules/bar/power/index.js index a970b90..db538d0 100644 --- a/modules/bar/power/index.js +++ b/modules/bar/power/index.js @@ -3,9 +3,9 @@ export const Power = () => { component: Widget.Box({ child: Widget.Button({ class_name: "bar-powermenu", - child: Widget.Label({ + child: Widget.Icon({ class_name: "bar-power_label", - label: "⏻", + icon: "system-shutdown-symbolic", }), }), }), diff --git a/modules/bar/volume/index.js b/modules/bar/volume/index.js index add8488..49b49cc 100644 --- a/modules/bar/volume/index.js +++ b/modules/bar/volume/index.js @@ -26,17 +26,20 @@ const Volume = () => { }; const volIcn = Widget.Label({ + vpack: "center", label: getIcon(), class_name: "bar-volume_icon", }); const volPct = Widget.Label({ - label: audio.speaker.bind("volume").as((v) => ` ${Math.floor(v * 100)}%`), + vpack: "center", + label: audio.speaker.bind("volume").as((v) => ` ${Math.floor(v * 100)}%`), class_name: "bar-volume_percentage", }); return { component: Widget.Box({ + vpack: "center", class_name: "volume", children: [volIcn, volPct], }), diff --git a/modules/bar/window_title/index.js b/modules/bar/window_title/index.js index 3281015..6033a1d 100644 --- a/modules/bar/window_title/index.js +++ b/modules/bar/window_title/index.js @@ -2,17 +2,17 @@ const hyprland = await Service.import("hyprland"); const filterTitle = (windowtitle) => { const windowTitleMap = [ - ["kitty", "󰄛 Kitty Terminal"], - ["firefox", "󰈹 Firefox"], - ["microsoft-edge", "󰇩 Edge"], - ["discord", " Discord"], - ["org.kde.dolphin", " Dolphin"], - ["plex", "󰚺 Plex"], - ["steam", " Steam"], - ["", "󰇄 Desktop"], - ["spotify", "󰓇 Spotify"], - ["obsidian", "󱓧 Obsidian"], - ["(.+)", `󰣆 ${windowtitle.class.charAt(0).toUpperCase() + windowtitle.class.slice(1)}`], + ["kitty", "󰄛 Kitty Terminal"], + ["firefox", "󰈹 Firefox"], + ["microsoft-edge", "󰇩 Edge"], + ["discord", " Discord"], + ["org.kde.dolphin", " Dolphin"], + ["plex", "󰚺 Plex"], + ["steam", " Steam"], + ["", "󰇄 Desktop"], + ["spotify", "󰓇 Spotify"], + ["obsidian", "󱓧 Obsidian"], + ["(.+)", `󰣆 ${windowtitle.class.charAt(0).toUpperCase() + windowtitle.class.slice(1)}`], ]; const foundMatch = windowTitleMap.find((wt) => diff --git a/scss/bar/bluetooth.scss b/scss/bar/bluetooth.scss index 5f45c26..b144790 100644 --- a/scss/bar/bluetooth.scss +++ b/scss/bar/bluetooth.scss @@ -1,7 +1,7 @@ @import '../colors'; .bar-bt_icon { - font-size: 1.2em; + font-size: 1.15em; color: $sky; } diff --git a/scss/bar/power.scss b/scss/bar/power.scss index 1bd2014..39929a2 100644 --- a/scss/bar/power.scss +++ b/scss/bar/power.scss @@ -2,5 +2,5 @@ .bar-power_label { color: $red; - margin-right: 0.2rem; + margin-top: 0.2rem; } diff --git a/scss/main.scss b/scss/main.scss index 3f65ee5..ca93a9f 100644 --- a/scss/main.scss +++ b/scss/main.scss @@ -1,8 +1,8 @@ * { all: unset; - font-family: "JetBrains Mono Nerd Font"; - font-size: 1.15rem; - font-weight: bold; + font-family: "Ubuntu"; + font-size: 1.2rem; + font-weight: 600; } //general diff --git a/scss/menus/media.scss b/scss/menus/media.scss index b4ac4ce..4834d22 100644 --- a/scss/menus/media.scss +++ b/scss/menus/media.scss @@ -1,7 +1,7 @@ @import "../colors"; .media-indicator-container { - min-width: 41rem; + min-width: 40rem; min-height: 10rem; background: $mantle; border: 0.25rem solid $surface0; diff --git a/style.css b/style.css index d7faa4f..c5cffd2 100644 --- a/style.css +++ b/style.css @@ -1,8 +1,8 @@ * { all: unset; - font-family: "JetBrains Mono Nerd Font"; - font-size: 1.15rem; - font-weight: bold; + font-family: "Ubuntu"; + font-size: 1.2rem; + font-weight: 600; } menu { @@ -304,7 +304,7 @@ spinner:checked { } .bar-bt_icon { - font-size: 1.2em; + font-size: 1.15em; color: #89dceb; } @@ -387,7 +387,7 @@ spinner:checked { .bar-power_label { color: #f38ba8; - margin-right: 0.2rem; + margin-top: 0.2rem; } .bar { @@ -896,7 +896,7 @@ window#powermenu .powermenu.box { } .media-indicator-container { - min-width: 41rem; + min-width: 40rem; min-height: 10rem; background: #181825; border: 0.25rem solid #313244;