Mixed up files

This commit is contained in:
Tobias Maier
2022-08-07 19:51:28 +02:00
parent ff30ff05e5
commit a7b85f2a7b
2 changed files with 215 additions and 305 deletions

View File

@@ -1,173 +1,158 @@
@keyframes blink-warning {
70% {
color: @light;
}
to {
color: @light;
background-color: @warning;
}
}
@keyframes blink-critical {
70% {
color: @light;
}
to {
color: @light;
background-color: @critical;
}
}
/* -----------------------------------------------------------------------------
* Styles
* -------------------------------------------------------------------------- */
/* COLORS */
/* Nord */
@define-color bg #000000;
@define-color light #eceff4;
@define-color warning #ffb726;
@define-color critical #ff3d00;
@define-color mode #4c566a;
@define-color workspaces @bg;
@define-color workspacesfocused #5c5c5c;
@define-color tray @bg;
/* Reset all styles */
* {
border: none;
border-radius: 0;
min-height: 0;
margin: 0;
padding: 0;
border: none;
border-radius: 0;
font-family: "JetbrainsMono Nerd Font";
font-size: 14px;
}
/* The whole bar */
#waybar {
background: @bg;
color: @light;
font-family: Noto Sans;
font-size: 11px;
font-weight: bold;
window#waybar {
background: none;
}
/* Each module */
#battery,
#clock,
#cpu,
#custom-layout,
#memory,
#network,
#pulseaudio,
#temperature,
#custom-alsa,
#tray,
#backlight {
padding-left: 10px;
padding-right: 10px;
border-right: 1px solid @light;
}
/* Each module that should blink */
#memory,
#temperature,
#battery {
animation-timing-function: linear;
animation-iteration-count: infinite;
animation-direction: alternate;
}
/* Each critical module */
#memory.critical,
#cpu.critical,
#temperature.critical,
#battery.critical {
color: @critical;
}
/* Each critical that should blink */
#mode,
#memory.critical,
#temperature.critical,
#battery.critical.discharging {
animation-name: blink-critical;
animation-duration: 2s;
}
/* Each warning */
#network.disconnected,
#memory.warning,
#cpu.warning,
#temperature.warning,
#battery.warning {
color: @warning;
}
/* Each warning that should blink */
#battery.warning.discharging {
animation-name: blink-warning;
animation-duration: 3s;
}
/* Workspaces stuff */
#workspaces {
margin-right: 10px;
}
#workspaces button {
font-weight: bold; /* Somewhy the bar-wide setting is ignored*/
padding-left: 5px;
padding-right: 5px;
color: @light;
background: @bg;
}
#workspaces button.focused {
background: @workspacesfocused;
}
#workspaces button.urgent {
border-color: #c9545d;
color: #c9545d;
window#waybar.hidden {
opacity: 0.2;
}
#window {
margin-right: 40px;
margin-left: 40px;
margin-top: 6px;
padding-left: 10px;
padding-right: 10px;
border-radius: 5px;
transition: none;
background: #2e3440;
color: #d8dee9;
}
#network {
background: @bg;
#custom-powermenu {
margin-top: 6px;
margin-left: 12px;
margin-right: 12px;
padding-left: 15px;
padding-right: 20px;
border-radius: 5px;
transition: none;
background: #2e3440;
}
#memory {
background: @bg;
#tags {
margin-top: 6px;
margin-right: 12px;
font-size: 4px;
border-radius: 5px;
transition: none;
background: #2e3440;
}
#cpu {
background: @bg;
#tags button {
transition: none;
color: #4c566a;
background: transparent;
border-radius: 0px;
}
#tags button.occupied {
transition: none;
color: #a3be8c;
background: transparent;
font-size: 4px;
}
#tags button.focused {
color: #81a1c1;
border-bottom: 2px solid #81a1c1;
}
#tags button:hover {
transition: none;
box-shadow: inherit;
text-shadow: inherit;
color: #81a1c1;
}
#temperature {
margin-top: 6px;
margin-right: 12px;
border-radius: 5px;
transition: none;
padding: 0 10px;
color: #a3be8c;
background: #2e3440;
}
#pulseaudio {
margin-top: 6px;
margin-left: 12px;
border-radius: 5px;
transition: none;
padding: 0 10px;
color: #a3be8c;
background: #2e3440;
}
#battery {
background: @bg;
margin-top: 6px;
margin-left: 12px;
border-radius: 5px;
transition: none;
padding: 10px 10px;
color: #a3be8c;
background: #2e3440;
}
#clock.date {
background: @bg;
#battery.critical:not(.charging) {
background-color: #d8dee9;
color: #2e3440;
animation-name: blink;
animation-duration: 0.5s;
animation-timing-function: linear;
animation-iteration-count: infinite;
animation-direction: alternate;
}
#clock.time {
background: @bg;
@keyframes blink {
to {
background-color: #bf616a;
color: #d8dee9;
}
}
#backlight {
margin-top: 6px;
margin-left: 12px;
border-radius: 5px;
transition: none;
padding: 10px 10px;
color: #88c0d0;
background: #2e3440;
}
#custom-cpu {
margin-top: 6px;
margin-left: 12px;
border-radius: 5px;
transition: none;
padding: 10px 10px;
color: #88c0d0;
background: #2e3440;
}
#custom-clock {
margin-top: 6px;
margin-left: 12px;
margin-right: 12px;
border-radius: 5px;
transition: none;
padding: 10px 10px;
color: #a3be8c;
background: #2e3440;
}
#tray {
background: @bg;
}
margin-top: 6px;
margin-right: 12px;
border-radius: 5px;
padding-left: 10px;
padding-right: 10px;
color: #d8dee9;
background: #2e3440;
}

