refactors

This commit is contained in:
notohh 2022-12-18 23:30:18 -05:00
parent ff72d6b879
commit 242a9bd2ba
3 changed files with 50 additions and 26 deletions

View file

@ -13,9 +13,9 @@ print_info() {
info "${c5} ├─  WM " de info "${c5} ├─  WM " de
info "${c5} ├─  CPU " cpu info "${c5} ├─  CPU " cpu
info "${c5} ├─  GPU " gpu info "${c5} ├─  GPU " gpu
info "${c5} ├─  UpTime " uptime info "${c5} ├─  TERMINAL " term
info "${c5} ├─  TERMINAL " term info "${c5} ├─  SHELL " shell
info "${c5} └─  SHELL " shell info "${c5} └─  Up time " uptime
prin "$(color 1)  $(color 2) $(color 3) $(color 4) $(color 5) $(color 6) $(color 7) $(color 8)" prin "$(color 1)  $(color 2) $(color 3) $(color 4) $(color 5) $(color 6) $(color 7) $(color 8)"
} }
@ -53,7 +53,7 @@ kernel_shorthand="off"
# Values: 'on', 'tiny', 'off' # Values: 'on', 'tiny', 'off'
# Flag: --distro_shorthand # Flag: --distro_shorthand
# Supports: Everything except Windows and Haiku # Supports: Everything except Windows and Haiku
distro_shorthand="off" distro_shorthand="on"
# Show/Hide OS Architecture. # Show/Hide OS Architecture.
# Show 'x86_64', 'x86' and etc in 'Distro:' output. # Show 'x86_64', 'x86' and etc in 'Distro:' output.
@ -653,7 +653,7 @@ disk_display="off"
# Values: 'ascii', 'caca', 'chafa', 'jp2a', 'iterm2', 'off', # Values: 'ascii', 'caca', 'chafa', 'jp2a', 'iterm2', 'off',
# 'pot', 'termpix', 'pixterm', 'tycat', 'w3m', 'kitty' # 'pot', 'termpix', 'pixterm', 'tycat', 'w3m', 'kitty'
# Flag: --backend # Flag: --backend
image_backend="ascii" image_backend="kitty"
# Image Source # Image Source
# #

View file

@ -1,13 +1,14 @@
{ {
"layer": "top", // Waybar at top layer "layer": "top", // Waybar at top layer
"output": "DP-3", "output": "DP-3",
"position": "top", // Waybar position (top|bottom|left|right) "position": "top", // Waybar position (top|bottom|left|right)
"height": 35, // Waybar height (to be removed for auto height) "height": 35, // Waybar height (to be removed for auto height)
"width": 1879, // Waybar width "width": 1879, // Waybar width
"spacing": 10, // Gaps between modules (4px) "spacing": 10, // Gaps between modules (4px)
"margin-top": 8,
// Choose the order of the modules // Choose the order of the modules
"modules-left": [ "user", "hyprland/window"], "modules-left": [ "custom/launcher", "user", "custom/spotify" ],
"modules-center": ["custom/spotify"], "modules-center": [ "hyprland/window" ],
"modules-right": ["pulseaudio", "cpu", "memory", "clock", "tray", "custom/wlogout"], "modules-right": ["pulseaudio", "cpu", "memory", "clock", "tray", "custom/wlogout"],
// Modules configuration // Modules configuration
@ -140,7 +141,7 @@
}, },
"custom/spotify": { "custom/spotify": {
"exec": "/usr/bin/python3 ~/.config/waybar/scripts/mediaplayer.py --player spotifyd", "exec": "/usr/bin/python3 ~/.config/waybar/scripts/mediaplayer.py --player spotifu",
"format": "{} ", "format": "{} ",
"return-type": "json", "return-type": "json",
"on-click": "playerctl play-pause", "on-click": "playerctl play-pause",
@ -153,6 +154,8 @@
"hyprland/window": { "hyprland/window": {
"format": " {}", "format": " {}",
"separate-outputs": true, "separate-outputs": true,
"max-length": 35,
}, },
@ -169,15 +172,21 @@
"user": { "user": {
"format": "{user} (up {work_H} hrs, {work_d} days ↑)", "format": "{user} (up {work_H} hrs, {work_d} days ↑)",
"interval": 60, "interval": 60,
"height": 15, "icon": false,
"width": 15,
}, },
"custom/wlogout": { "custom/wlogout": {
"format": "", "format": "",
"interval": "once", "interval": "once",
"on-click": "wlogout -c 5 -r 5", "on-click": "wlogout -c 5 -r 5",
"tooltip": "false" "tooltip": "false",
},
"custom/launcher": {
"format": "",
"interval": "once",
"tooltip": "false",
"on-click": "~/.config/waybar/scripts/wallpaper.sh",
}, },
"custom/media": { "custom/media": {
@ -189,6 +198,8 @@
"default": "🎜" "default": "🎜"
}, },
"escape": true, "escape": true,
"exec": "$HOME/.config/waybar/mediaplayer.py 2> /dev/null" // Script in resources folder "exec": "$HOME/.config/waybar/mediaplayer.py 2> /dev/null" // Script in resources folder
// "exec": "$HOME/.config/waybar/mediaplayer.py --player spotify 2> /dev/null" // Filter player based on name // "exec": "$HOME/.config/waybar/mediaplayer.py --player spotify 2> /dev/null" // Filter player based on name
@ -196,3 +207,4 @@
} }
} }

