waybar tweeks

This commit is contained in:
Lennart J. Kurzweg (Nx2)
2024-04-26 15:25:17 +02:00
parent 135eea9984
commit 15df837021
3 changed files with 30 additions and 23 deletions

View File

@@ -47,6 +47,9 @@ in
pkgs-unstable.hyprlock pkgs-unstable.hyprlock
pkgs-unstable.hypridle pkgs-unstable.hypridle
pkgs.grim
pkgs.slurp
]; ];
wayland.windowManager.hyprland = { wayland.windowManager.hyprland = {
@@ -428,7 +431,7 @@ in
########################################################################### ###########################################################################
## MEGA KEYS: ## MEGA KEYS:
", Print, exec, /home/nx2/scripts/screenshot.sh " '' , Print, exec, grim -g "$(slurp)"''
"SUPER, Next, resizeactive, 100 -100" "SUPER, Next, resizeactive, 100 -100"
"SUPER, Prior, resizeactive, -100 100" "SUPER, Prior, resizeactive, -100 100"

View File

@@ -1,5 +1,7 @@
{ config, pkgs, secrets, ... }: { config, pkgs, secrets, ... }:
let in let
sep = " ";
in
{ {
home = { home = {
file."${config.xdg.dataHome}/nx-gcal-event-credentials.json".text = '' file."${config.xdg.dataHome}/nx-gcal-event-credentials.json".text = ''
@@ -176,7 +178,7 @@ let in
name = escape(event['summary']) name = escape(event['summary'])
print(f"󱙬 {sec_to_nice_string(remaining.seconds)}{mode}\'{name}\'") print(f"󱙬${sep}{sec_to_nice_string(remaining.seconds)}{mode}\'{name}\'")
exit(0) exit(0)
def print_help(): def print_help():

View File

@@ -1,5 +1,6 @@
{ config, lib, pkgs, rice, ... }: { config, lib, pkgs, rice, ... }:
let let
sep = " ";
in in
{ {
imports = [ imports = [
@@ -46,7 +47,7 @@ in
#ord=$(date +"%e" | awk '{printf("%d%s\n", $1, substr("thstndrd", ($1%100-20)%10*2+1, 2))}') #ord=$(date +"%e" | awk '{printf("%d%s\n", $1, substr("thstndrd", ($1%100-20)%10*2+1, 2))}')
ord=$(date +"%e" | awk '{printf("%d%s\n", $1, ($1==11||$1==12||$1==13)?"th":((($1%10)==1)?"st":((($1%10)==2)?"nd":((($1%10)==3)?"rd":"th"))))}') ord=$(date +"%e" | awk '{printf("%d%s\n", $1, ($1==11||$1==12||$1==13)?"th":((($1%10)==1)?"st":((($1%10)==2)?"nd":((($1%10)==3)?"rd":"th"))))}')
if [ $# -eq 0 ]; then if [ $# -eq 0 ]; then
echo "󰃮 $(date +'%A the')" "$ord" "of" "$(date +'%B')" " " "$(date +'%R')" echo "󰃮${sep}$(date +'%A the')" "$ord" "of" "$(date +'%B')" " ${sep}" "$(date +'%R')"
elif [ "$1" = "--no-icons" ]; then elif [ "$1" = "--no-icons" ]; then
echo "$(date +'%A the')" "$ord" "of" "$(date +'%B')" "$(date +'%R')" echo "$(date +'%A the')" "$ord" "of" "$(date +'%B')" "$(date +'%R')"
fi fi
@@ -68,8 +69,8 @@ in
margin-right = rice.gap-size; margin-right = rice.gap-size;
spacing = 10; spacing = 10;
modules-left = [ modules-left = [
"cpu" # "cpu"
"memory" # "memory"
"wireplumber" "wireplumber"
"backlight" "backlight"
"battery" "battery"
@@ -111,17 +112,17 @@ in
cpu = { cpu = {
interval = 1; interval = 1;
format = "󰍛 {}%"; format = "󰍛${sep}{}%";
max-length = 10; max-length = 10;
}; };
memory = { memory = {
interval = 5; interval = 5;
format = " {avail:.0f}G free"; format = "${sep}{avail:.0f}G free";
}; };
battery = { battery = {
interval = 60; interval = 60;
tooltip = false; tooltip = false;
format = "{icon} {capacity}%"; format = "{icon}${sep}{capacity}%";
states = { states = {
warning = 25; warning = 25;
critical = 10; critical = 10;
@@ -133,13 +134,13 @@ in
" " " "
" " " "
]; ];
format-charging = "{icon} +{capacity}%"; format-charging = "{icon}${sep}+{capacity}%";
format-plugged = "{icon} P{capacity}%"; format-plugged = "{icon}${sep}P{capacity}%";
format-full = "{icon} F{capacity}%"; format-full = "{icon}${sep}F{capacity}%";
}; };
backlight = { backlight = {
device = "DP-1"; device = "eDP-1";
format = "{icon} {percent}%"; format = "{icon}${sep}{percent}%";
format-icons = [ format-icons = [
"" ""
"" ""
@@ -153,13 +154,13 @@ in
]; ];
}; };
network = { network = {
format-wifi = " {essid}"; format-wifi = "${sep}{essid}";
format-ethernet = "󰈀 Wired"; format-ethernet = "󰈀${sep}Wired";
format-disconnected = "󰌙 Disconnected"; format-disconnected = "󰌙${sep}Disconnected";
}; };
wireplumber = { wireplumber = {
format = "󰕾 {volume}%"; format = "󰕾${sep}{volume}%";
format-muted = " Muted"; format-muted = "󰝟${sep}Muted";
}; };
}; };
}; };
@@ -174,7 +175,7 @@ in
window#waybar { window#waybar {
background-color: rgba(${rice.lib.hex-to-rgb-comma-string rice.color.background},${builtins.toString rice.transparency}); background-color: rgba(${rice.lib.hex-to-rgb-comma-string rice.color.background},${builtins.toString rice.transparency});
transition-duration: 0.5s; transition-duration: 2s;
padding: 7px 10px; padding: 7px 10px;
padding-top: 0.1em; padding-top: 0.1em;
/* border: ${builtins.toString rice.border-width}px solid rgb(${rice.lib.hex-to-rgb-comma-string rice.color.blue}); */ /* border: ${builtins.toString rice.border-width}px solid rgb(${rice.lib.hex-to-rgb-comma-string rice.color.blue}); */
@@ -227,9 +228,10 @@ in
color: rgb(${rice.lib.hex-to-rgb-comma-string rice.color.red}); color: rgb(${rice.lib.hex-to-rgb-comma-string rice.color.red});
} }
#cpu { #window {
margin-left: 0.5em; font-family: ${rice.font.base.name};
} color: rgb(${rice.lib.hex-to-rgb-comma-string rice.color.blue});
}
''; '';
}; };