noa/nixconf
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

split off waybar styling to respective places

Browse source
This commit is contained in:
Noa Aarts 2024-06-18 19:17:29 +02:00
parent e504eae280
commit 26e8b9571b
12 changed files with 248 additions and 258 deletions
Download patch file Download diff file Expand all files Collapse all files

4
common/colors.nix
View file

@ -6,8 +6,8 @@
];
colorScheme = {
slug = "test";
name = "TestScheme";
slug = "dracumod";
name = "ModifiedDracula";
author = "Noa";
palette = {
base00 = "#26052e"; # background222c"; # background

14
modules/waybar/clock.nix
View file

@ -8,7 +8,8 @@ in
enable = lib.mkEnableOption "enable ${name} waybar module";
};
config = lib.mkIf config.modules.waybar.enabled.${name}.enable {
programs.waybar.settings.mainBar.${name} = {
programs.waybar = {
settings.mainBar.${name} = {
tooltip-format = "<big>{:%Y %B}</big>\n\n{calendar}";
interval = 1;
format = "{:%H:%M:%S}";
@ -25,5 +26,16 @@ in
pkgs.gnome.gnome-clocks
];
};
style = ''
#clock {
color: #${config.colorScheme.palette.base04};
margin: 0px 2px;
padding: 0 15px;
border-radius: 999px;
box-shadow: none;
}
'';
};
};
}

20
modules/waybar/cpu.nix
View file