View File

@@ -1,158 +1,83 @@
* {
border: none;
border-radius: 0;
font-family: "JetbrainsMono Nerd Font";
font-size: 14px;
}
{
"layer": "top",
"modules-left": ["custom/powermenu", "river/tags", "temperature"],
"modules-center": ["river/window"],
"modules-right": ["battery","backlight", "pulseaudio", "custom/mic","custom/cpu","custom/clock", "tray"],
"pulseaudio": {
"tooltip": false,
"scroll-step": 5,
"format": "{icon} {volume}%",
"format-muted": "婢 0%",
"on-click":"amixer -D pulse Master 1+ toggle",
"scroll-step": 5,
"format-icons": {
"default": ["", "", ""]
}
},
"custom/powermenu": {
"format": "",
"interval": "once",
/*"exec": "checkupdates | wc -l",*/
"on-click": "~/.config/waybar/modules/powermenu.sh",
"tooltip": false,
"signal": 8
},
window#waybar {
background: none;
}
window#waybar.hidden {
opacity: 0.2;
}
#window {
margin-top: 6px;
padding-left: 10px;
padding-right: 10px;
border-radius: 5px;
transition: none;
background: #2e3440;
color: #d8dee9;
}
#custom-powermenu {
margin-top: 6px;
margin-left: 12px;
margin-right: 12px;
padding-left: 15px;
padding-right: 20px;
border-radius: 5px;
transition: none;
background: #2e3440;
}
#tags {
margin-top: 6px;
margin-right: 12px;
font-size: 4px;
border-radius: 5px;
transition: none;
background: #2e3440;
}
#tags button {
transition: none;
color: #4c566a;
background: transparent;
border-radius: 0px;
}
#tags button.occupied {
transition: none;
color: #a3be8c;
background: transparent;
font-size: 4px;
}
#tags button.focused {
color: #81a1c1;
border-bottom: 2px solid #81a1c1;
}
#tags button:hover {
transition: none;
box-shadow: inherit;
text-shadow: inherit;
color: #81a1c1;
}
#temperature {
margin-top: 6px;
margin-right: 12px;
border-radius: 5px;
transition: none;
padding: 0 10px;
color: #a3be8c;
background: #2e3440;
}
#pulseaudio {
margin-top: 6px;
margin-left: 12px;
border-radius: 5px;
transition: none;
padding: 0 10px;
color: #a3be8c;
background: #2e3440;
}
#battery {
margin-top: 6px;
margin-left: 12px;
border-radius: 5px;
transition: none;
padding: 10px 10px;
color: #a3be8c;
background: #2e3440;
}
#battery.critical:not(.charging) {
background-color: #d8dee9;
color: #2e3440;
animation-name: blink;
animation-duration: 0.5s;
animation-timing-function: linear;
animation-iteration-count: infinite;
animation-direction: alternate;
}
@keyframes blink {
to {
background-color: #bf616a;
color: #d8dee9;
}
}
#backlight {
margin-top: 6px;
margin-left: 12px;
border-radius: 5px;
transition: none;
padding: 10px 10px;
color: #88c0d0;
background: #2e3440;
}
#custom-cpu {
margin-top: 6px;
margin-left: 12px;
border-radius: 5px;
transition: none;
padding: 10px 10px;
color: #88c0d0;
background: #2e3440;
}
#custom-clock {
margin-top: 6px;
margin-left: 12px;
margin-right: 12px;
border-radius: 5px;
transition: none;
padding: 10px 10px;
color: #a3be8c;
background: #2e3440;
}
#tray {
margin-top: 6px;
margin-right: 12px;
border-radius: 5px;
padding-left: 10px;
padding-right: 10px;
color: #d8dee9;
background: #2e3440;
"river/tags": {
"tag-labels":[
"",
"",
"ﭮ",
"",
"",
"",
""
],
"disable-click": false,
"num-tags": 7
},
"temperature": {
"hwmon-path": "/sys/class/hwmon/hwmon2/temp1_input",
"format": "{temperatureC}°C "
},
"river/window": {
"format": "{}",
"max-length": 90
},
"backlight": {
"device": "amdgpu_b10",
"format": "{icon} {}%",
"format-icons": ["", ""],
"interval": 1
},
"battery": {
"states": {
"good": 100,
"warning": 30,
"critical": 20
},
"format": "{icon} {capacity}%",
"format-charging": "{icon} {capacity}%",
"format-plugged": "{icon} {capacity}%",
"format-alt": "{time} {icon}",
"format-icons": ["", "", "", "", ""]
},
"tray":{
"icon-size":18,
"show-passive-items":true,
"spacing": 10,
"reverse-direction": true
},
"custom/clock": {
"interval": 1,
"return-type": "string",
"exec": "~/.config/waybar/modules/datetime.sh",
"tooltip": false
},
"custom/cpu": {
"interval": 1,
"return-type": "string",
"exec": "~/.config/waybar/modules/cpu.sh",
"tooltip": false
},
}