summaryrefslogtreecommitdiff
path: root/waybar
diff options
context:
space:
mode:
authorzsmith <zsmith@newhopechurch.tv>2025-07-30 09:16:10 -0500
committerzsmith <zsmith@newhopechurch.tv>2025-07-30 09:16:10 -0500
commit891de8e4c0ea0e4e141de22e684c4ec3c1a4f630 (patch)
tree0899ecc583833235971ce44a3a74b3f5ab8c93d2 /waybar
parent881727689c3a32161d9ed0333cde2ec905a9c747 (diff)
parent08655b7b49d8c970b1f0020ccc807209c298c127 (diff)
Merge remote-tracking branch 'origin/master' into mac
Diffstat (limited to 'waybar')
-rw-r--r--waybar/config85
-rw-r--r--waybar/style.css30
2 files changed, 107 insertions, 8 deletions
diff --git a/waybar/config b/waybar/config
index 77f7386..933dedc 100644
--- a/waybar/config
+++ b/waybar/config
@@ -1,3 +1,4 @@
+// vim: set filetype=json5 :
{
"layer": "bottom",
"position": "top",
@@ -5,7 +6,7 @@
//"output": "%%DISPLAY%%",
"spacing": 4,
//"margin-top": 5,
- //"margin-bottom":5,
+ //"margin-bottom": 5,
// Choose the order of the modules
@@ -15,6 +16,57 @@
// Modules configuration
+ "sway/workspaces": {
+ "all-outputs": false,
+ "persistent-workspaces": {
+ "11": ["eDP-1"],
+ "12": ["eDP-1"],
+ "13": ["eDP-1"],
+ "14": ["eDP-1"],
+ "15": ["eDP-1"],
+ "16": ["eDP-1"],
+ "17": ["eDP-1"],
+ "18": ["eDP-1"],
+ "19": ["eDP-1"],
+ },
+ "format": "{icon}",
+ "format-icons": {
+ "1": "1",
+ "2": "2",
+ "3": "3",
+ "4": "4",
+ "5": "5",
+ "6": "6",
+ "7": "7",
+ "8": "8",
+ "9": "9",
+ "10": "0",
+ "11": "1",
+ "12": "2",
+ "13": "3",
+ "14": "4",
+ "15": "5",
+ "16": "6",
+ "17": "7",
+ "18": "8",
+ "19": "9",
+ "20": "0",
+ "21": "1",
+ "22": "2",
+ "23": "3",
+ "24": "4",
+ "25": "5",
+ "26": "6",
+ "27": "7",
+ "28": "8",
+ "29": "9",
+ },
+ },
+ "niri/workspaces": {
+ "format": "{value}",
+ "all-outputs": false,
+ "on-click": "activate"
+ },
"hyprland/workspaces": {
"format": "{icon}",
"active-only": false,
@@ -42,13 +94,27 @@
"persistent-workspaces": {
"eDP-1": [ 1, 2, 3, 4, 5, 6, 7, 8, 9 ],
},
- "on-scroll-up": "hyprctl dispatch split-workspace e+1",
- "on-scroll-down": "hyprctl dispatch split-workspace e-1",
+ "on-scroll-up": "hyprctl dispatch split:workspace r+1",
+ "on-scroll-down": "hyprctl dispatch split:workspace r-1",
"on-click": "activate"
},
+ "sway/window": {
+ "separate-outputs": true,
+ "icon": true,
+ "format": "{title}",
+ "expand": true
+ },
+ "niri/window": {
+ "separate-outputs": true,
+ "icon": true,
+ "format": "{title}",
+ "expand": true
+ },
"hyprland/window": {
"separate-outputs": true,
- "format": "{}"
+ "icon": true,
+ "format": "{title}",
+ "expand": true,
},
"keyboard-state": {
"numlock": true,
@@ -144,12 +210,19 @@
"scroll-step": 0.1
},
"custom/launcher":{
- "format": "",
+ "format": ">_",
"on-click": "rofi -show drun",
//"on-click-right": "killall rofi"
},
+ "custom/battery":{
+ "interval": 15,
+ "format": "{percentage}%",
+ "return-type": "json",
+ "exec": "custom-battery",
+ "tooltip": true,
+ },
"custom/power":{
- "format": " ",
+ "format": "",
"on-click": "rofi -show p -modi p:rofi-power-menu",
//"on-click-right": "killall rofi"
},
diff --git a/waybar/style.css b/waybar/style.css
index fefb890..6ecb923 100644
--- a/waybar/style.css
+++ b/waybar/style.css
@@ -3,7 +3,7 @@
margin: 0px;
border-radius: 0px;
/* `otf-font-awesome` is required to be installed for icons */
- font-family: FiraCode Nerd Font Mono;
+ font-family: JetBrainsMono Nerd Font;
font-size: 18px;
min-height: 0px;
min-width: 0px;
@@ -14,6 +14,7 @@ window#waybar {
color: #ffffff;
transition-property: background-color;
transition-duration: .5s;
+ background: rgba(0, 0, 0, 0.2);
}
window#waybar.hidden {
@@ -56,6 +57,10 @@ window#waybar.hidden {
background: #198844;
}
+#workspaces button.focused {
+ background: #198844;
+}
+
/*
#workspaces button.active:hover {
background: #6e3c85;
@@ -85,6 +90,7 @@ window#waybar.hidden {
#custom-media,
#custom-launcher,
#custom-power,
+#custom-battery,
#custom-layout,
#custom-updater,
#custom-snip,
@@ -211,7 +217,26 @@ label:focus {
background-color: #1b1d1c;
font-size: 18px;
margin-right: 5px;
+}
+
+#custom-battery{
+ background-color: #1b1d1c;
+ font-size: 18px;
+}
+
+#custom-battery.battery_low{
+ background-color: yellow;
+ color: #1b1d1c;
+}
+
+#custom-battery.battery_crit{
+ background-color: red;
+ color: #1b1d1c;
+}
+#custom-battery.battery_charging{
+ background-color: #1d1b1c;
+ color: #198844;
}
#custom-launcher{
@@ -278,7 +303,8 @@ label:focus {
}
#tray {
- background-color: transparent;
+ border-radius: 20px;
+ background-color: black;
color: #ffffff;
}