@ -3,14 +3,28 @@ let
name = "cpu";
in
{
options.modules.waybar.modules = import ./addname.nix lib name;
options.modules.waybar.enabled.${name} = {
options.modules.waybar = {
modules = import ./addname.nix lib name;
enabled.${name} = {
enable = lib.mkEnableOption "enable ${name} waybar module";
};
};
config = lib.mkIf config.modules.waybar.enabled.${name}.enable {
programs.waybar.settings.mainBar."${name}" = {
programs.waybar = {
settings.mainBar."${name}" = {
format = "cpu: {usage}%";
tooltip = false;
};
style = ''
#cpu {
color: #${config.colorScheme.palette.base04};
margin: 0px 0px;
padding: 0 15px;
border-radius: 999px 0px 0px 999px;
box-shadow: inset 0 0 0 1px #${config.colorScheme.palette.base01};
}
'';
};
};
}

179
modules/waybar/default.nix
View file

@ -81,30 +81,10 @@ in
};
style = ''
* {
/* `otf-font-awesome` is required to be installed for icons */
font-family: "Maple Mono NF";
font-size: 14px;
}
window#waybar {
background-color: transparent;
border-radius: 999px;
color: #${config.colorScheme.palette.base05};
transition-property: background-color;
transition-duration: .5s;
}
window#waybar.hidden {
opacity: 0.2;
}
window#waybar.termite {
background-color: transparent;
}
window#waybar.chromium {
background-color: transparent;
}
button {
/* Use box-shadow instead of border so the text isn't offset */
box-shadow: inset 0 -1px transparent;
@ -113,170 +93,11 @@ in
border-radius: 0;
}
/* https://githbackground: #000000ub.com/Alexays/Waybar/wiki/FAQ#the-workspace-buttons-have-a-strange-hover-effect */
button:hover {
background: inherit;
border-radius: 999px;
}
#workspaces button {
transition: all 0.2s;
padding: 3px 3px 3px 5px;
margin: 3px;
min-width: 15px;
min-height: 15px;
background-color: transparent;
color: #${config.colorScheme.palette.base04};
border-radius: 999px;
}
#workspaces button:hover {
background-color: #${config.colorScheme.palette.base17};
}
#workspaces button.active {
font-weight: bold;
background-color: #${config.colorScheme.palette.base0E};
}
#workspaces button.urgent {
background-color: #${config.colorScheme.palette.base08};
}
#clock,
#battery,
#cpu,
#memory,
#disk,
#temperature,
#backlight,
#network,
#pulseaudio,
#wireplumber,
#custom-media,
#mode,
#idle_inhibitor,
#custom-vpn,
#scratchpad,
#tray,
#custom-updates,
#custom-poweroff,
#mpd {
color: #${config.colorScheme.palette.base04};
margin: 0px 2px;
padding: 0 15px;
border-radius: 999px;
box-shadow: inset 0 0 0 1px #${config.colorScheme.palette.base01};
}
.modules-right > widget:last-child > #battery {
margin-right: 0px;
}
#tray {
padding: 4px 10px;
border-radius: 999px 999px 999px 999px;
box-shadow: inset 0px 0px 0 1px #${config.colorScheme.palette.base01};
}
#window {
margin-left: 6px;
color: #${config.colorScheme.palette.base04};
}
#workspaces {
margin: 0 4px;
padding: 4px 4px;
border-radius: 999px;
box-shadow: inset 0px 0px 0 1px #${config.colorScheme.palette.base01};
}
#cpu {
border-radius: 999px 0px 0px 999px;
margin-right: 0px;
}
#memory {
border-radius: 0px;
padding: 0 10px;
margin: 0px;
box-shadow: inset 0px 2px 0 -1px #${config.colorScheme.palette.base01},
inset 0px -2px 0 -1px #${config.colorScheme.palette.base01};
}
#clock {
box-shadow: none;
}
#battery {
min-width: 50px;
border-radius: 999px;
box-shadow: inset 0 0 0 1px #${config.colorScheme.palette.base01};
background-color: #${config.colorScheme.palette.base01};
transition: all 0.3s;
}
#battery.charging, #battery.plugged {
color: #${config.colorScheme.palette.base0B};
background-color: transparent;
animation: batteryCharging 1.2s linear 0s infinite normal forwards,
}
#battery.full {
animation: batteryFull 7.0s linear 0s infinite normal forwards;
}
#battery.critical:not(.charging) {
background-color: #${config.colorScheme.palette.base00};
animation: batteryCritical 1.2s linear 0s infinite normal forwards;
}
#network {
}
#network.disconnected,
#pulseaudio.muted {
transition: all 0.2s;
color: #${config.colorScheme.palette.base01};
}
.custom-spotify {
color: #${config.colorScheme.palette.base14};
margin-right: 10px;
}
#temperature {
margin-left: 0px;
border-radius: 0px 999px 999px 0px;
}
#temperature.critical {
background-color: transparent;
color: #${config.colorScheme.palette.base08};
}
#tray {
background-color: transparent;
}
#tray > .passive {
-gtk-icon-effect: dim;
}
#tray > .needs-attention {
background-color: #${config.colorScheme.palette.base08};
border-radius: 999px;
}
#scratchpad {
background: rgba(0, 0, 0, 0.1);
}
#scratchpad.empty {
background-color: transparent;
}
tooltip {
background-color: #${config.colorScheme.palette.base00};
border: 1px solid;

20
modules/waybar/memory.nix
View file

@ -3,14 +3,28 @@ let
name = "memory";
in
{
options.modules.waybar.modules = import ./addname.nix lib name;
options.modules.waybar.enabled.${name} = {
options.modules.waybar = {
modules = import ./addname.nix lib name;
enabled.${name} = {
enable = lib.mkEnableOption "enable ${name} waybar module";
};
};
config = lib.mkIf config.modules.waybar.enabled.${name}.enable {
programs.waybar.settings.mainBar."${name}" = {
programs.waybar = {
settings.mainBar."${name}" = {
format = "mem: {}%";
tooltip = false;
};
style = ''
#memory {
border-radius: 0px;
padding: 0 10px;
color: #${config.colorScheme.palette.base04};
margin: 0px;
box-shadow: inset 0px 2px 0 -1px #${config.colorScheme.palette.base01},
inset 0px -2px 0 -1px #${config.colorScheme.palette.base01};
}
'';
};
};
}

21
modules/waybar/network.nix
View file

@ -3,12 +3,15 @@ let
name = "network";
in
{
options.modules.waybar.modules = import ./addname.nix lib name;
options.modules.waybar.enabled.${name} = {
options.modules.waybar = {
modules = import ./addname.nix lib name;
enabled.${name} = {
enable = lib.mkEnableOption "enable ${name} waybar module";
};
};
config = lib.mkIf config.modules.waybar.enabled.${name}.enable {
programs.waybar.settings.mainBar."${name}" = {
programs.waybar = {
settings.mainBar."${name}" = {
format-wifi = "{essid} ({signalStrength}%) 󰖩";
format-ethernet = "{ipaddr}/{cidr} 󰛳";
tooltip-format = "{ifname} via {gwaddr} 󰛳";
@ -16,5 +19,17 @@ in
format-disconnected = "Disconnected ";
format-alt = "{ifname}: {ipaddr}/{cidr}";
};
style = ''
#network {
color: #${config.colorScheme.palette.base04};
margin: 0px 2px;
padding: 0 15px;
border-radius: 999px;
box-shadow: inset 0 0 0 1px #${config.colorScheme.palette.base01};
}
#network.disconnected,
'';
};
};
}

13
modules/waybar/power.nix
View file

@ -14,10 +14,21 @@ in
];
config = lib.mkIf config.modules.waybar.enabled.${name}.enable {
modules.wofi.enable = true;
programs.waybar.settings.mainBar."${name}" = {
programs.waybar = {
settings.mainBar."${name}" = {
format = "";
on-click = "wofi-power";
on-click-right = "swaylock"; # TODO: change to whatever lock screen i want
};
style = ''
#custom-poweroff {
color: #${config.colorScheme.palette.base04};
margin: 0px 2px;
padding: 0 15px;
border-radius: 999px;
box-shadow: inset 0 0 0 1px #${config.colorScheme.palette.base01};
}
'';
};
};
}

27
modules/waybar/spotify.nix
View file

@ -10,22 +10,21 @@ in
};
};
config = lib.mkIf config.modules.waybar.enabled.${name}.enable {
programs.waybar.settings.mainBar.${name} = {
tooltip-format = "<big>{:%Y %B}</big>\n\n{calendar}";
programs.waybar = {
settings.mainBar.${name} = {
exec = ''${pkgs.playerctl}/bin/playerctl metadata --player=spotify -f "{{ status }}: {{ artist }} - {{ title }}"'';
format = "{}";
interval = 1;
format = "{:%H:%M:%S}";
format-alt = "{:%Y-%m-%d %H:%M:%S}";
on-click-middle = "gnome-clocks";
calendar = {
weeks-pos = "left";
format = {
today = "<span color='#FF6666'><u>{}</u></span>"; # TODO: use nix-colors
weeks = "<span color='#707A8C'>{}</span>"; # TODO: use nix-colors
on-click = "${pkgs.playerctl}/bin/playerctl --player=spotify play-pause";
on-scroll-up = "${pkgs.playerctl}/bin/playerctl --player=spotify volume 0.01+";
on-scroll-down = "${pkgs.playerctl}/bin/playerctl --player=spotify volume 0.01-";
};
};
home.packages = [
pkgs.gnome.gnome-clocks
];
style = ''
#custom-spotify {
color: #${config.colorScheme.palette.base14};
margin-right: 10px;
}
'';
};
};
}

