From 6cdc8889c1bcba711dbb255b6bd7324be01a2680 Mon Sep 17 00:00:00 2001 From: Evie Litherland-Smith Date: Thu, 13 Apr 2023 14:02:53 +0100 Subject: [PATCH] Reduce duplication in waybar config --- nixos/home-manager/env/config/waybar/config | 6 +- .../env/config/waybar/config-hyprland | 125 +----------------- .../env/config/waybar/config-sway | 125 +----------------- 3 files changed, 4 insertions(+), 252 deletions(-) diff --git a/nixos/home-manager/env/config/waybar/config b/nixos/home-manager/env/config/waybar/config index 813d44ec..0338c5a9 100644 --- a/nixos/home-manager/env/config/waybar/config +++ b/nixos/home-manager/env/config/waybar/config @@ -5,11 +5,9 @@ // "width": 1280, // Waybar width "spacing": 4, // Gaps between modules (4px) // Choose the order of the modules - "modules-left": ["wlr/workspaces", "hyprland/submap"], - "modules-center": ["hyprland/window"], - "modules-right": ["idle_inhibitor", "pulseaudio", "network", "cpu", "memory", "temperature", "backlight", "hyprland/language", "battery", "battery#bat2", "clock", "tray"], + "modules-right": ["idle_inhibitor", "pulseaudio", "network", "cpu", "memory", "temperature", "backlight", "battery", "battery#bat2", "clock", "tray"], // Modules configuration - "wlr/workspaces": { + "workspaces": { "disable-scroll": true, "all-outputs": true, "format": "{icon}", diff --git a/nixos/home-manager/env/config/waybar/config-hyprland b/nixos/home-manager/env/config/waybar/config-hyprland index cd7e283d..c11412a7 100644 --- a/nixos/home-manager/env/config/waybar/config-hyprland +++ b/nixos/home-manager/env/config/waybar/config-hyprland @@ -1,14 +1,7 @@ { - "output": "HDMI-A-1", - "layer": "top", // Waybar at top layer - "position": "top", // Waybar position (top|bottom|left|right) - // "height": 30, // Waybar height (to be removed for auto height) - // "width": 1280, // Waybar width - "spacing": 4, // Gaps between modules (4px) - // Choose the order of the modules + "include": "~/.config/waybar/config", "modules-left": ["wlr/workspaces", "hyprland/submap"], "modules-center": ["hyprland/window"], - "modules-right": ["idle_inhibitor", "pulseaudio", "network", "cpu", "memory", "temperature", "backlight", "hyprland/language", "battery", "battery#bat2", "clock", "tray"], // Modules configuration "wlr/workspaces": { "disable-scroll": true, @@ -29,122 +22,6 @@ "default": "" } }, - "keyboard-state": { - "numlock": true, - "capslock": true, - "format": "{name} {icon}", - "format-icons": { - "locked": "", - "unlocked": "" - } - }, - "mpd": { - "format": "{stateIcon} {consumeIcon}{randomIcon}{repeatIcon}{singleIcon}{artist} - {album} - {title} ({elapsedTime:%M:%S}/{totalTime:%M:%S}) ⸨{songPosition}|{queueLength}⸩ {volume}% ", - "format-disconnected": "Disconnected ", - "format-stopped": "{consumeIcon}{randomIcon}{repeatIcon}{singleIcon}Stopped ", - "unknown-tag": "N/A", - "interval": 2, - "consume-icons": { - "on": " " - }, - "random-icons": { - "off": " ", - "on": " " - }, - "repeat-icons": { - "on": " " - }, - "single-icons": { - "on": "1 " - }, - "state-icons": { - "paused": "", - "playing": "" - }, - "tooltip-format": "MPD (connected)", - "tooltip-format-disconnected": "MPD (disconnected)" - }, - "idle_inhibitor": { - "format": "{icon}", - "format-icons": { - "activated": "", - "deactivated": "" - } - }, - "tray": { - // "icon-size": 21, - "spacing": 10 - }, - "clock": { - "timezone": "Europe/London", - "tooltip-format": "{:%Y %B}\n{calendar}", - "format-alt": "{:%Y-%m-%d}" - }, - "cpu": { - "format": "{usage}% 󰻠", - "tooltip": false - }, - "memory": { - "format": "{}% 󰍛" - }, - "temperature": { - // "thermal-zone": 2, - // "hwmon-path": "/sys/class/hwmon/hwmon2/temp1_input", - "critical-threshold": 80, - // "format-critical": "{temperatureC}°C {icon}", - "format": "{temperatureC}°C {icon}", - "format-icons": ["", "", ""] - }, - "backlight": { - // "device": "acpi_video1", - "format": "{percent}% {icon}", - "format-icons": ["", "", "", "", "", "", "", "", ""] - }, - "battery": { - "states": { - // "good": 95, - "warning": 30, - "critical": 15 - }, - "format": "{capacity}% {icon}", - "format-charging": "{capacity}% ", - "format-plugged": "{capacity}% ", - "format-alt": "{time} {icon}", - // "format-good": "", // An empty format will hide the module - // "format-full": "", - "format-icons": ["", "", "", "", ""] - }, - "battery#bat2": { - "bat": "BAT2" - }, - "network": { - // "interface": "wlp2*", // (Optional) To force the use of this interface - "format-wifi": "{essid} ({signalStrength}%) 󰖩", - "format-ethernet": "{ipaddr}/{cidr} 󰈁", - "tooltip-format": "{ifname} via {gwaddr} 󰈁", - "format-linked": "{ifname} (No IP) 󰈁", - "format-disconnected": "Disconnected 󰈂", - "format-alt": "{ifname}: {ipaddr}/{cidr}" - }, - "pulseaudio": { - "scroll-step": 2, // %, can be a float - "format": "{volume}% {icon} {format_source}", - "format-bluetooth": "{volume}% {icon} {format_source}", - "format-bluetooth-muted": "󰝟 {icon} {format_source}", - "format-muted": "󰝟 {format_source}", - "format-source": "{volume}% 󰍬", - "format-source-muted": "󰍭", - "format-icons": { - "headphone": "󰋋", - "hands-free": "󰥰", - "headset": "󰋎", - "phone": "󰏲", - "portable": "󰏳", - "car": "󰄍", - "default": ["󰕿", "󰖀", "󰕾"] - }, - "on-click": "pavucontrol" - }, } // vim: ft=json diff --git a/nixos/home-manager/env/config/waybar/config-sway b/nixos/home-manager/env/config/waybar/config-sway index 7c1c5143..ee36b940 100644 --- a/nixos/home-manager/env/config/waybar/config-sway +++ b/nixos/home-manager/env/config/waybar/config-sway @@ -1,14 +1,7 @@ { - "output": "HDMI-A-1", - "layer": "top", // Waybar at top layer - "position": "top", // Waybar position (top|bottom|left|right) - // "height": 30, // Waybar height (to be removed for auto height) - // "width": 1280, // Waybar width - "spacing": 4, // Gaps between modules (4px) - // Choose the order of the modules + "include": "~/.config/waybar/config", "modules-left": ["sway/workspaces", "sway/mode", "sway/scratchpad"], "modules-center": ["sway/window"], - "modules-right": ["idle_inhibitor", "pulseaudio", "network", "cpu", "memory", "temperature", "backlight", "sway/language", "battery", "battery#bat2", "clock", "tray"], // Modules configuration "sway/workspaces": { "disable-scroll": true, @@ -29,122 +22,6 @@ "default": "" } }, - "keyboard-state": { - "numlock": true, - "capslock": true, - "format": "{name} {icon}", - "format-icons": { - "locked": "", - "unlocked": "" - } - }, - "mpd": { - "format": "{stateIcon} {consumeIcon}{randomIcon}{repeatIcon}{singleIcon}{artist} - {album} - {title} ({elapsedTime:%M:%S}/{totalTime:%M:%S}) ⸨{songPosition}|{queueLength}⸩ {volume}% ", - "format-disconnected": "Disconnected ", - "format-stopped": "{consumeIcon}{randomIcon}{repeatIcon}{singleIcon}Stopped ", - "unknown-tag": "N/A", - "interval": 2, - "consume-icons": { - "on": " " - }, - "random-icons": { - "off": " ", - "on": " " - }, - "repeat-icons": { - "on": " " - }, - "single-icons": { - "on": "1 " - }, - "state-icons": { - "paused": "", - "playing": "" - }, - "tooltip-format": "MPD (connected)", - "tooltip-format-disconnected": "MPD (disconnected)" - }, - "idle_inhibitor": { - "format": "{icon}", - "format-icons": { - "activated": "", - "deactivated": "" - } - }, - "tray": { - // "icon-size": 21, - "spacing": 10 - }, - "clock": { - "timezone": "Europe/London", - "tooltip-format": "{:%Y %B}\n{calendar}", - "format-alt": "{:%Y-%m-%d}" - }, - "cpu": { - "format": "{usage}% 󰻠", - "tooltip": false - }, - "memory": { - "format": "{}% 󰍛" - }, - "temperature": { - // "thermal-zone": 2, - // "hwmon-path": "/sys/class/hwmon/hwmon2/temp1_input", - "critical-threshold": 80, - // "format-critical": "{temperatureC}°C {icon}", - "format": "{temperatureC}°C {icon}", - "format-icons": ["", "", ""] - }, - "backlight": { - // "device": "acpi_video1", - "format": "{percent}% {icon}", - "format-icons": ["", "", "", "", "", "", "", "", ""] - }, - "battery": { - "states": { - // "good": 95, - "warning": 30, - "critical": 15 - }, - "format": "{capacity}% {icon}", - "format-charging": "{capacity}% ", - "format-plugged": "{capacity}% ", - "format-alt": "{time} {icon}", - // "format-good": "", // An empty format will hide the module - // "format-full": "", - "format-icons": ["", "", "", "", ""] - }, - "battery#bat2": { - "bat": "BAT2" - }, - "network": { - // "interface": "wlp2*", // (Optional) To force the use of this interface - "format-wifi": "{essid} ({signalStrength}%) 󰖩", - "format-ethernet": "{ipaddr}/{cidr} 󰈁", - "tooltip-format": "{ifname} via {gwaddr} 󰈁", - "format-linked": "{ifname} (No IP) 󰈁", - "format-disconnected": "Disconnected 󰈂", - "format-alt": "{ifname}: {ipaddr}/{cidr}" - }, - "pulseaudio": { - "scroll-step": 2, // %, can be a float - "format": "{volume}% {icon} {format_source}", - "format-bluetooth": "{volume}% {icon} {format_source}", - "format-bluetooth-muted": "󰝟 {icon} {format_source}", - "format-muted": "󰝟 {format_source}", - "format-source": "{volume}% 󰍬", - "format-source-muted": "󰍭", - "format-icons": { - "headphone": "󰋋", - "hands-free": "󰥰", - "headset": "󰋎", - "phone": "󰏲", - "portable": "󰏳", - "car": "󰄍", - "default": ["󰕿", "󰖀", "󰕾"] - }, - "on-click": "pavucontrol" - }, } // vim: ft=json