Split waybar config for differences between hyprland and sway

This commit is contained in:
Evie Litherland-Smith 2023-04-12 21:42:07 +01:00
parent 48f00e63e8
commit cf52bfcd25
5 changed files with 156 additions and 16 deletions

View file

@ -8,7 +8,7 @@ monitor=DP-1,preferred,auto,auto,transform,1
# Execute your favorite apps at launch
# exec-once = waybar & hyprpaper & firefox
exec-once = dunst & hyprpaper -c ~/.dotfiles/nixos/home-manager/env/config/hypr/hyprpaper.conf & waybar -c ~/.dotfiles/nixos/home-manager/env/config/waybar/config & eww daemon
exec-once = dunst & hyprpaper -c ~/.dotfiles/nixos/home-manager/env/config/hypr/hyprpaper.conf & waybar -c ~/.dotfiles/nixos/home-manager/env/config/waybar/config-hyprland & eww daemon
# Source a file (multi-file configs)
# source = ~/.config/hypr/myColors.conf

View file

@ -4,4 +4,5 @@ preload = ~/.dotfiles/wallpaper/images_dark/1080x1920.png
wallpaper = HDMI-A-1,~/.dotfiles/wallpaper/images_dark/1920x1200.png
wallpaper = DP-1,~/.dotfiles/wallpaper/images_dark/1080x1920.png
wallpaper = DSI-1,~/.dotfiles/wallpaper/images_dark/1920x1080.png
wallpaper = *,~/.dotfiles/wallpaper/images_dark/1920x1080.png

View file

@ -30,7 +30,7 @@ set $term foot
# Your preferred application launcher
# Note: pass the final command to swaymsg so that the resulting window can be opened
# on the original workspace that the command was run on.
set $menu wofi -d
set $menu rofi -show drun
include /etc/sway/config-vars.d/*
@ -214,19 +214,9 @@ bindsym $mod+r mode "resize"
# Status Bar:
#
# Read `man 5 sway-bar` for more information about this section.
bar {
position bottom
# When the status_command prints a new line to stdout, swaybar updates.
# The default just shows the current date and time.
#status_command while date +'%Y-%m-%d %l:%M:%S %p'; do sleep 1; done
status_command while echo B: $(cat /sys/class/power_supply/sbs-*/capacity)\%, $(date --date="@$(cat /sys/class/power_supply/sbs-*/time_to_empty_avg)" +"%H:%m") \| T: $(date +'%d-%m-%Y %k:%M:%S'); do sleep 1; done
colors {
statusline #ffffff
background #323232
inactive_workspace #32323200 #32323200 #5c5c5c
}
}
include /etc/sway/config.d/*
exec dunst
exec waybar -c ~/.dotfiles/nixos/home-manager/env/config/waybar/config-sway
exec eww daemon

View file

@ -0,0 +1,149 @@
{
"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
"modules-left": ["sway/workspaces", "sway/mode"],
"modules-center": ["sway/window"],
"modules-right": ["idle_inhibitor", "pulseaudio", "network", "cpu", "memory", "temperature", "backlight", "keyboard-state", "hyprland/language", "battery", "battery#bat2", "clock", "tray"],
// Modules configuration
"wlr/workspaces": {
"disable-scroll": true,
"all-outputs": true,
"format": "{icon}",
"format-icons": {
"1": "",
"2": "",
"3": "",
"4": "",
"5": "",
"6": "",
"7": "",
"8": "",
"9": "",
"urgent": "",
"focused": "",
"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": "<span color=\"#f53c3c\"></span> ",
"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": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>",
"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