From 4f349726ea948ab36f6b7771832bd2595d43a655 Mon Sep 17 00:00:00 2001
From: Adam <24621027+WhiteDopeOnPunk@users.noreply.github.com>
Date: Mon, 27 Nov 2023 23:06:26 -0500
Subject: [PATCH] replace waybar
---
configs/i3bar-river/config.toml | 50 ++++++++++++
configs/i3status-rust/config.toml | 43 ++++++++++
configs/river/init | 2 +-
configs/waybar/config | 87 ---------------------
configs/waybar/style.css | 126 ------------------------------
scripts/install_arch | 10 ++-
6 files changed, 103 insertions(+), 215 deletions(-)
create mode 100644 configs/i3bar-river/config.toml
create mode 100644 configs/i3status-rust/config.toml
delete mode 100644 configs/waybar/config
delete mode 100644 configs/waybar/style.css
diff --git a/configs/i3bar-river/config.toml b/configs/i3bar-river/config.toml
new file mode 100644
index 0000000..b65193b
--- /dev/null
+++ b/configs/i3bar-river/config.toml
@@ -0,0 +1,50 @@
+# The status generator command.
+# Optional: with no status generator the bar will display only tags and layout name.
+command = "i3status-rs"
+
+# Colors
+background = "#282828ff"
+color = "#ffffffff"
+separator = "#9a8a62ff"
+tag_fg = "#d79921ff"
+tag_bg = "#282828ff"
+tag_focused_fg = "#1d2021ff"
+tag_focused_bg = "#689d68ff"
+tag_urgent_fg = "#282828ff"
+tag_urgent_bg = "#cc241dff"
+tag_inactive_fg = "#d79921ff"
+tag_inactive_bg = "#282828ff"
+
+# The font and various sizes
+font = "monospace 10"
+height = 24
+margin_top = 0
+margin_bottom = 0
+margin_left = 0
+margin_right = 0
+separator_width = 2.0
+tags_r = 0.0
+tags_padding = 25.0
+blocks_r = 0.0
+blocks_overlap = 0.0
+
+# Misc
+position = "top" # either "top" or "bottom"
+hide_inactive_tags = true
+invert_touchpad_scrolling = true
+show_layout_name = true
+blend = true # whether tags/blocks colors should blend with bar's background
+show_mode = true
+
+# WM-specific options
+[wm.river]
+max_tag = 9 # Show only the first nine tags
+
+# Per output overrides
+# [output.your-output-name]
+# right now only "enable" option is available
+# enable = false
+#
+# You can have any number of overrides
+# [output.eDP-1]
+# enable = false
diff --git a/configs/i3status-rust/config.toml b/configs/i3status-rust/config.toml
new file mode 100644
index 0000000..ef504ca
--- /dev/null
+++ b/configs/i3status-rust/config.toml
@@ -0,0 +1,43 @@
+icons_format = "{icon}"
+
+[theme]
+theme = "solarized-dark"
+[theme.overrides]
+idle_bg = "#123456"
+idle_fg = "#abcdef"
+
+[icons]
+icons = "awesome4"
+[icons.overrides]
+bat = ["|E|", "|_|", "|=|", "|F|"]
+bat_charging = "|^| "
+
+[[block]]
+block = "cpu"
+
+[[block]]
+block = "disk_space"
+path = "/"
+info_type = "available"
+alert_unit = "GB"
+interval = 20
+warning = 20.0
+alert = 10.0
+format = " $icon root: $available.eng(w:2) "
+
+[[block]]
+block = "memory"
+format = " $icon $mem_total_used_percents.eng(w:2) "
+format_alt = " $icon_swap $swap_used_percents.eng(w:2) "
+
+[[block]]
+block = "sound"
+[[block.click]]
+button = "left"
+cmd = "pavucontrol"
+
+[[block]]
+block = "time"
+interval = 5
+format = " $timestamp.datetime(f:'%a %d/%m %R') "
+
diff --git a/configs/river/init b/configs/river/init
index 84a3ad9..64f7c55 100755
--- a/configs/river/init
+++ b/configs/river/init
@@ -1,7 +1,6 @@
#!/bin/sh
# Startup
-waybar &
swaybg -i ~/.cache/wal/bg &
mako &
@@ -187,3 +186,4 @@ riverctl rule-add csd -app-id "bar"
# River will send the process group of the init executable SIGTERM on exit.
riverctl default-layout rivertile
rivertile -view-padding 6 -outer-padding 6 &
+riverctl spawn i3bar-river
diff --git a/configs/waybar/config b/configs/waybar/config
deleted file mode 100644
index 762386d..0000000
--- a/configs/waybar/config
+++ /dev/null
@@ -1,87 +0,0 @@
-{
- // basics
-
- "spacing": 4,
-
-
- // modules layout
-
- "modules-left": ["river/tags"],
- "modules-center": ["river/window"],
- "modules-right": ["idle_inhibitor", "pulseaudio", "network", "cpu", "memory", "battery", "tray", "clock"],
-
-
- // modules config
-
- "idle_inhibitor": {
- "format": "{icon}",
- "format-icons": {
- "activated": "",
- "deactivated": ""
- }
- },
-
- "pulseaudio": {
- // "scroll-step": 1, // %, 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"
- },
-
- "network": {
- // "interface": "wlp2*", // (Optional) To force the use of this interface
- "format-wifi": "{essid} ({signalStrength}%) ",
- "format-ethernet": "{ifname}: {ipaddr}/{cidr} ",
- "format-linked": "{ifname} (No IP) ",
- "format-disconnected": "Disconnected ⚠",
- "format-alt": "{ifname}: {ipaddr}/{cidr}"
- },
-
- "cpu": {
- "format": " {usage}%",
- "tooltip": false
- },
-
- "memory": {
- "format": " {}%"
- },
-
- "tray": {
- // "icon-size": 21,
- "spacing": 10
- },
-
- "battery": {
- "states": {
- // "good": 95,
- "warning": 30,
- "critical": 15
- },
- "format": "{icon} {capacity}%",
- "format-charging": "{capacity}%",
- "format-plugged": "{capacity}%",
- "format-alt": "{icon} {time}",
- // "format-good": "", // An empty format will hide the module
- // "format-full": "",
- "format-icons": ["", "", "", "", ""]
- },
-
- "clock": {
- "format": "{:%I:%M}",
- "tooltip-format": "{:%Y %B}\n{calendar}",
- "format-alt": "{:%Y-%m-%d}"
- },
-}
diff --git a/configs/waybar/style.css b/configs/waybar/style.css
deleted file mode 100644
index 25bb26e..0000000
--- a/configs/waybar/style.css
+++ /dev/null
@@ -1,126 +0,0 @@
-@import "../../.cache/wal/colors-waybar.css"; /* can't get a nice path? or brainfart */
-
-* {
- /* `otf-font-awesome` is required to be installed for icons */
- font-family: FontAwesome, Roboto, Helvetica, Arial, sans-serif;
- font-size: 13px;
- color: @foreground;
-}
-
-window#waybar {
- background-color: @background;
- border-bottom: 3px solid @color3;
- transition-property: background-color;
- transition-duration: .5s;
-}
-
-button {
- /* Use box-shadow instead of border so the text isn't offset */
- box-shadow: inset 0 -3px transparent;
- /* Avoid rounded borders under each button name */
- border: none;
- border-radius: 0;
-}
-
-/* https://github.com/Alexays/Waybar/wiki/FAQ#the-workspace-buttons-have-a-strange-hover-effect */
-button:hover {
- background: inherit;
- box-shadow: inset 0 -3px @color2;
-}
-
-#tags {
- background-color: @background;
-}
-
-#tags button.occupied {
- box-shadow: inset 0 -3px @color3;
-}
-
-#tags button.focused {
- background-color: @color1;
- box-shadow: inset 0 -3px @foreground;
-}
-#tags button.urgent {
- color: red;
-}
-
-#idle_inhibitor,
-#clock,
-#cpu,
-#memory,
-#network,
-#tray,
-#pulseaudio,
-#battery {
- background-color: @color1;
- padding: 0 10px;
-}
-
-#idle_inhibitor.activated {
- background-color: #ecf0f1;
- color: #2d3436;
-}
-
-#pulseaudio.muted {
- background-color: #90b1b1;
- color: #2a5c45;
-}
-
-#network.disconnected {
- background-color: #f53c3c;
-}
-
-#tray > .passive {
- -gtk-icon-effect: dim;
-}
-
-#tray > .needs-attention {
- -gtk-icon-effect: highlight;
- background-color: #eb4d4b;
-}
-
-#battery.charging, #battery.plugged {
- color: @foreground;
- background-color: @color1;
-}
-
-@keyframes blink {
- to {
- background-color: #ffffff;
- color: #000000;
- }
-}
-
-#battery.critical:not(.charging) {
- background-color: #f53c3c;
- color: #ffffff;
- animation-name: blink;
- animation-duration: 0.5s;
- animation-timing-function: linear;
- animation-iteration-count: infinite;
- animation-direction: alternate;
-}
-
-
-#wireplumber {
- background-color: #fff0f5;
- color: #000000;
-}
-
-#wireplumber.muted {
- background-color: #f53c3c;
-}
-
-#custom-media {
- background-color: #66cc99;
- color: #2a5c45;
- min-width: 100px;
-}
-
-#custom-media.custom-spotify {
- background-color: #66cc99;
-}
-
-#custom-media.custom-vlc {
- background-color: #ffa000;
-}
diff --git a/scripts/install_arch b/scripts/install_arch
index 3a1359b..070b6a8 100755
--- a/scripts/install_arch
+++ b/scripts/install_arch
@@ -29,17 +29,22 @@ fi &&
echo -e "\nInstalling dependencies..." &&
yay -S --needed --noconfirm \
alacritty \
+alsa-utils \
beautiful-discord-git \
+bluez \
btop \
byobu \
caprine \
chromium \
discord \
+fakeroot \
firefox-developer-edition \
fuzzel \
gawk \
gimp \
grim \
+i3bar-river \
+i3status-rust \
lf \
light \
mako \
@@ -49,6 +54,8 @@ oh-my-zsh-git \
otf-font-awesome \
pamixer \
playerctl \
+powerline-fonts \
+pulseaudio \
python-pywalfox \
pywal-discord-git \
river \
@@ -60,8 +67,9 @@ steam \
swaybg \
telegram-desktop \
thunderbird \
+ttf-font-awesome \
+upower \
wal-telegram-git \
-waybar \
wl-clipboard \
zsh \
&&