diff --git a/modules/home/waybar/default.nix b/modules/home/waybar/default.nix
index 9b8b240..9372046 100644
--- a/modules/home/waybar/default.nix
+++ b/modules/home/waybar/default.nix
@@ -1,6 +1,808 @@
-{ ... }:
+{ config, lib, pkgs, user, ... }:
+
{
- imports = [ (import ./waybar.nix) ]
- ++ [ (import ./settings.nix) ]
- ++ [ (import ./style.nix) ];
+ programs.waybar = {
+ enable = true;
+ package = pkgs.waybar.overrideAttrs (oa: {
+ mesonFlags = (oa.mesonFlags or [ ]) ++ [ "-Dexperimental=true" ];
+ });
+ systemd = {
+ enable = false;
+ target = "graphical-session.target";
+ };
+ style = ''
+ * {
+ font-family: "JetBrainsMono Nerd Font";
+ font-size: 12pt;
+ font-weight: bold;
+ border-radius: 0px;
+ transition-property: background-color;
+ transition-duration: 0.5s;
+ }
+ @keyframes blink_red {
+ to {
+ background-color: rgb(242, 143, 173);
+ color: rgb(26, 24, 38);
+ }
+ }
+ .warning, .critical, .urgent {
+ animation-name: blink_red;
+ animation-duration: 1s;
+ animation-timing-function: linear;
+ animation-iteration-count: infinite;
+ animation-direction: alternate;
+ }
+ window#waybar {
+ background-color: transparent;
+ }
+ window > box {
+ margin-left: 5px;
+ margin-right: 5px;
+ margin-top: 5px;
+ background-color: rgb(30, 30, 46);
+ }
+ #workspaces {
+ padding-left: 0px;
+ padding-right: 4px;
+ }
+ #workspaces button {
+ padding-top: 5px;
+ padding-bottom: 5px;
+ padding-left: 6px;
+ padding-right: 6px;
+ }
+ #workspaces button.active {
+ background-color: rgb(181, 232, 224);
+ color: rgb(26, 24, 38);
+ }
+ #workspaces button.urgent {
+ color: rgb(26, 24, 38);
+ }
+ #workspaces button:hover {
+ background-color: rgb(248, 189, 150);
+ color: rgb(26, 24, 38);
+ }
+ tooltip {
+ background: rgb(48, 45, 65);
+ }
+ tooltip label {
+ color: rgb(217, 224, 238);
+ }
+ #mode, #clock, #memory, #temperature,#cpu,#mpd, #custom-wall, #temperature, #backlight, #pulseaudio, #network, #battery, #custom-powermenu, #custom-cava-internal {
+ padding-left: 10px;
+ padding-right: 10px;
+ }
+ /* #mode { */
+ /* margin-left: 10px; */
+ /* background-color: rgb(248, 189, 150); */
+ /* color: rgb(26, 24, 38); */
+ /* } */
+ #memory {
+ color: rgb(181, 232, 224);
+ }
+ #cpu {
+ color: rgb(245, 194, 231);
+ }
+ #clock {
+ color: rgb(217, 224, 238);
+ }
+ /* #idle_inhibitor {
+ color: rgb(221, 182, 242);
+ }*/
+ #custom-wall {
+ color: rgb(221, 182, 242);
+ }
+ #temperature {
+ color: rgb(150, 205, 251);
+ }
+ #backlight {
+ color: rgb(248, 189, 150);
+ }
+ #pulseaudio {
+ color: rgb(245, 224, 220);
+ }
+ #network {
+ color: #ABE9B3;
+ }
+
+ #network.disconnected {
+ color: rgb(255, 255, 255);
+ }
+ #battery.charging, #battery.full, #battery.discharging {
+ color: rgb(250, 227, 176);
+ }
+ #battery.critical:not(.charging) {
+ color: rgb(242, 143, 173);
+ }
+ #custom-powermenu {
+ color: rgb(242, 143, 173);
+ }
+ #tray {
+ padding-right: 8px;
+ padding-left: 10px;
+ }
+ #mpd.paused {
+ color: #414868;
+ font-style: italic;
+ }
+ #mpd.stopped {
+ background: transparent;
+ }
+ #mpd {
+ color: #c0caf5;
+ }
+ #custom-cava-internal{
+ font-family: "Hack Nerd Font" ;
+ }
+ '';
+ settings = [{
+ "layer" = "top";
+ "position" = "top";
+ modules-left = [
+ "hyprland/workspaces"
+ "temperature"
+ #"idle_inhibitor"
+ "mpd"
+ "custom/cava-internal"
+ ];
+ modules-center = [
+ "clock"
+ ];
+ modules-right = [
+ "pulseaudio"
+ "backlight"
+ "memory"
+ "cpu"
+ "network"
+ "battery"
+ "custom/powermenu"
+ "tray"
+ ];
+ "custom/cava-internal" = {
+ "exec" = "sleep 1s && cava-internal";
+ "tooltip" = false;
+ };
+ "hyprland/workspaces" = {
+ "format" = "{icon}";
+ "on-click" = "activate";
+ # "on-scroll-up" = "hyprctl dispatch workspace e+1";
+ # "on-scroll-down" = "hyprctl dispatch workspace e-1";
+ };
+ "idle_inhibitor" = {
+ "format" = "{icon}";
+ "format-icons" = {
+ "activated" = "";
+ "deactivated" = "";
+ };
+ "tooltip" = false;
+ };
+ "backlight" = {
+ "device" = "intel_backlight";
+ "on-scroll-up" = "light -A 5";
+ "on-scroll-down" = "light -U 5";
+ "format" = "{icon} {percent}%";
+ "format-icons" = [ "" "" "" "" ];
+ };
+ "pulseaudio" = {
+ "scroll-step" = 1;
+ "format" = "{icon} {volume}%";
+ "format-muted" = " Muted";
+ "format-icons" = {
+ "default" = [ "" "" "" ];
+ };
+ "on-click" = "pamixer -t";
+ "tooltip" = false;
+ };
+ "battery" = {
+ "interval" = 10;
+ "states" = {
+ "warning" = 20;
+ "critical" = 10;
+ };
+ "format" = "{icon} {capacity}%";
+ "format-icons" = [ "" "" "" "" "" "" "" "" "" "" ];
+ "format-full" = "{icon} {capacity}%";
+ "format-charging" = " {capacity}%";
+ "tooltip" = false;
+ };
+ "clock" = {
+ "interval" = 1;
+ "format" = "{:%I:%M %p %A %b %d}";
+ "tooltip" = true;
+ /* "tooltip-format"= "{=%A; %d %B %Y}\n{calendar}" */
+ "tooltip-format" = "上午：高数\n下午：Ps\n晚上：Golang\n{calendar}";
+ };
+ "memory" = {
+ "interval" = 1;
+ "format" = " {percentage}%";
+ "states" = {
+ "warning" = 85;
+ };
+ };
+ "cpu" = {
+ "interval" = 1;
+ "format" = " {usage}%";
+ };
+ "mpd" = {
+ "max-length" = 25;
+ "format" = " {title}";
+ "format-paused" = " {title}";
+ "format-stopped" = "";
+ "format-disconnected" = "";
+ "on-click" = "mpc --quiet toggle";
+ "on-click-right" = "mpc update; mpc ls | mpc add";
+ "on-click-middle" = "kitty --class='ncmpcpp' ncmpcpp ";
+ "on-scroll-up" = "mpc --quiet prev";
+ "on-scroll-down" = "mpc --quiet next";
+ "smooth-scrolling-threshold" = 5;
+ "tooltip-format" = "{title} - {artist} ({elapsedTime:%M:%S}/{totalTime:%H:%M:%S})";
+ };
+ "network" = {
+ "format-disconnected" = " Disconnected";
+ "format-ethernet" = " {ifname} ({ipaddr})";
+ "format-linked" = " {essid} (No IP)";
+ "format-wifi" = " {essid}";
+ "interval" = 1;
+ "tooltip" = false;
+ };
+ "temperature" = {
+ # "hwmon-path"= "${env:HWMON_PATH}";
+ #"critical-threshold"= 80;
+ "tooltip" = false;
+ "format" = " {temperatureC}°C";
+ };
+ "custom/powermenu" = {
+ "format" = "";
+ "on-click" = "pkill rofi || ~/.config/rofi/powermenu.sh";
+ "tooltip" = false;
+ };
+ "tray" = {
+ "icon-size" = 15;
+ "spacing" = 5;
+ };
+ }];
+ };
+ #other config & style
+ home.file = {
+ ".config/waybar/light_config".text = ''
+ [
+ {
+ "backlight": {
+ "device": "intel_backlight",
+ "format": "{icon} {percent}%",
+ "format-icons": [
+ "", "", "", ""
+ ],
+ "on-scroll-down": "light -U 5",
+ "on-scroll-up": "light -A 5"
+ },
+ "battery": {
+ "format": "{icon} {capacity}%",
+ "format-charging": " {capacity}%",
+ "format-full": "{icon} {capacity}%",
+ "format-icons": [
+ "", "", "", "", "", "", "", "", "", ""
+ ],
+ "interval": 10,
+ "states": {
+ "critical": 10,
+ "warning": 20
+ },
+ "tooltip": false
+ },
+ "clock": {
+ "format": "{:%I:%M %p %A %b %d}",
+ "interval": 1,
+ "tooltip": true,
+ "tooltip-format": "上午：高数\n下午：Ps\n晚上：Golang\n{calendar}"
+ },
+ "cpu": {
+ "format": " {usage}%",
+ "interval": 1
+ },
+ "custom/cava-internal": {
+ "exec": "sleep 1s && cava-internal",
+ "tooltip": false
+ },
+ "custom/powermenu": {
+ "format": "",
+ "on-click": "pkill rofi || ~/.config/rofi/powermenu.sh",
+ "tooltip": false
+ },
+ "idle_inhibitor": {
+ "format": "{icon}",
+ "format-icons": {
+ "activated": "",
+ "deactivated": ""
+ },
+ "tooltip": false
+ },
+ "layer": "top",
+ "memory": {
+ "format": " {percentage}%",
+ "interval": 1,
+ "states": {
+ "warning": 85
+ }
+ },
+ "modules-center": [
+ "clock"
+ ],
+ "modules-left": [
+ "hyprland/workspaces",
+ "temperature",
+ //"idle_inhibitor",
+ "mpd",
+ "custom/cava-internal"
+ ],
+ "modules-right": [
+ "pulseaudio",
+ "backlight",
+ "memory",
+ "cpu",
+ "network",
+ "battery",
+ "custom/powermenu",
+ "tray"
+ ],
+ "mpd": {
+ "format": " {title}",
+ "format-disconnected": "",
+ "format-paused": " {title}",
+ "format-stopped": "",
+ "max-length": 25,
+ "on-click": "mpc --quiet toggle",
+ "on-click-middle": "kitty --class='ncmpcpp' ncmpcpp ",
+ "on-click-right": "mpc update; mpc ls | mpc add",
+ "on-scroll-down": "mpc --quiet next",
+ "on-scroll-up": "mpc --quiet prev",
+ "smooth-scrolling-threshold": 5,
+ "tooltip-format": "{title} - {artist} ({elapsedTime:%M:%S}/{totalTime:%H:%M:%S})"
+ },
+ "network": {
+ "interval": 1,
+ "format-wifi": " {essid}",
+ "format-ethernet": " {ifname} ({ipaddr})",
+ "format-linked": " {essid} (No IP)",
+ "format-disconnected": " Disconnected",
+ "tooltip": false,
+ },
+ "position": "top",
+ "pulseaudio": {
+ "format": "{icon} {volume}%",
+ "format-icons": {
+ "default": [
+ "",
+ "",
+ ""
+ ]
+ },
+ "format-muted": " Muted",
+ "on-click": "pamixer -t",
+ "scroll-step": 1,
+ "tooltip": false
+ },
+ "temperature": {
+ "format": " {temperatureC}°C",
+ "tooltip": false
+ },
+ "tray": {
+ "icon-size": 15,
+ "spacing": 5
+ },
+ "hyprland/workspaces": {
+ "format": "{icon}",
+ "on-click": "activate",
+ "active-only": false,
+ }
+ }
+ ]
+ '';
+ ".config/waybar/light_style.css".text = ''
+ * {
+ font-family: "JetBrainsMono Nerd Font";
+ font-size: 12pt;
+ font-weight: bold;
+ border-radius: 0px;
+ transition-property: background-color;
+ transition-duration: 0.5s;
+ }
+ @keyframes blink_red {
+ to {
+ background-color: rgb(242, 143, 173);
+ color: rgb(26, 24, 38);
+ }
+ }
+ .warning, .critical, .urgent {
+ animation-name: blink_red;
+ animation-duration: 1s;
+ animation-timing-function: linear;
+ animation-iteration-count: infinite;
+ animation-direction: alternate;
+ }
+ window#waybar {
+ background-color: transparent;
+ }
+ window > box {
+ margin-left: 5px;
+ margin-right: 5px;
+ margin-top: 5px;
+ background-color: rgb(250, 244, 252);
+ }
+ #workspaces {
+ padding-left: 0px;
+ padding-right: 4px;
+ }
+ #workspaces button {
+ padding-top: 5px;
+ padding-bottom: 5px;
+ padding-left: 6px;
+ padding-right: 6px;
+ color:#99CCFF;
+ }
+ #workspaces button.active {
+ background-color: rgb(181, 232, 224);
+ color: rgb(26, 24, 38);
+ }
+ #workspaces button.urgent {
+ color: rgb(26, 24, 38);
+ }
+ #workspaces button:hover {
+ background-color: #CCCCFF;
+ color: rgb(26, 24, 38);
+ }
+ tooltip {
+ /* background: rgb(250, 244, 252); */
+ background: rgb(250, 244, 252);
+ }
+ tooltip label {
+ color: rgb(65, 72, 104);
+ }
+ #mode, #clock, #memory, #temperature,#cpu,#mpd, #custom-wall, #temperature, #backlight, #pulseaudio, #network, #battery, #custom-powermenu, #custom-cava-internal {
+ padding-left: 10px;
+ padding-right: 10px;
+ }
+ /* #mode { */
+ /* margin-left: 10px; */
+ /* background-color: rgb(248, 189, 150); */
+ /* color: rgb(26, 24, 38); */
+ /* } */
+ #memory {
+ color: #66CCFF;
+ }
+ #cpu {
+ color: #FF99FF;
+ }
+ #clock {
+ color: rgb(65, 72, 104);
+ }
+ /*
+ #idle_inhibitor {
+ color: #FF6699;
+ }*/
+ #custom-wall {
+ color: #FF6699;
+ }
+ #temperature {
+ color: #9933FF;
+ }
+ #backlight {
+ color: #6666FF;
+ }
+ #pulseaudio {
+ color: #FF9900;
+ }
+ #network {
+ color: #00CC66;
+ }
+
+ #network.disconnected {
+ color: #99CCCC;
+ }
+ #battery.charging, #battery.full, #battery.discharging {
+ color: #FF99CC;
+ }
+ #battery.critical:not(.charging) {
+ color: rgb(242, 143, 173);
+ }
+ #custom-powermenu {
+ color: #FF0066;
+ }
+ #tray {
+ padding-right: 8px;
+ padding-left: 10px;
+ }
+ #tray menu {
+ background: rgb(250, 244, 252);
+ color:rgb(192, 202, 245);
+ }
+ #mpd.paused {
+ color: rgb(192, 202, 245);
+ font-style: italic;
+ }
+ #mpd.stopped {
+ background: transparent;
+ }
+ #mpd {
+ color: rgb(65, 72, 104);
+
+ /* color: #c0caf5; */
+ }
+ #custom-cava-internal{
+ font-family: "Hack Nerd Font" ;
+ }
+ '';
+ };
+ home.file = {
+ ".config/waybar/nord_config".text = ''
+ [
+ {
+ "backlight": {
+ "device": "intel_backlight",
+ "format": "{icon} {percent}%",
+ "format-icons": [
+ "", "", "", ""
+ ],
+ "on-scroll-down": "light -U 5",
+ "on-scroll-up": "light -A 5"
+ },
+ "battery": {
+ "format": "{icon} {capacity}%",
+ "format-charging": " {capacity}%",
+ "format-full": "{icon} {capacity}%",
+ "format-icons": [
+ "", "", "", "", "", "", "", "", "", ""
+ ],
+ "interval": 10,
+ "states": {
+ "critical": 10,
+ "warning": 20
+ },
+ "tooltip": false
+ },
+ "clock": {
+ "format": "{:%I:%M %p %A %b %d}",
+ "interval": 1,
+ "tooltip": true,
+ "tooltip-format": "上午：高数\n下午：Ps\n晚上：Golang\n{calendar}"
+ },
+ "cpu": {
+ "format": " {usage}%",
+ "interval": 1
+ },
+ "custom/cava-internal": {
+ "exec": "sleep 1s && cava-internal",
+ "tooltip": false
+ },
+ "custom/powermenu": {
+ "format": "",
+ "on-click": "pkill rofi || ~/.config/rofi/powermenu.sh",
+ "tooltip": false
+ },
+ "idle_inhibitor": {
+ "format": "{icon}",
+ "format-icons": {
+ "activated": "",
+ "deactivated": ""
+ },
+ "tooltip": false
+ },
+ "layer": "top",
+ "memory": {
+ "format": " {percentage}%",
+ "interval": 1,
+ "states": {
+ "warning": 85
+ }
+ },
+ "modules-center": [
+ "clock"
+ ],
+ "modules-left": [
+ "hyprland/workspaces",
+ "temperature",
+ //"idle_inhibitor",
+ "mpd",
+ "custom/cava-internal"
+ ],
+ "modules-right": [
+ "pulseaudio",
+ "backlight",
+ "memory",
+ "cpu",
+ "network",
+ "battery",
+ "custom/powermenu",
+ "tray"
+ ],
+ "mpd": {
+ "format": " {title}",
+ "format-disconnected": "",
+ "format-paused": " {title}",
+ "format-stopped": "",
+ "max-length": 25,
+ "on-click": "mpc --quiet toggle",
+ "on-click-middle": "kitty --class='ncmpcpp' ncmpcpp ",
+ "on-click-right": "mpc update; mpc ls | mpc add",
+ "on-scroll-down": "mpc --quiet next",
+ "on-scroll-up": "mpc --quiet prev",
+ "smooth-scrolling-threshold": 5,
+ "tooltip-format": "{title} - {artist} ({elapsedTime:%M:%S}/{totalTime:%H:%M:%S})"
+ },
+ "network": {
+ "format-disconnected": " Disconnected",
+ "format-ethernet": " {ifname} ({ipaddr})",
+ "format-linked": " {essid} (No IP)",
+ "format-wifi": " {essid}",
+ "interval": 1,
+ "tooltip": false
+ },
+ "position": "top",
+ "pulseaudio": {
+ "format": "{icon} {volume}%",
+ "format-icons": {
+ "default": [
+ "",
+ "",
+ ""
+ ]
+ },
+ "format-muted": " Muted",
+ "on-click": "pamixer -t",
+ "scroll-step": 1,
+ "tooltip": false
+ },
+ "temperature": {
+ "format": " {temperatureC}°C",
+ "tooltip": false
+ },
+ "tray": {
+ "icon-size": 15,
+ "spacing": 5
+ },
+ "hyprland/workspaces": {
+ "format": "{icon}",
+ "on-click": "activate",
+ "active-only": false,
+ }
+ }
+ ]
+
+ '';
+ ".config/waybar/nord_style.css".text = ''
+ * {
+ font-family: "JetBrainsMono Nerd Font";
+ font-size: 12pt;
+ font-weight: bold;
+ border-radius: 0px;
+ transition-property: background-color;
+ transition-duration: 0.5s;
+ }
+ @keyframes blink_red {
+ to {
+ background-color: rgb(242, 143, 173);
+ color: rgb(26, 24, 38);
+ }
+ }
+ .warning, .critical, .urgent {
+ animation-name: blink_red;
+ animation-duration: 1s;
+ animation-timing-function: linear;
+ animation-iteration-count: infinite;
+ animation-direction: alternate;
+ }
+ window#waybar {
+ background-color: transparent;
+ }
+ window > box {
+ margin-left: 5px;
+ margin-right: 5px;
+ margin-top: 5px;
+ background-color: #3b4252;
+ }
+ #workspaces {
+ padding-left: 0px;
+ padding-right: 4px;
+ }
+ #workspaces button {
+ padding-top: 5px;
+ padding-bottom: 5px;
+ padding-left: 6px;
+ padding-right: 6px;
+ color:#D8DEE9;
+ }
+ #workspaces button.active {
+ background-color: rgb(181, 232, 224);
+ color: rgb(26, 24, 38);
+ }
+ #workspaces button.urgent {
+ color: rgb(26, 24, 38);
+ }
+ #workspaces button:hover {
+ background-color: #B38DAC;
+ color: rgb(26, 24, 38);
+ }
+ tooltip {
+ /* background: rgb(250, 244, 252); */
+ background: #3b4253;
+ }
+ tooltip label {
+ color: #E4E8EF;
+ }
+ #mode, #clock, #memory, #temperature,#cpu,#mpd, #custom-wall, #temperature, #backlight, #pulseaudio, #network, #battery, #custom-powermenu, #custom-cava-internal {
+ padding-left: 10px;
+ padding-right: 10px;
+ }
+ /* #mode { */
+ /* margin-left: 10px; */
+ /* background-color: rgb(248, 189, 150); */
+ /* color: rgb(26, 24, 38); */
+ /* } */
+ #memory {
+ color: #8EBBBA;
+ }
+ #cpu {
+ color: #B38DAC;
+ }
+ #clock {
+ color: #E4E8EF;
+ }
+ /*
+ #idle_inhibitor {
+ color: #FF6699;
+ }*/
+ #custom-wall {
+ color: #B38DAC;
+ }
+ #temperature {
+ color: #80A0C0;
+ }
+ #backlight {
+ color: #A2BD8B;
+ }
+ #pulseaudio {
+ color: #E9C98A;
+ }
+ #network {
+ color: #99CC99;
+ }
+
+ #network.disconnected {
+ color: #CCCCCC;
+ }
+ #battery.charging, #battery.full, #battery.discharging {
+ color: #CF876F;
+ }
+ #battery.critical:not(.charging) {
+ color: #D6DCE7;
+ }
+ #custom-powermenu {
+ color: #BD6069;
+ }
+ #tray {
+ padding-right: 8px;
+ padding-left: 10px;
+ }
+ #tray menu {
+ background: #3b4252;
+ color: #DEE2EA;
+ }
+ #mpd.paused {
+ color: rgb(192, 202, 245);
+ font-style: italic;
+ }
+ #mpd.stopped {
+ background: transparent;
+ }
+ #mpd {
+ color: #E4E8EF;
+
+ /* color: #c0caf5; */
+ }
+ #custom-cava-internal{
+ font-family: "Hack Nerd Font" ;
+ }
+ '';
+ };
}
+
diff --git a/modules/home/waybar/old/default.nix b/modules/home/waybar/old/default.nix
new file mode 100644
index 0000000..9b8b240
--- /dev/null
+++ b/modules/home/waybar/old/default.nix
@@ -0,0 +1,6 @@
+{ ... }:
+{
+ imports = [ (import ./waybar.nix) ]
+ ++ [ (import ./settings.nix) ]
+ ++ [ (import ./style.nix) ];
+}
diff --git a/modules/home/waybar/old/settings.nix b/modules/home/waybar/old/settings.nix
new file mode 100644
index 0000000..256017e
--- /dev/null
+++ b/modules/home/waybar/old/settings.nix
@@ -0,0 +1,118 @@
+{ ... }:
+{
+ programs.waybar.settings.mainBar = {
+ position= "top";
+ layer= "top";
+ height= 5;
+ margin-top= 0;
+ margin-bottom= 0;
+ margin-left= 0;
+ margin-right= 0;
+ modules-left= [
+ # "custom/launcher"
+ "hyprland/workspaces"
+ ];
+ modules-center= [
+ "clock"
+ ];
+ modules-right= [
+ # "cpu"
+ # "memory"
+ # "disk"
+ "pulseaudio"
+ "battery"
+ #"network"
+ "tray"
+ ];
+ clock= {
+ calendar = {
+ format = { today = "{}"; };
+ };
+ format = " {:%H:%M}";
+ tooltip= "true";
+ tooltip-format= "{:%Y %B}\n{calendar}";
+ format-alt= " {:%d/%m}";
+ };
+ "hyprland/workspaces"= {
+ active-only= false;
+ disable-scroll= true;
+ format = "{icon}";
+ on-click= "activate";
+ format-icons= {
+ "1"= "1";
+ "2"= "2";
+ "3"= "3";
+ "4"= "4";
+ "5"= "5";
+ "6"= "6";
+ "7"= "7";
+ "8"= "8";
+ "9"= "9";
+ "10"= "10";
+ urgent= "";
+ default = "";
+ sort-by-number= true;
+ };
+ # persistent-workspaces = {
+ # "1"= [];
+ # "2"= [];
+ # "3"= [];
+ # };
+ };
+ memory= {
+ format= " {}%";
+ format-alt= " {used} GiB"; #
+ interval= 2;
+ };
+ cpu= {
+ format= " {usage}%";
+ format-alt= " {avg_frequency} GHz";
+ interval= 2;
+ };
+ disk = {
+ # path = "/";
+ format = " {percentage_used}%";
+ interval= 60;
+ };
+ network = {
+ format-wifi = " {signalStrength}%";
+ format-ethernet = " ";
+ tooltip-format = "Connected to {essid} {ifname} via {gwaddr}";
+ format-linked = "{ifname} (No IP)";
+ format-disconnected = " ";
+ };
+ tray= {
+ icon-size= 20;
+ spacing = 2; # was 8 originally
+ };
+ pulseaudio= {
+ format= "{icon} {volume}%";
+ format-muted= " {volume}%";
+ format-icons= {
+ default= [" "];
+ };
+ scroll-step= 5;
+ on-click= "pamixer -t";
+ };
+ battery = {
+ format = "{icon} {capacity}%";
+ format-icons = [" " " " " " " " " "];
+ format-charging = " {capacity}%";
+ format-full = " {capacity}%";
+ format-warning = " {capacity}%";
+ interval = 5;
+ states = {
+ warning = 20;
+ };
+ format-time = "{H}h{M}m";
+ tooltip = true;
+ tooltip-format = "{time}";
+ };
+ "custom/launcher"= {
+ format= "";
+ on-click= "pkill wofi || wofi --show drun";
+ on-click-right= "pkill wofi || wallpaper-picker";
+ tooltip= "false";
+ };
+ };
+}
diff --git a/modules/home/waybar/old/style.nix b/modules/home/waybar/old/style.nix
new file mode 100644
index 0000000..9e36dea
--- /dev/null
+++ b/modules/home/waybar/old/style.nix
@@ -0,0 +1,99 @@
+{ ... }:
+let custom = {
+ font = "JetBrainsMono Nerd Font";
+ font_size = "10px";
+ font_weight = "bold";
+ text_color = "#cdd6f4";
+ secondary_accent= "89b4fa";
+ tertiary_accent = "f5f5f5";
+ background = "11111B";
+ opacity = "0.98";
+};
+in
+{
+ programs.waybar.style = ''
+
+ * {
+ border: none;
+ border-radius: 0px;
+ padding: 0;
+ margin: 0;
+ min-height: 0px;
+ font-family: ${custom.font};
+ font-weight: ${custom.font_weight};
+ opacity: ${custom.opacity};
+ }
+
+ window#waybar {
+ background: none;
+ }
+
+ #workspaces {
+ font-size: 10px;
+ padding-left: 15px;
+
+ }
+ #workspaces button {
+ color: ${custom.text_color};
+ padding-left: 6px;
+ padding-right: 6px;
+ }
+ #workspaces button.empty {
+ color: #6c7086;
+ }
+ #workspaces button.active {
+ color: #b4befe;
+ }
+
+ #tray, #pulseaudio, #network, #cpu, #memory, #disk, #clock, #battery {
+ font-size: ${custom.font_size};
+ color: ${custom.text_color};
+ }
+
+ #cpu {
+ padding-left: 15px;
+ padding-right: 9px;
+ margin-left: 7px;
+ }
+ #memory {
+ padding-left: 9px;
+ padding-right: 9px;
+ }
+ #disk {
+ padding-left: 9px;
+ padding-right: 15px;
+ }
+
+ #tray {
+ padding: 0 20px;
+ margin-left: 7px;
+ }
+
+ #pulseaudio {
+ padding-left: 15px;
+ padding-right: 9px;
+ margin-left: 7px;
+ }
+ #battery {
+ padding-left: 9px;
+ padding-right: 9px;
+ }
+ #network {
+ padding-left: 9px;
+ padding-right: 15px;
+ }
+
+ #clock {
+ padding-left: 9px;
+ padding-right: 15px;
+ }
+
+ #custom-launcher {
+ font-size: 20px;
+ color: #b4befe;
+ font-weight: ${custom.font_weight};
+ padding-left: 10px;
+ padding-right: 15px;
+ }
+ '';
+}
diff --git a/modules/home/waybar/old/waybar.nix b/modules/home/waybar/old/waybar.nix
new file mode 100644
index 0000000..c50e873
--- /dev/null
+++ b/modules/home/waybar/old/waybar.nix
@@ -0,0 +1,9 @@
+{ pkgs, ... }:
+{
+ programs.waybar = {
+ enable = true;
+ };
+ programs.waybar.package = pkgs.waybar.overrideAttrs (oa: {
+ mesonFlags = (oa.mesonFlags or [ ]) ++ [ "-Dexperimental=true" ];
+ });
+}