33
modules/waybar/tray.nix
View file

@ -3,13 +3,40 @@ let
name = "tray";
in
{
options.modules.waybar.modules = import ./addname.nix lib name;
options.modules.waybar.enabled.${name} = {
options.modules.waybar = {
modules = import ./addname.nix lib name;
enabled.${name} = {
enable = lib.mkEnableOption "enable ${name} waybar module";
};
};
config = lib.mkIf config.modules.waybar.enabled.${name}.enable {
programs.waybar.settings.mainBar."${name}" = {
programs.waybar = {
settings.mainBar."${name}" = {
spacing = 10;
};
style = ''
#tray {
color: #${config.colorScheme.palette.base04};
margin: 0px 2px;
padding: 4px 10px;
border-radius: 999px 999px 999px 999px;
box-shadow: inset 0px 0px 0 1px #${config.colorScheme.palette.base01};
}
#tray {
background-color: transparent;
}
#tray > .passive {
-gtk-icon-effect: dim;
}
#tray > .needs-attention {
background-color: #${config.colorScheme.palette.base08};
border-radius: 999px;
}
'';
};
};
}

36
modules/waybar/window.nix
View file

@ -3,13 +3,43 @@ let
name = "hyprland/window";
in
{
options.modules.waybar.modules = import ./addname.nix lib name;
options.modules.waybar.enabled.${name} = {
options.modules.waybar = {
modules = import ./addname.nix lib name;
enabled.${name} = {
enable = lib.mkEnableOption "enable ${name} waybar module";
};
};
config = lib.mkIf config.modules.waybar.enabled.${name}.enable {
programs.waybar.settings.mainBar."${name}" = {
programs.waybar = {
settings.mainBar."${name}" = {
max-length = 36;
};
style = ''
window#waybar {
background-color: transparent;
border-radius: 999px;
color: #${config.colorScheme.palette.base05};
transition-property: background-color;
transition-duration: .5s;
}
window#waybar.hidden {
opacity: 0.2;
}
window#waybar.termite {
background-color: transparent;
}
window#waybar.chromium {
background-color: transparent;
}
#window {
margin-left: 6px;
color: #${config.colorScheme.palette.base04};
}
'';
};
};
}

