From c7a6105f452ceb389c540e3d8004932ec132bf0c Mon Sep 17 00:00:00 2001 From: BluishHumility Date: Tue, 30 Jul 2024 08:58:49 -0400 Subject: [PATCH 01/11] style: remove netinstall.yaml (no longer needed) --- netinstall.yaml | 227 ------------------------------------------------ 1 file changed, 227 deletions(-) delete mode 100644 netinstall.yaml diff --git a/netinstall.yaml b/netinstall.yaml deleted file mode 100644 index 024e0a9..0000000 --- a/netinstall.yaml +++ /dev/null @@ -1,227 +0,0 @@ -- name: "Base-devel + Common packages" - description: "Recommended. Don't change unless you know what you're doing. Base-devel group and some other commom utilities (generic)" - hidden: false - selected: true - critical: false - packages: - - base-devel - - yay - - linux-headers - - linux-firmware - - pacman-contrib - - xf86-video-vesa - - xf86-input-libinput - - xf86-video-amdgpu - - xf86-video-ati - - xf86-video-fbdev - - xf86-video-intel - - xorg-server - - xdg-utils - - xdg-user-dirs - - gvfs - - gvfs-mtp - - gvfs-afc - - gvfs-goa - - gvfs-google - - gvfs-gphoto2 - - gvfs-nfs - - gvfs-smb - - accountsservice - - smartmontools - - libwnck3 - - b43-fwcutter - - broadcom-wl-dkms - - r8168 - - dnsutils - - ipw2100-fw - - ipw2200-fw - - modemmanager - - netctl - - net-tools - - ntfs-3g - - networkmanager - - networkmanager-openvpn - - nss-mdns - - usb_modeswitch - - whois - - dhclient - - ethtool - - openconnect - - openvpn - - rp-pppoe - - wireless-regdb - - wireless_tools - - wpa_supplicant - - wvdial - - gnu-netcat - - iwd - - linux-atm - - ndisc6 - - ppp - - pptpclient - - vpnc - - xl2tpd - - dialog - - dnsmasq - - upower - - hwinfo - - gtop - - python - - solid - - mlocate - - ttf-dejavu - - ttf-liberation - - ttf-bitstream-vera - - cantarell-fonts - - noto-fonts - - adobe-source-han-sans-jp-fonts - - adobe-source-han-sans-kr-fonts - - adobe-source-han-sans-cn-fonts - - opendesktop-fonts - - ttf-opensans - - firefox - - ttf-croscore - - ttf-carlito - - ttf-caladea - - alsa-utils - - alsa-plugins - - alsa-firmware - - hardinfo - - glances - - htop - - neofetch - - pulseaudio - - pavucontrol - - paprefs - - ffmpegthumbnailer - - poppler-glib - - libgsf - - libopenraw - - freetype2 - - gst-libav - - gst-plugins-bad - - gst-plugins-ugly - - libdvdcss - - efibootmgr - - dosfstools - - mtools - - openssh - - intel-ucode - - amd-ucode - - os-prober - - grub-tools - - wget - - bash-completion - - lsb-release - - s-tui - - tlp - - yad-eos - - reflector - - endeavouros-theming - - reflector-simple - - welcome - - eos-update-notifier - - eos-hooks - - nvidia-installer-dkms - - mkinitcpio-openswap - - pcurses - - eos-log-tool - - keyserver-rank - - inxi - - wayland-protocols - - xorg-xwayland - - egl-wayland -- name: "sway tiling on wayland" - description: "Sway is a tiling Wayland compositor and a drop-in replacement for the i3 window manager." - hidden: false - selected: true - critical: false - packages: - - acpi - - arc-gtk-theme-eos - - archlinux-xdg-menu - - arc-x-icons-theme - - bluez-utils - - brightnessctl - - celluloid - - dex - - diffuse - - file-roller - - foot - - grim - - gtk-engine-murrine - - gtk-layer-shell - - htop - - imv - - lxappearance - - mako - - network-manager-applet - - otf-font-awesome - - paprefs - - pavucontrol - - polkit-gnome - - pulseaudio - - slurp - - swappy - - sway - - swaybg - - swayidle - - swaylock - - sysstat - - thunar - - thunar-archive-plugin - - thunar-volman - - ttf-jetbrains-mono - - ttf-nerd-fonts-symbols - - ttf-ubuntu-font-family - - waybar - - wofi - - xdg-desktop-portal-wlr - - xed - - xorg-xhost -- name: "Zen Kernel" - description: "https://github.com/zen-kernel/zen-kernel" - hidden: false - selected: false - critical: false - packages: - - linux-zen - - linux-zen-headers -- name: "Printing-Support" - description: "Support for printing (Cups)" - hidden: false - selected: false - critical: false - packages: - - cups - - cups-filters - - cups-pdf - - ghostscript - - gsfonts - - foomatic-db-engine - - foomatic-db - - foomatic-db-ppds - - foomatic-db-nonfree - - foomatic-db-nonfree-ppds - - gutenprint - - foomatic-db-gutenprint-ppds - - splix - - system-config-printer -- name: "Support for HP Printer/Scanner" - description: "Extra Packages for HP Printer/Scanner" - hidden: false - selected: false - critical: false - packages: - - hplip - - python-pyqt5 - - python-reportlab - - xsane -- name: "Accessibility Tools" - description: "Screen reader and mouse tweak" - hidden: false - selected: false - critical: false - packages: - - orca - - mousetweaks From a091772d9a44b7b8a15037117af3c29b501a58f5 Mon Sep 17 00:00:00 2001 From: BluishHumility Date: Tue, 30 Jul 2024 09:10:14 -0400 Subject: [PATCH 02/11] fix: update terminal in README.md, remove xfce4-terminal from packages-repository.txt Update terminal in README.md and remove xfce4-terminal from packages-repository.txt. These files were overlooked with recent commit https://github.com/EndeavourOS-Community-Editions/sway/pull/72/commits/24888b484bb57b2bee55147bc6cf0c68ac0d4156 --- README.md | 4 ++-- packages-repository.txt | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 0a5ea5b..9879730 100644 --- a/README.md +++ b/README.md @@ -53,7 +53,7 @@ https://forum.endeavouros.com/t/sway-edition-general-conversation - Background handled by swaybg - Gtk3 theme handled by lxappearance - Filebrowser = Thunar - - Default Terminal-Emulator = XFCE4-Terminal and/or Termite + - Default Terminal-Emulator = Foot - Text-Editor = xed/nano - Bar = Waybar - Sound = Pulseaudio @@ -63,7 +63,7 @@ Main shortcuts: `~/.config/sway/cheatsheet` MOD key is set to the WINKEY/LINKEY - - MOD+Return = open floating terminal (XFCE4-Terminal) + - MOD+Return = open floating terminal (Foot) - MOD+O = open Browser (firefox) - MOD+N = open File Manager (thunar) - MOD+D= app menu (wofi) diff --git a/packages-repository.txt b/packages-repository.txt index 51c58e2..717ac16 100644 --- a/packages-repository.txt +++ b/packages-repository.txt @@ -38,5 +38,4 @@ wl-clipboard wofi xdg-desktop-portal-wlr xed -xfce4-terminal xorg-xwayland From 08d2ceb35ffa71de184db209ba4f454b8ef608e8 Mon Sep 17 00:00:00 2001 From: BluishHumility Date: Tue, 30 Jul 2024 09:14:21 -0400 Subject: [PATCH 03/11] style(waybar): remove custom firefox, files, terminal modules Remove custom modules from config. These modules are not actually being used (the Firefox, files, and terminal modules in the Waybar are the sway/workspaces module). --- .config/waybar/config | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/.config/waybar/config b/.config/waybar/config index 3aaf1b8..e90ca25 100644 --- a/.config/waybar/config +++ b/.config/waybar/config @@ -169,24 +169,6 @@ "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", From 0ca1b78e5c6dd4f45031e375841955ecde9b6a59 Mon Sep 17 00:00:00 2001 From: BluishHumility Date: Tue, 30 Jul 2024 10:45:33 -0400 Subject: [PATCH 04/11] style(waybar): restructure waybar configs Restructure Waybar config and style.css so the modules are ordered in the configs the same way they are ordered on the actual bar. The purpose of this is to make it easier for users to find things for making changes, and to help keep the configs organized. --- .config/waybar/config | 166 ++++++++++++++++++------------------ .config/waybar/style.css | 178 +++++++++++++++++++-------------------- 2 files changed, 172 insertions(+), 172 deletions(-) diff --git a/.config/waybar/config b/.config/waybar/config index e90ca25..9042f59 100644 --- a/.config/waybar/config +++ b/.config/waybar/config @@ -34,58 +34,34 @@ // Modules - "idle_inhibitor": { - "format": "{icon} ", - "format-icons":{ - "activated": "", - "deactivated": "" + "custom/launcher": { + "format":"", + "on-click": "exec wofi -c ~/.config/wofi/config -I", + "tooltip": false, + }, + + "sway/workspaces": { + "disable-scroll": true, + "disable-markup" : false, + "all-outputs": true, + "format": " {icon} ", + //"format":"{icon}", + "format-icons": { + "1": "", + "2": "", + "3": "", + "4": "", } }, - - "battery": { - "states": { - "warning": 30, - "critical": 15 - }, - "format": "{icon} {capacity}%", - "format-icons": ["", "", "", "", ""] + + "sway/mode": { + "format": "{}", + "tooltip": false }, - "clock": { - "interval": 10, - "format-alt": " {:%e %b %Y}", // Icon: calendar-alt - "format": "{:%H:%M}", - "tooltip-format": "{:%e %B %Y}" - }, - - "cpu": { - "interval": 5, - "format": " {usage}% ({load})", // Icon: microchip - "states": { - "warning": 70, - "critical": 90, - }, - "on-click": "footclient -T waybar_htop -e htop", - }, - - "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", - }, - - "memory": { - "interval": 5, - "format": " {}%", // Icon: memory - "on-click": "footclient -T waybar_htop -e htop", - "states": { - "warning": 70, - "critical": 90 - } + "sway/window": { + "format": "{}", + "max-length": 120 }, "network": { @@ -103,29 +79,33 @@ "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": "", + "idle_inhibitor": { + "format": "{icon} ", + "format-icons":{ + "activated": "", + "deactivated": "" } }, + + "memory": { + "interval": 5, + "format": " {}%", // Icon: memory + "on-click": "footclient -T waybar_htop -e htop", + "states": { + "warning": 70, + "critical": 90 + } + }, + + "cpu": { + "interval": 5, + "format": " {usage}% ({load})", // Icon: microchip + "states": { + "warning": 70, + "critical": 90, + }, + "on-click": "footclient -T waybar_htop -e htop", + }, "pulseaudio": { "scroll-step": 2, @@ -143,18 +123,24 @@ "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, + "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", }, - "tray": { - "icon-size": 18, - "spacing":10, - }, + "battery": { + "states": { + "warning": 30, + "critical": 15 + }, + "format": "{icon} {capacity}%", + "format-icons": ["", "", "", "", ""] + }, "backlight#icon": { "format": "{icon}", @@ -169,10 +155,24 @@ "on-scroll-up": "brightnessctl -c backlight set +1%" }, - "custom/launcher": { - "format":"", - "on-click": "exec wofi -c ~/.config/wofi/config -I", - "tooltip": false, + "clock": { + "interval": 10, + "format-alt": " {:%e %b %Y}", // Icon: calendar-alt + "format": "{:%H:%M}", + "tooltip-format": "{:%e %B %Y}" + }, + + "tray": { + "icon-size": 18, + "spacing":10, + }, + + // 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, }, "custom/power": { diff --git a/.config/waybar/style.css b/.config/waybar/style.css index f9260d1..d4abe40 100644 --- a/.config/waybar/style.css +++ b/.config/waybar/style.css @@ -58,19 +58,19 @@ } /* Every modules */ -#battery, -#clock, -#backlight, -#cpu, -#custom-keyboard-layout, -#memory, #mode, -#custom-weather, #network, +#idle_inhibitor, +#memory, +#cpu, #pulseaudio, +#custom-keyboard-layout, +#battery, +#backlight, +#clock, #temperature, -#tray, -#idle_inhibitor { +#custom-weather, +#tray { padding:0.5rem 0.6rem; margin: 1px 0px; } @@ -79,6 +79,83 @@ * Modules styles * -------------------------------------------------------------------------- */ +#custom-launcher { + font-size:15px; + margin-left:15px; + margin-right:10px; +} + +#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; +} + +#mode { + background: @highlight; + border-bottom: 3px transparent; + color:white; + margin-left: 5px; + padding: 7px; +} + +#window { + font-weight: bold; +} + +#network.disconnected { + color: orange; +} + +#memory { + animation-timing-function: linear; + animation-iteration-count: infinite; + animation-direction: alternate; +} + +#memory.warning { + color: orange; + } + +#memory.critical { + color: red; + animation-name: blink-critical; + animation-duration: 2s; + padding-left:5px; + padding-right:5px; +} + +#cpu.warning { + color: orange; +} + +#cpu.critical { + color: red; +} + +#pulseaudio { + padding-top:6px; +} + +#pulseaudio.muted { + color: @highlight; +} + #battery { animation-timing-function: linear; animation-iteration-count: infinite; @@ -103,94 +180,17 @@ animation-duration: 2s; } -#cpu.warning { - color: orange; -} - -#cpu.critical { - color: red; -} - -#memory { - animation-timing-function: linear; - animation-iteration-count: infinite; - animation-direction: alternate; -} - -#memory.warning { - color: orange; - } - -#memory.critical { - color: red; - animation-name: blink-critical; - animation-duration: 2s; - padding-left:5px; - padding-right:5px; -} - -#mode { - background: @highlight; - border-bottom: 3px transparent; - color:white; - margin-left: 5px; - padding: 7px; -} - -#network.disconnected { - color: orange; -} - -#pulseaudio { - padding-top:6px; -} - -#pulseaudio.muted { - color: @highlight; +#backlight.icon { + padding-right:1px; + font-size: 13px; } #temperature.critical { color: red; } -#window { - font-weight: bold; -} - -#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; -} - #custom-power { margin-left:15px; 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; -} From 895f5493c44fa9de2d725270f57d3b5856a2ba00 Mon Sep 17 00:00:00 2001 From: BluishHumility Date: Tue, 30 Jul 2024 13:52:49 -0400 Subject: [PATCH 05/11] fix(foot): set default font size to 11 --- .config/foot/foot.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.config/foot/foot.ini b/.config/foot/foot.ini index da54517..7ce0102 100644 --- a/.config/foot/foot.ini +++ b/.config/foot/foot.ini @@ -8,7 +8,7 @@ # title=foot # locked-title=no -font=JetBrainsMono-Regular:size=13 +font=JetBrainsMono-Regular:size=11 # font-bold= # font-italic= # font-bold-italic= From 6e7f6ec4a3b08454f0cb8d102ef5d94048df609a Mon Sep 17 00:00:00 2001 From: BluishHumility Date: Tue, 30 Jul 2024 21:57:30 -0400 Subject: [PATCH 06/11] feat(waybar): adjust font size --- .config/waybar/style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.config/waybar/style.css b/.config/waybar/style.css index d4abe40..6d3d568 100644 --- a/.config/waybar/style.css +++ b/.config/waybar/style.css @@ -54,7 +54,7 @@ color: #e3e3ea; background-color: @base1; font-family: JetBrainsMono; - font-size: 14px; + font-size: 13px; } /* Every modules */ From 32c5a43d750827a264384721eb9e3d5a100f1a5a Mon Sep 17 00:00:00 2001 From: BluishHumility Date: Tue, 30 Jul 2024 22:09:31 -0400 Subject: [PATCH 07/11] feat(waybar): update network module Update network module to display bandwidth in Waybar, and move SSID or interface name/IP address information to the tooltip. It's a little more interesting to look at, and somewhat more relevant to have at a glance since the information changes dynamically. The separate config for `tun0` interface has been scrapped in favor of having one module which presents whichever interface is currently active. --- .config/waybar/config | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/.config/waybar/config b/.config/waybar/config index 9042f59..1e1661b 100644 --- a/.config/waybar/config +++ b/.config/waybar/config @@ -65,18 +65,14 @@ }, "network": { - "interval": 5, - "format-wifi": " {essid} ({signalStrength}%)", // Icon: wifi - "format-ethernet": " {ifname}: {ipaddr}/{cidr}", // Icon: ethernet - "format-disconnected": "⚠ Disconnected", - "tooltip-format": "{ifname}: {ipaddr}", + "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", - }, - "network#vpn": { - "interface": "tun0", - "format": " {essid} ({signalStrength}%)", - "format-disconnected": "⚠ Disconnected", - "tooltip-format": "{ifname}: {ipaddr}/{cidr}", + "interval": 2, }, "idle_inhibitor": { From 63f29b292751f78d88861cc2cbfafb6ffce98501 Mon Sep 17 00:00:00 2001 From: BluishHumility Date: Tue, 30 Jul 2024 22:21:24 -0400 Subject: [PATCH 08/11] feat(waybar): update idle inhibitor * Update spacing for idle inhibitor module. * Update tooltip to make it self-explanatory (the tooltip says what the module is) --- .config/waybar/config | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.config/waybar/config b/.config/waybar/config index 1e1661b..e28ee83 100644 --- a/.config/waybar/config +++ b/.config/waybar/config @@ -76,11 +76,13 @@ }, "idle_inhibitor": { - "format": "{icon} ", - "format-icons":{ + "format": "{icon} ", + "format-icons": { "activated": "", "deactivated": "" - } + }, + "tooltip-format-activated": "Idle Inhibitor Activated", + "tooltip-format-deactivated": "Idle Inhibitor Deactivated" }, "memory": { From 11f4728f478ab434868209897c12e39342ecb905 Mon Sep 17 00:00:00 2001 From: BluishHumility Date: Tue, 30 Jul 2024 23:28:41 -0400 Subject: [PATCH 09/11] feat(waybar): update module spacing * Add spacing to memory, cpu, audio, keyboard, and battery modules to separate the modules from each other a little more and get a more consistent look on the bar. * Update the icons for memory, cpu (so the icon looks more like what it actually is) --- .config/waybar/config | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.config/waybar/config b/.config/waybar/config index e28ee83..a5d72c2 100644 --- a/.config/waybar/config +++ b/.config/waybar/config @@ -87,7 +87,7 @@ "memory": { "interval": 5, - "format": " {}%", // Icon: memory + "format": "{:>3}% ", "on-click": "footclient -T waybar_htop -e htop", "states": { "warning": 70, @@ -97,7 +97,7 @@ "cpu": { "interval": 5, - "format": " {usage}% ({load})", // Icon: microchip + "format": "{usage:>3}% ", "states": { "warning": 70, "critical": 90, @@ -107,8 +107,8 @@ "pulseaudio": { "scroll-step": 2, - "format": "{icon} {volume}%", - "format-muted":"󰝟 muted", + "format": "{icon} {volume}% ", + "format-muted":"󰝟 muted ", "format-icons": { "headphones": "", "handsfree": "", @@ -123,7 +123,7 @@ "custom/keyboard-layout": { "exec": "i=$(swaymsg -t get_inputs); echo \"\"; echo \"$i\" | grep -m1 'xkb_active_layout_name' | cut -d '\"' -f4", - "format": "", + "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 @@ -136,7 +136,7 @@ "warning": 30, "critical": 15 }, - "format": "{icon} {capacity}%", + "format": "{icon} {capacity}% ", "format-icons": ["", "", "", "", ""] }, From b59b84951941e8a8a10dfdb498dc53434bd74987 Mon Sep 17 00:00:00 2001 From: BluishHumility Date: Tue, 30 Jul 2024 23:34:57 -0400 Subject: [PATCH 10/11] feat(waybar): update backlight module * Remove `backlight#value`--no need for two separate modules for this, value and icon can live together in a single module. * Add graduated icons (the cirle fills/empties as the brightness is scrolled up or down) * Change scroll interval to 5% (1% is pretty low) --- .config/waybar/config | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/.config/waybar/config b/.config/waybar/config index a5d72c2..0ae20bd 100644 --- a/.config/waybar/config +++ b/.config/waybar/config @@ -24,8 +24,7 @@ "pulseaudio", "custom/keyboard-layout", "battery", - "backlight#icon", - "backlight#value", + "backlight", "clock", "tray", //"custom/weather", @@ -140,17 +139,12 @@ "format-icons": ["", "", "", "", ""] }, - "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%" + "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%" }, "clock": { From 3ceeb66ce6645cbc1acad9e3820cdab65db6989f Mon Sep 17 00:00:00 2001 From: BluishHumility Date: Tue, 30 Jul 2024 23:37:58 -0400 Subject: [PATCH 11/11] feat(waybar): update clock module * Add a clock icon * Change alt format to AM/PM * Change tooltip to mini calendar, with scrollable months --- .config/waybar/config | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/.config/waybar/config b/.config/waybar/config index 0ae20bd..36df3ac 100644 --- a/.config/waybar/config +++ b/.config/waybar/config @@ -149,9 +149,23 @@ "clock": { "interval": 10, - "format-alt": " {:%e %b %Y}", // Icon: calendar-alt - "format": "{:%H:%M}", - "tooltip-format": "{:%e %B %Y}" + "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": {