View file

@ -2,20 +2,23 @@
* { * {
/* `otf-font-awesome` is required to be installed for icons */ /* `otf-font-awesome` is required to be installed for icons */
font-family: FontAwesome, JetBrains Mono, Helvetica, Arial, sans-serif; font-family: FontAwesome, JetBrainsMono Nerd Font, JetBrains Mono, Helvetica, Arial, sans-serif;
font-size: 12px; font-size: 14px;
border-radius: 5px; border-radius: 6px;
padding-bottom: 3px; padding-bottom: 3px;
padding-right: 7px; padding-right: 7px;
padding-left: 7px; padding-left: 7px;
padding-top: 2px; padding-top: 3px;
} min-height: 0px;
}
window#waybar { window#waybar {
background-color: rgb(17, 17, 27); background-color: rgb(30, 30, 46);
border-bottom: 2px solid rgb(245, 194, 231); border-radius: 21px;
border-bottom: 3px solid rgb(245, 194, 231);
border-left: 3px solid rgb(245, 194, 231); border-left: 3px solid rgb(245, 194, 231);
border-right: 3px solid rgb(245, 194, 231); border-right: 3px solid rgb(245, 194, 231);
border-top: 3px solid rgb(245, 194, 231);
color: #ffffff; color: #ffffff;
transition-property: background-color; transition-property: background-color;
transition-duration: .5s; transition-duration: .5s;
@ -97,8 +100,9 @@ button:hover {
#idle_inhibitor, #idle_inhibitor,
#scratchpad, #scratchpad,
#mpd { #mpd {
padding: 0 10px; padding: 0 5px;
color: #ffffff; color: #ffffff;
} }
#window, #window,
@ -116,7 +120,7 @@ button:hover {
margin-right: 0; margin-right: 0;
} }
.custom-spotifyd { #custom-spotify {
padding: 0 10px; padding: 0 10px;
margin: 0 4px; margin: 0 4px;
background-color: #a6e3a1; background-color: #a6e3a1;
@ -228,7 +232,7 @@ label:focus {
} }
#tray { #tray {
background-color: #585b70; background-color: transparent;
} }
#tray > .passive { #tray > .passive {
@ -301,19 +305,27 @@ label:focus {
#window { #window {
background: #f5c2e7; background: #f5c2e7;
color: black; color: black;
padding-left: 5px; padding-left: 10px;
padding-right: 5px; padding-right: 10px;
} }
#custom-pacman { #custom-pacman {
background: #f38ba8; background: #f38ba8;
color: black; color: black;
} }
#user { #user {
background: #f5c2e7; background: #f5c2e7;
color: black; color: black;
padding-left: 10px;
padding-right: 10px;
} }
#custom-wlogout {
font-size: 15px;
}
#custom-launcher {
font-size: 20px;
color: #7eb8e2;
}