diff --git a/dot_config/waybar/config b/dot_config/waybar/config
index 6a1b455..843dfc4 100644
--- a/dot_config/waybar/config
+++ b/dot_config/waybar/config
@@ -1,219 +1,186 @@
-// Global
{
- "layer": "top",
- "position": "top",
+ "layer": "top", // Waybar at top layer
+ "position": "top", // Waybar position (top|bottom|left|right)
+ // "height": 30, // Auto-height is used when commented
+ // "width": 1280, // Full screen width when commented
+ "spacing": 16, // Gaps between modules (in px)
+ // See `man waybar` for more configuration options
- // If height property would be not present, it'd be calculated dynamically
- "height": 30,
+// Configuration - modules-left
"modules-left": [
"custom/launcher",
"sway/workspaces",
"sway/mode",
- ],
-
- "modules-center": [
+ "sway/window"
],
- "modules-right": [
- "network",
- "idle_inhibitor",
- "memory",
- "cpu",
- "pulseaudio",
- "custom/keyboard-layout",
- "battery",
- //"custom/PBPbattery",
- "backlight#icon",
- "backlight#value",
- "clock",
- "tray",
- //"custom/weather",
- "custom/power",
- ],
+ "custom/launcher": {
+ "format":"",
+ "on-click": "exec nwg-drawer",
+ "tooltip": false
+ },
- // Modules
-
- "idle_inhibitor": {
- "format": "{icon} ",
- "format-icons":{
- "activated": "",
- "deactivated": ""
+ "sway/workspaces": {
+ "disable-scroll": true,
+ "all-outputs": true,
+ "format": "{icon}",
+ "format-icons": {
+ "3": "3",
+ "4": "4",
+ "5": "5",
+ "6": "6",
+ "7": "7",
+ "8": "8",
+ "9": "9",
+ "10": "10"
}
},
- "battery": {
- "states": {
- // "good": 95,
- "warning": 30,
- "critical": 15
- },
- "format": "{capacity}% {icon}",
- "format-charging": "{capacity}% ",
- "format-plugged": "{capacity}% ",
- // "format-good": "", // An empty format will hide the module
- // "format-full": "",
- "format-icons": ["", "", "", "", ""]
+ "sway/mode": {
+ "format": "{}",
+ "tooltip": false
},
- "custom/PBPbattery": {
- "exec": "~/.config/waybar/scripts/PBPbattery.sh",
+ "sway/window": {
"format": "{}",
+ //"all-outputs": true, // Active window shows only on active display when commented
+ "max-length": 120
},
- "clock": {
- "interval": 10,
- "format-alt": " {:%e %b %Y}", // Icon: calendar-alt
- "format": "{:%H:%M}",
- "tooltip-format": "{:%e %B %Y}"
+// Configuration - modules-center
+
+ "modules-center": [
+ "network"
+ ],
+
+ "network": {
+ "format-disabled": " Disabled",
+ "format-wifi": " {bandwidthDownBits:>} {bandwidthUpBits:>} ",
+ "tooltip-format-wifi": "{essid}",
+ "format-ethernet": " {bandwidthDownBits:>} {bandwidthUpBits:>} ",
+ "tooltip-format-ethernet": "{ifname}: {ipaddr}/{cidr}",
+ "format-disconnected": " Disconnected",
+ "on-click": "footclient -T waybar_nmtui -e nmtui",
+ "interval": 2
+ },
+
+// Configuration - modules-right
+
+ "modules-right": [
+ "custom/keyboard-layout",
+ "idle_inhibitor",
+ "cpu",
+ "memory",
+ "backlight",
+ "pulseaudio",
+ "battery",
+ "clock",
+ "tray",
+ "custom/power"
+ ],
+
+ "custom/keyboard-layout": {
+ "exec": "i=$(swaymsg -t get_inputs); echo \"\"; echo \"$i\" | grep -m1 'xkb_active_layout_name' | cut -d '\"' -f4",
+ "format": "",
+ // Interval set only as a fallback; use signal to update the module more immediately
+ "interval": 30,
+ // See example config for sending signal to Waybar in ~/.config/sway/config.d/input
+ "signal": 1,
+ "on-click": "~/.config/waybar/scripts/keyhint.sh"
+ },
+
+ "idle_inhibitor": {
+ "format": "{icon}",
+ "format-icons": {
+ "activated": "",
+ "deactivated": ""
+ },
+ "tooltip-format-activated": "Idle Inhibitor Activated",
+ "tooltip-format-deactivated": "Idle Inhibitor Deactivated"
},
"cpu": {
"interval": 5,
- "format": " {usage}% ({load})", // Icon: microchip
+ "format": "{usage:>3}%",
"states": {
"warning": 70,
"critical": 90,
},
- "on-click": "xfce4-terminal -e 'htop'",
+ "on-click": "footclient -T waybar_htop -e htop"
},
-
- "custom/keyboard-layout": {
- "exec": "swaymsg -t get_inputs | grep -m1 'xkb_active_layout_name' | cut -d '\"' -f4",
- // Interval set only as a fallback, as the value is updated by signal
- "interval": 30,
- "format": " {}", // Icon: keyboard
- // Signal sent by Sway key binding (~/.config/sway/key-bindings)
- "signal": 1, // SIGHUP
- "tooltip": false,
- "on-click": "~/.config/waybar/scripts/keyhint.sh",
- },
-
+
"memory": {
"interval": 5,
- "format": " {}%", // Icon: memory
- "on-click": "xfce4-terminal -e 'htop'",
+ "format": "{:>3}%",
+ "on-click": "footclient -T waybar_htop -e htop",
"states": {
"warning": 70,
"critical": 90
}
},
- "network": {
- "interval": 5,
- "format-wifi": " {essid} ({signalStrength}%)", // Icon: wifi
- "format-ethernet": " {ifname}: {ipaddr}/{cidr}", // Icon: ethernet
- "format-disconnected": "⚠ Disconnected",
- "tooltip-format": "{ifname}: {ipaddr}",
- "on-click": "xfce4-terminal -e 'nmtui'",
- },
- "network#vpn": {
- "interface": "tun0",
- "format": " {essid} ({signalStrength}%)",
- "format-disconnected": "⚠ Disconnected",
- "tooltip-format": "{ifname}: {ipaddr}/{cidr}",
- },
-
- "sway/mode": {
- "format": "{}",
- "tooltip": false
- },
-
- "sway/window": {
- "format": "{}",
- "max-length": 120
- },
-
- "sway/workspaces": {
- "disable-scroll": true,
- "disable-markup" : false,
- "all-outputs": true,
- "format": " {icon} ",
- //"format":"{icon}",
- "format-icons": {
- "1": "",
- "2": "",
- "3": "",
- "4": "",
- "5": "",
- }
+ "backlight": {
+ "format": "{icon} {percent}%",
+ "format-icons": ["", "", "", "", "", "", "", "", ""],
+ "tooltip-format": "Backlight (Scroll): {percent:}%",
+ "on-scroll-down": "brightnessctl -c backlight set 5%-",
+ "on-scroll-up": "brightnessctl -c backlight set +5%"
},
"pulseaudio": {
- "scroll-step": 1, // %, can be a float
- "format": "{volume}% {icon}",
- "format-bluetooth": "{volume}% {icon} {format_source}",
- "format-bluetooth-muted": " {icon} {format_source}",
- "format-muted": "婢 {format_source}",
- "format-source": "{volume}% ",
- "format-source-muted": "",
+ "scroll-step": 2,
+ "format": "{icon} {volume}%",
+ "format-muted":" muted",
"format-icons": {
- "headphone": "",
- "hands-free": "וֹ",
- "headset": " ",
+ "headphones": "",
+ "handsfree": "",
+ "headset": "",
"phone": "",
"portable": "",
"car": "",
- "default": [""]
+ "default": ["", "", ""]
},
- "on-click": "pavucontrol",
- "on-scroll-up": "pactl set-sink-volume @DEFAULT_SINK@ +2%",
- "on-scroll-down": "pactl set-sink-volume @DEFAULT_SINK@ -2%",
+ "on-click": "pavucontrol"
},
- // to use the weather module replace with your city or town
- // note: do not use spaces: new york would be newyork
- "custom/weather": {
- "exec": "~/.config/waybar/scripts/weather.sh ",
- "return-type": "json",
- "interval": 600,
+ "battery": {
+ "states": {
+ "warning": 30,
+ "critical": 15
+ },
+ "format": "{icon} {capacity}%",
+ "format-icons": ["", "", "", "", ""]
+ },
+
+ "clock": {
+ "format": " {:%H:%M}",
+ "format-alt": " {:%OI:%M %p}",
+ "tooltip-format": " {:%A %m/%d}\n\n{calendar}",
+ "calendar": {
+ "on-scroll": 1,
+ "format": {
+ "months": "{}",
+ "days": "{}",
+ "weeks": "W{}",
+ "weekdays": "{}",
+ "today": "{}"
+ },
+ },
+ "actions": {
+ "on-scroll-up": "shift_up",
+ "on-scroll-down": "shift_down"
+ },
},
"tray": {
- "icon-size": 18,
- "spacing":10,
+ "icon-size": 16,
+ "spacing":10
},
- "backlight#icon": {
- "format": "{icon}",
- "format-icons": [""],
- "on-scroll-down": "brightnessctl -c backlight set 1%-",
- "on-scroll-up": "brightnessctl -c backlight set +1%"
- },
-
- "backlight#value" :{
- "format": "{percent}%",
- "on-scroll-down": "brightnessctl -c backlight set 1%-",
- "on-scroll-up": "brightnessctl -c backlight set +1%"
- },
-
- "custom/firefox": {
- "format": " ",
- "on-click": "exec firefox",
- "tooltip": false
- },
-
- "custom/terminal": {
- "format": " ",
- "on-click": "exec xfce4-terminal",
- "tooltip": false
- },
-
- "custom/files": {
- "format": " ",
- "on-click": "exec thunar",
- "tooltip": false
- },
-
- "custom/launcher": {
- "format":" ",
- "on-click": "exec wofi -c ~/.config/wofi/config -I",
- "tooltip": false,
- },
-
"custom/power": {
"format":"⏻",
- "on-click": "exec ~/.config/waybar/scripts/power-menu.sh",
- "tooltip": false,
+ "on-click": "exec ~/.config/sway/scripts/power_menu.sh",
+ "tooltip": false
},
}
diff --git a/dot_config/waybar/scripts/executable_keyhint.sh b/dot_config/waybar/scripts/executable_keyhint.sh
index 01f3396..994d9b9 100644
--- a/dot_config/waybar/scripts/executable_keyhint.sh
+++ b/dot_config/waybar/scripts/executable_keyhint.sh
@@ -1,2 +1,103 @@
-#!/bin/sh
-yad --title="EndeavourOS Sway-WM keybindings:" --no-buttons --geometry=400x345-15-400 --list --column=key: --column=description: --column=command: "ESC" "close this app" "" "=" "modkey" "(set mod Mod4)" "+enter" "Terminal" "(xfce4-terminal)" "+d" "Application Menu" "(wofi)" "+p" "Activities" "(wofi)" "+o" "" "Open Broswer" "+n" "" "Open Files" "+q" "close focused app" "(kill)" "[Shift]+Print-key" "screenshot" "(grim)" "+Shift+e" "power-menu" "(wofi)" "+t" "open keybinding helper" "full list"
+#!/bin/bash
+
+# Set the font
+font="JetBrainsMono"
+
+cheat=(
+ --title="EndeavourOS Sway keybindings:"
+ --no-buttons
+ --geometry=1200x680
+ --list
+ --no-click
+ --no-selection
+ --column="Function"
+ --column="Binding"
+ --column=""
+ --column="Function"
+ --column="Binding"
+ --column-align=ccccc
+ --header-align=ccccc
+ "GENERAL"
+ ""
+ ""
+ "LAUNCHERS AND MENUS"
+ ""
+ "Mod key (Super/Meta//)"
+ ""
+ ""
+ "Open the launcher"
+ " + "
+ "Change window focus"
+ " + "
+ ""
+ "Open the application menu"
+ " + Shift + "
+ "Vim keys are supported"
+ " + "
+ ""
+ "Open the power menu"
+ " + Shift + "
+ "Close a window"
+ " + "
+ ""
+ "Activities overview"
+ " + "
+ "Move a window"
+ " + Shift + "
+ ""
+ "SCREENSHOTS"
+ ""
+ "Move window with mouse"
+ " + "
+ ""
+ "Snip a screenshot"
+ "Print"
+ "Resize a window"
+ " + Ctrl + "
+ ""
+ "Screenshot a window"
+ "Ctrl + Print"
+ "Resize with right click"
+ " + "
+ ""
+ "Screenshot the display"
+ "Shift + Print"
+ "Change workspace"
+ " + ..."
+ ""
+ "CLIPBOARD MANAGER"
+ ""
+ "Send window to workspace"
+ " + Shift + ..."
+ ""
+ "Launch cliphist"
+ "Ctrl + + "
+ "Toggle floating/tiling"
+ " + Shift + Space"
+ ""
+ "Delete an entry from cliphist"
+ "Ctrl + + "
+ "Toggle fullscreen"
+ " + "
+ ""
+ "APPLICATION SHORTCUTS"
+ ""
+ "SCRATCHPAD"
+ ""
+ ""
+ "Launch the terminal"
+ " + Enter"
+ "Move window to scratchpad"
+ " + Shift + "
+ ""
+ "Launch the file explorer"
+ " + "
+ "Show next scratchpad window"
+ " + "
+ ""
+ "Launch the web browser"
+ " + "
+ ""
+)
+
+yad "${cheat[@]}"
diff --git a/dot_config/waybar/style.css b/dot_config/waybar/style.css
index 938ff1f..679b896 100644
--- a/dot_config/waybar/style.css
+++ b/dot_config/waybar/style.css
@@ -10,11 +10,8 @@
* Keyframes
* -------------------------------------------------------------------------- */
-/*
-Arc-Dark Color Scheme
-*/
-@define-color highlight #5294e2 ;
-@define-color base1 #404552 ;
+@define-color highlight #685878 ;
+@define-color base1 #19191e ;
@keyframes blink-warning {
70% {
@@ -54,59 +51,74 @@ Arc-Dark Color Scheme
/* The whole bar */
#waybar {
background: transparent;
- color: #bebebe;
+ color: #e3e3ea;
background-color: @base1;
- font-family: UbuntuMono;
- font-size: 14px;
+ font-family: JetBrainsMono;
+ font-size: 13px;
}
/* Every modules */
+#mode,
+#network,
+#custom-keyboard-layout,
+#idle_inhibitor,
+#cpu,
+#memory,
+#backlight,
+#pulseaudio,
#battery,
#clock,
-#backlight,
-#cpu,
-#custom-keyboard-layout,
-#memory,
-#mode,
-#custom-weather,
-#network,
-#pulseaudio,
-#temperature,
-#tray,
-#idle_inhibitor,
-#custom-PBPbattery {
+#tray {
padding:0.5rem 0.6rem;
margin: 1px 0px;
}
/* -----------------------------------------------------------------------------
- * Modules styles
+ * Module styles
* -------------------------------------------------------------------------- */
-#battery {
- animation-timing-function: linear;
- animation-iteration-count: infinite;
- animation-direction: alternate;
+#custom-launcher {
+ margin-left:15px;
+ margin-right:10px;
}
-#battery.warning {
+#workspaces {
+ font-size:13px;
+}
+
+#workspaces button {
+ border-radius: 5px;
+ color: #eceff4;
+ padding: 1px 6px;
+ margin-right: 2px;
+ margin-left: 2px;
+}
+
+#workspaces button.focused {
+ border: 1px solid #d8dee9;
+}
+
+#workspaces button.urgent {
+ border-color: #c9545d;
+ color: #c9545d;
+}
+
+#mode {
+ background: @highlight;
+ border-bottom: 3px transparent;
+ color:white;
+ margin-left: 5px;
+ padding: 7px;
+}
+
+#window {
+ font-weight: bold;
+}
+
+#network.disconnected {
color: orange;
}
-#battery.critical {
- color: red;
-}
-
-#battery.warning.discharging {
- animation-name: blink-warning;
- animation-duration: 3s;
-}
-
-#battery.critical.discharging {
- animation-name: blink-critical;
- animation-duration: 2s;
-}
-
#cpu.warning {
color: orange;
}
@@ -133,53 +145,38 @@ Arc-Dark Color Scheme
padding-right:5px;
}
-#mode {
- background: @highlight;
- border-bottom: 3px transparent;
- color:white;
- margin-left: 5px;
- padding: 7px;
-}
-
-#network.disconnected {
- color: orange;
+#backlight.icon {
}
#pulseaudio {
- padding-top:6px;
}
#pulseaudio.muted {
color: @highlight;
}
-#temperature.critical {
+#battery {
+ animation-timing-function: linear;
+ animation-iteration-count: infinite;
+ animation-direction: alternate;
+}
+
+#battery.warning {
+ color: orange;
+}
+
+#battery.critical {
color: red;
}
-#window {
- font-weight: bold;
+#battery.warning.discharging {
+ animation-name: blink-warning;
+ animation-duration: 3s;
}
-#workspaces {
- font-size:13px;
-}
-
-#workspaces button {
- border-bottom: 3px solid transparent;
- margin-bottom: 0px;
- padding:0px;
-}
-
-#workspaces button.focused {
- border-bottom: 3px solid @highlight;
- margin-bottom: 1px;
- padding-left:0;
-}
-
-#workspaces button.urgent {
- border-color: #c9545d;
- color: #c9545d;
+#battery.critical.discharging {
+ animation-name: blink-critical;
+ animation-duration: 2s;
}
#custom-power {
@@ -187,14 +184,3 @@ Arc-Dark Color Scheme
margin-right:15px;
font-size:15px;
}
-
-#custom-launcher {
- font-size:15px;
- margin-left:15px;
- margin-right:10px;
-}
-
-#backlight.icon {
- padding-right:1px;
- font-size: 13px;
-}