Overhaul waybar formatting
This commit is contained in:
parent
3995376fc0
commit
e0a2c929fb
|
|
@ -17,10 +17,6 @@ nixpkgs, # The flake's input version of nixpkgs
|
|||
boot.loader.systemd-boot.enable = true;
|
||||
boot.loader.efi.canTouchEfiVariables = true;
|
||||
|
||||
networking.wireless.networks = {
|
||||
"NETGEAR97".psk = "pastelcello694";
|
||||
};
|
||||
|
||||
# Set your time zone.
|
||||
time.timeZone = "America/New_York";
|
||||
|
||||
|
|
|
|||
|
|
@ -8,7 +8,6 @@
|
|||
imports = [
|
||||
./sway.nix
|
||||
./swaylock.nix
|
||||
./waybar.nix
|
||||
./wofi.nix
|
||||
./mako.nix
|
||||
];
|
||||
|
|
|
|||
|
|
@ -1,3 +1,6 @@
|
|||
modules-left:
|
||||
modules-center:
|
||||
modules-right:
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
programs.waybar = {
|
||||
|
|
@ -6,9 +9,7 @@
|
|||
settings = [{
|
||||
height = 30;
|
||||
|
||||
modules-left = [ "sway/workspaces" "sway/mode" ];
|
||||
modules-center = [ "sway/window" ];
|
||||
modules-right = [ "pulseaudio" "network" "backlight" "idle_inhibitor" "clock" ];
|
||||
inherit modules-left modules-center modules-right;
|
||||
|
||||
modules = {
|
||||
"sway/mode" = {
|
||||
|
|
@ -50,6 +51,16 @@
|
|||
format = " {usage}%";
|
||||
tooltip = false;
|
||||
};
|
||||
"battery" = {
|
||||
states.warning = 30;
|
||||
states.low = 15;
|
||||
states.critical = 5;
|
||||
|
||||
format-icons = [ "" "" "" "" "" ];
|
||||
format = "{icon} {capacity}%";
|
||||
format-charging = "{icon} {capacity}% ⚡";
|
||||
format-time = "{H}h {M}m";
|
||||
};
|
||||
"memory" = {
|
||||
format = " {}%";
|
||||
};
|
||||
|
|
@ -63,7 +74,7 @@
|
|||
};
|
||||
"backlight" = {
|
||||
# device = "acpi_video1";
|
||||
format = "{percent}% {icon}";
|
||||
format = "{icon} {percent}%";
|
||||
format-icons = [ "" "" ];
|
||||
};
|
||||
"network" = {
|
||||
|
|
@ -77,9 +88,9 @@
|
|||
"pulseaudio" = {
|
||||
# scroll-step = 1; # %, can be a float
|
||||
format = "{icon} {volume}%";
|
||||
format-bluetooth = "{icon} {volume}%";
|
||||
format-bluetooth-muted = "{icon} 0%";
|
||||
format-muted = "{icon} 0%";
|
||||
format-bluetooth = " {icon} {volume}%";
|
||||
format-bluetooth-muted = " 0%";
|
||||
format-muted = " {volume}%";
|
||||
|
||||
format-icons.headphone = "";
|
||||
format-icons.hands-free = "";
|
||||
|
|
@ -87,7 +98,7 @@
|
|||
format-icons.phone = "";
|
||||
format-icons.portable = "";
|
||||
format-icons.car = "";
|
||||
format-icons.default = [ "" "" "" ];
|
||||
format-icons.default = [ "" "" " " ];
|
||||
|
||||
on-click = "pamixer -t";
|
||||
};
|
||||
|
|
@ -109,7 +120,7 @@
|
|||
* {
|
||||
border: none;
|
||||
border-radius: 0;
|
||||
font-family: "UbuntuMono Nerd Font Mono", sans-serif;
|
||||
font-family: "UbuntuMono Nerd Font", sans-serif;
|
||||
font-size: 16px;
|
||||
min-height: 0;
|
||||
}
|
||||
|
|
@ -117,8 +128,7 @@
|
|||
window#waybar {
|
||||
background-color: rgba(0, 0, 0, 0.6);
|
||||
color: #ffffff;
|
||||
transition-property: background-color;
|
||||
transition-duration: .2s;
|
||||
transition: background-color .2s;
|
||||
padding: 5px 0;
|
||||
}
|
||||
|
||||
|
|
@ -203,15 +213,38 @@
|
|||
margin-right: 0;
|
||||
}
|
||||
|
||||
#clock {
|
||||
box-shadow: inset 0 -3px #0a6cf5;
|
||||
}
|
||||
|
||||
#battery {
|
||||
box-shadow: inset 0 -3px #a0f23c;
|
||||
}
|
||||
|
||||
#battery.warning:not(.charging) {
|
||||
box-shadow: inset 0 -3px #fcda44;
|
||||
color: #fce788;
|
||||
}
|
||||
|
||||
#battery.low:not(.charging) {
|
||||
box-shadow: inset 0 -3px #f93920;
|
||||
color: #f97f6f;
|
||||
}
|
||||
|
||||
@keyframes blink {
|
||||
to {
|
||||
background-color: #ffffff;
|
||||
color: #000000;
|
||||
color: rgba(0, 0, 0, 0);
|
||||
}
|
||||
}
|
||||
|
||||
#clock {
|
||||
box-shadow: inset 0 -3px #0a6cf5;
|
||||
#battery.critical:not(.charging) {
|
||||
box-shadow: inset 0 -3px #400000;
|
||||
color: #ff2525;
|
||||
animation: blink 1.5s steps(4, start) infinite;
|
||||
}
|
||||
|
||||
#backlight {
|
||||
box-shadow: inset 0 -3px #ffff50;
|
||||
}
|
||||
|
||||
#network {
|
||||
|
|
|
|||
|
|
@ -8,6 +8,10 @@ in {
|
|||
networking.hostName = "kiana-desktop";
|
||||
networking.wireless.enable = true;
|
||||
|
||||
networking.wireless.networks = {
|
||||
"NETGEAR97".psk = "pastelcello694";
|
||||
};
|
||||
|
||||
# Passwords
|
||||
users.users.kiana = { inherit hashedPassword; };
|
||||
users.users.root = { inherit hashedPassword; };
|
||||
|
|
|
|||
|
|
@ -1,4 +1,7 @@
|
|||
{ ... }:
|
||||
{
|
||||
imports = [ ../../common/home-manager ];
|
||||
imports = [
|
||||
../../common/home-manager
|
||||
./waybar.nix
|
||||
];
|
||||
}
|
||||
|
|
|
|||
8
desktop/home-manager/waybar.nix
Normal file
8
desktop/home-manager/waybar.nix
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
# Home manager is being weird about conflicts,
|
||||
# so I'm doing this. It sucks, but so does home
|
||||
# manager, so it's fine.
|
||||
|
||||
import ../../common/home-manager/wayland/waybar.nix
|
||||
[ "sway/workspaces" "sway/mode" ]
|
||||
[ "sway/window" ]
|
||||
[ "pulseaudio" "network" "clock" "idle_inhibitor" ]
|
||||
|
|
@ -26,8 +26,8 @@ outputs = { self,
|
|||
inherit system;
|
||||
modules = [
|
||||
{ _module.args = moduleArgs; }
|
||||
./common/config
|
||||
./desktop/config
|
||||
./common/config
|
||||
home-manager.nixosModules.home-manager
|
||||
{
|
||||
home-manager.useGlobalPkgs = true;
|
||||
|
|
@ -42,8 +42,8 @@ outputs = { self,
|
|||
inherit system;
|
||||
modules = [
|
||||
{ _module.args = moduleArgs; }
|
||||
./common/config
|
||||
./laptop/config
|
||||
./common/config
|
||||
home-manager.nixosModules.home-manager
|
||||
nixos-hardware.nixosModules.microsoft-surface
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1,4 +1,7 @@
|
|||
{ ... }:
|
||||
{
|
||||
imports = [ ../../common/home-manager ];
|
||||
imports = [
|
||||
../../common/home-manager
|
||||
./waybar.nix
|
||||
];
|
||||
}
|
||||
|
|
|
|||
8
laptop/home-manager/waybar.nix
Normal file
8
laptop/home-manager/waybar.nix
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
# Home manager is being weird about conflicts,
|
||||
# so I'm doing this. It sucks, but so does home
|
||||
# manager, so it's fine.
|
||||
|
||||
import ../../common/home-manager/wayland/waybar.nix
|
||||
[ "sway/workspaces" "sway/mode" ]
|
||||
[ "sway/window" ]
|
||||
[ "pulseaudio" "backlight" "network" "battery" "clock" "idle_inhibitor" ]
|
||||
Loading…
Reference in a new issue