13
modules/waybar/wireplumber.nix
View file

@ -10,11 +10,22 @@ in
};
};
config = lib.mkIf config.modules.waybar.enabled.${name}.enable {
programs.waybar.settings.mainBar."${name}" = {
programs.waybar = {
settings.mainBar."${name}" = {
format = "{volume}% {icon}";
format-muted = "";
on-click = "helvum";
format-icons = [ "" "" "" ];
};
style = ''
#wireplumber {
color: #${config.colorScheme.palette.base04};
margin: 0px 2px;
padding: 0 15px;
border-radius: 999px;
box-shadow: inset 0 0 0 1px #${config.colorScheme.palette.base01};
}
'';
};
};
}

42
modules/waybar/workspaces.nix
View file

@ -3,15 +3,51 @@ let
name = "hyprland/workspaces";
in
{
options.modules.waybar.modules = import ./addname.nix lib name;
options.modules.waybar.enabled.${name} = {
options.modules.waybar = {
modules = import ./addname.nix lib name;
enabled.${name} = {
enable = lib.mkEnableOption "enable ${name} waybar module";
};
};
config = lib.mkIf config.modules.waybar.enabled.${name}.enable {
programs.waybar.settings.mainBar."${name}" = {
programs.waybar = {
settings.mainBar."${name}" = {
format = "{name}";
on-click = "activate";
sort-by = "id";
};
style = ''
#workspaces button {
transition: all 0.2s;
padding: 3px 3px 3px 5px;
margin: 3px;
min-width: 15px;
min-height: 15px;
background-color: transparent;
color: #${config.colorScheme.palette.base04};
border-radius: 999px;
}
#workspaces button:hover {
background-color: #${config.colorScheme.palette.base17};
}
#workspaces button.active {
font-weight: bold;
background-color: #${config.colorScheme.palette.base0E};
}
#workspaces button.urgent {
background-color: #${config.colorScheme.palette.base08};
}
#workspaces {
margin: 0 4px;
padding: 4px 4px;
border-radius: 999px;
box-shadow: inset 0px 0px 0 1px #${config.colorScheme.palette.base01};
}
'';
};
};
}