Skip to content
Snippets Groups Projects
Commit 3f0c5717 authored by Henrik Tjäder's avatar Henrik Tjäder
Browse files

Reorder to match upstream - minimal changes

parent 85d2382b
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
.config/waybar/config.jsonc
+ 183
− 203
View file @ 3f0c5717
[ // -*- mode: jsonc -*-
{ {
"ipc": true, "ipc": true,
"id": "bar-0", "id": "bar-0",
...@@ -11,16 +11,36 @@ ...@@ -11,16 +11,36 @@
"modules-left": [ "modules-left": [
"sway/hide", // Hiding support via sway IPC "sway/hide", // Hiding support via sway IPC
"sway/workspaces", "sway/workspaces",
"sway/mode" "sway/mode",
"sway/scratchpad",
"custom/media"
], ],
//"modules-center": ["sway/window"], //"modules-center": ["sway/window"],
"modules-center": ["clock"], "modules-center": [
"modules-right": ["custom/disk_home", "temperature", "cpu", "memory", "network", "backlight", "pulseaudio", "sway/language", "battery", "idle_inhibitor", "tray"], "clock",
"idle_inhibitor",
],
"modules-right": [
"custom/disk_home",
"temperature",
"cpu",
"memory",
"network",
"backlight",
"pulseaudio",
"keyboard-state",
"sway/language",
"battery",
"battery#bat2",
"tray"
],
// Modules configuration // Modules configuration
"sway/workspaces": { "sway/workspaces": {
"disable-scroll": true, "disable-scroll": true,
"all-outputs": false, "all-outputs": false,
"warp-on-scroll": false,
"numeric-first": true, "numeric-first": true,
//"format": "{name}: {icon}", //"format": "{name}: {icon}",
"format": "{index}" "format": "{index}"
...@@ -35,39 +55,75 @@ ...@@ -35,39 +55,75 @@
//"default": "" //"default": ""
//} //}
}, },
// Modules configuration "keyboard-state": {
// "sway/workspaces": { "numlock": true,
// "disable-scroll": true, "capslock": false,
// "all-outputs": true, "format": "{name} {icon}",
// "format": "{name}: {icon}", "format-icons": {
// "format-icons": { "locked": "",
// "1": "", "unlocked": ""
// "2": "", }
// "3": "", },
// "4": "",
// "5": "",
// "urgent": "",
// "focused": "",
// "default": ""
// }
// },
"sway/mode": { "sway/mode": {
"format": "{}" "format": "<span style=\"italic\">{}</span>"
}, },
"custom/arch_update": { "sway/scratchpad": {
"format": "<span color='#589df6'></span>{}", "format": "{icon} {count}",
"interval": 30, "show-empty": false,
"exec": "~/.config/i3blocks/bin/arch_update.py -b '#e4e4e4' -u '#e4e4e4' -q" "format-icons": ["", ""],
"tooltip": true,
"tooltip-format": "{app}: {title}"
}, },
"custom/disk_home": { "mpd": {
"format": "🏠 {} ", "format": "{stateIcon} {consumeIcon}{randomIcon}{repeatIcon}{singleIcon}{artist} - {album} - {title} ({elapsedTime:%M:%S}/{totalTime:%M:%S}) ⸨{songPosition}|{queueLength}⸩ {volume}% ",
"interval": 30, "format-disconnected": "Disconnected ",
"exec": "df -h --output=avail $HOME | tail -1 | tr -d ' '" "format-stopped": "{consumeIcon}{randomIcon}{repeatIcon}{singleIcon}Stopped ",
"unknown-tag": "N/A",
"interval": 5,
"consume-icons": {
"on": " "
}, },
"custom/disk_root": { "random-icons": {
"format": "💽 {} ", "off": "<span color=\"#f53c3c\"></span> ",
"interval": 30, "on": " "
"exec": "df -h --output=avail / | tail -1 | tr -d ' '" },
"repeat-icons": {
"on": " "
},
"single-icons": {
"on": "1 "
},
"state-icons": {
"paused": "",
"playing": ""
},
"tooltip-format": "MPD (connected)",
"tooltip-format-disconnected": "MPD (disconnected)"
},
"idle_inhibitor": {
"format": "<span color='#589df6'>{icon}</span>",
"format-icons": {
"activated": "",
"deactivated": ""
},
"on-click-right": "swaylock -eFfki ~/.config/lockscreen-origin.png"
},
"tray": {
// "icon-size": 21,
"spacing": 10
},
"clock": {
"interval": 1,
"format": "⏰ {:%H:%M:%S 🗓️ %Y-%m-%d 📆 %W - Day: %a}",
"tooltip-format": "{:%Y-%m-%d | %H:%M:%S}",
"format-alt": "{:%Y-%m-%d}"
},
"cpu": {
"format": "🏭 {usage}%",
"tooltip": true
},
"memory": {
"format": "💾 {used:0.1f}G"
}, },
"temperature": { "temperature": {
// "thermal-zone": 2, // "thermal-zone": 2,
...@@ -77,17 +133,39 @@ ...@@ -77,17 +133,39 @@
"format": "<span color='#e88939'>{icon}</span> {temperatureC}°C", "format": "<span color='#e88939'>{icon}</span> {temperatureC}°C",
"format-icons": ["", "", ""] "format-icons": ["", "", ""]
}, },
"cpu": { "backlight": {
"format": "🏭 {usage}%", // "device": "acpi_video1",
"tooltip": true "format": "{icon} {percent}%",
"format-icons": ["🔅", "🔆"]
}, },
"memory": { "battery": {
"format": "💾 {used:0.1f}G" "states": {
// "good": 95,
"warning": 30,
"critical": 15
}, },
"custom/mail": { "format": "<span color='#e88939'>{icon}</span> {capacity}% ({time})",
"format": "📩{}", // "format-full": "{capacity}% {icon}",
"interval": 30, "format-charging": "<span color='#e88939'> </span> {capacity}%",
"exec": "notmuch count tag:flagged OR tag:inbox AND NOT tag:killed" "format-plugged": "<span color='#e88939'>{icon} </span> {capacity}% ({time})",
"format-alt": "{time} {icon}",
// "format-good": "", // An empty format will hide the module
// "format-full": "",
"format-icons": ["", "", "", "", ""]
},
"battery#bat2": {
"bat": "BAT2"
},
"power-profiles-daemon": {
"format": "{icon}",
"tooltip-format": "Power profile: {profile}\nDriver: {driver}",
"tooltip": true,
"format-icons": {
"default": "",
"performance": "",
"balanced": "",
"power-saver": ""
}
}, },
"network": { "network": {
"family": "ipv4", "family": "ipv4",
...@@ -100,11 +178,6 @@ ...@@ -100,11 +178,6 @@
"format-alt": "{ifname}: {ipaddr}/{cidr}", "format-alt": "{ifname}: {ipaddr}/{cidr}",
"interval": 5 "interval": 5
}, },
"backlight": {
// "device": "acpi_video1",
"format": "{icon} {percent}%",
"format-icons": ["🔅", "🔆"]
},
"pulseaudio": { "pulseaudio": {
// "scroll-step": 1, // %, can be a float // "scroll-step": 1, // %, can be a float
"format": "{icon} {volume}% {format_source}", "format": "{icon} {volume}% {format_source}",
...@@ -122,48 +195,9 @@ ...@@ -122,48 +195,9 @@
"phone": "", "phone": "",
"portable": "", "portable": "",
"car": "", "car": "",
"default": ["🔈", "🔉", "🔊"] "default": ["", "", ""]
},
"on-click": "ponymix -N -t sink toggle",
"on-click-right": "ponymix -N -t source toggle"
},
"sway/language": {
"format": "{flag}",
"tooltip-format": "{flag} {long}"
},
"clock": {
"interval": 1,
"format": "⏰ {:%H:%M:%S 🗓️ %Y-%m-%d 📆 %W - Day: %a}",
"tooltip-format": "{:%Y-%m-%d | %H:%M:%S}",
"format-alt": "{:%Y-%m-%d}"
}, },
"battery": { "on-click": "pavucontrol"
"states": {
// "good": 95,
"warning": 20,
"critical": 10
},
"format": "<span color='#e88939'>{icon}</span> {capacity}% ({time})",
"format-charging": "<span color='#e88939'> </span> {capacity}%",
"format-plugged": "<span color='#e88939'>{icon} </span> {capacity}% ({time})",
// "format-good": "", // An empty format will hide the module
// "format-full": "",
"format-icons": ["", "", "", "", ""]
},
"battery#bat2": {
"bat": "BAT2"
},
"idle_inhibitor": {
"format": "<span color='#589df6'>{icon}</span>",
"format-icons": {
"activated": "",
"deactivated": ""
},
"on-click-right": "swaylock -eFfki ~/.config/lockscreen-origin.png"
},
"tray": {
// "icon-size": 21,
"spacing": 10
}, },
"custom/media": { "custom/media": {
"format": "{icon} {}", "format": "{icon} {}",
...@@ -177,77 +211,23 @@ ...@@ -177,77 +211,23 @@
"exec": "$HOME/.config/waybar/mediaplayer.py 2> /dev/null" // Script in resources folder "exec": "$HOME/.config/waybar/mediaplayer.py 2> /dev/null" // Script in resources folder
// "exec": "$HOME/.config/waybar/mediaplayer.py --player spotify 2> /dev/null" // Filter player based on name // "exec": "$HOME/.config/waybar/mediaplayer.py --player spotify 2> /dev/null" // Filter player based on name
}, },
"mpd": { "sway/language": {
"format": "{stateIcon} {consumeIcon}{randomIcon}{repeatIcon}{singleIcon}{artist} - {album} - {title} ({elapsedTime:%M:%S}/{totalTime:%M:%S}) ", "format": "{flag}",
"format-disconnected": "Disconnected ", "tooltip-format": "{flag} {long}"
"format-stopped": "{consumeIcon}{randomIcon}{repeatIcon}{singleIcon}Stopped ",
"unknown-tag": "N/A",
"interval": 2,
"consume-icons": {
"on": " "
},
"random-icons": {
"off": "<span color=\"#f53c3c\"></span> ",
"on": " "
}, },
"repeat-icons": { "custom/mail": {
"on": " " "format": "📩{}",
"interval": 30,
"exec": "notmuch count tag:flagged OR tag:inbox AND NOT tag:killed"
}, },
"single-icons": { "custom/disk_home": {
"on": "1 " "format": "🏠 {} ",
"interval": 30,
"exec": "df -h --output=avail $HOME | tail -1 | tr -d ' '"
}, },
"state-icons": { "custom/disk_root": {
"paused": "", "format": "💽 {} ",
"playing": "" "interval": 30,
"exec": "df -h --output=avail / | tail -1 | tr -d ' '"
}, },
"tooltip-format": "MPD (connected)",
"tooltip-format-disconnected": "MPD (disconnected)"
}
} }
//,
//{
//"ipc": true,
//"id": "bar-1",
//// "layer": "top", // Waybar at top layer
//"position": "bottom", // Waybar position (top|bottom|left|right)
//// "height": 10, // Waybar height (to be removed for auto height)
//"width": 280, // Waybar width
//// Choose the order of the modules
//"modules-left": [
//"sway/hide" // Hiding support via sway IPC
//],
//"modules-center": ["clock"],
//"clock": {
//"interval": 1,
//"format": "⏰ {:%H:%M:%S 🗓️ %Y-%m-%d 📆 %W - Day: %a}",
//"tooltip-format": "{:%Y-%m-%d | %H:%M:%S}",
//"format-alt": "{:%Y-%m-%d}"
//},
//"battery": {
//"states": {
//// "good": 95,
//"warning": 20,
//"critical": 10
//},
//"format": "<span color='#e88939'>{icon}</span> {capacity}% ({time})",
//"format-charging": "<span color='#e88939'> </span> {capacity}%",
//"format-plugged": "<span color='#e88939'>{icon} </span> {capacity}% ({time})",
//// "format-good": "", // An empty format will hide the module
//// "format-full": "",
//"format-icons": ["", "", "", "", ""]
//},
//"battery#bat2": {
//"bat": "BAT2"
//},
//"idle_inhibitor": {
//"format": "<span color='#589df6'>{icon}</span>",
//"format-icons": {
//"activated": "",
//"deactivated": ""
//},
//"on-click-right": "swaylock -eFfki ~/.config/lockscreen-origin.png"
//}
//}
]
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment