diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/desktop/waybar/bar/main.nix | 2 | ||||
| -rw-r--r-- | modules/desktop/waybar/module/default.nix | 17 |
2 files changed, 9 insertions, 10 deletions
diff --git a/modules/desktop/waybar/bar/main.nix b/modules/desktop/waybar/bar/main.nix index a52c49b..ce8ec52 100644 --- a/modules/desktop/waybar/bar/main.nix +++ b/modules/desktop/waybar/bar/main.nix @@ -15,9 +15,9 @@ with config.scheme.withHashtag; "battery" "custom/vpn" "network" - "clock#time" "memory" "cpu" + "clock#time" "clock#date" ]; } diff --git a/modules/desktop/waybar/module/default.nix b/modules/desktop/waybar/module/default.nix index 016ebd2..ebfa2c4 100644 --- a/modules/desktop/waybar/module/default.nix +++ b/modules/desktop/waybar/module/default.nix @@ -3,16 +3,18 @@ lib, pkgs, }: -with config.scheme.withHashtag; let inherit (import ../lib.nix { inherit lib; }) mkIcon; in { mainBar = { - "hyprland/workspaces" = import ./workspaces.nix { inherit config lib; }; - "hyprland/window" = import ./window.nix { inherit config; }; - "pulseaudio" = import ./volume.nix { inherit config mkIcon; }; "battery" = import ./battery.nix { inherit config mkIcon; }; + "cpu" = import ./cpu.nix { inherit config mkIcon; }; + "clock#date" = import ./date.nix { inherit config mkIcon; }; + "memory" = import ./memory.nix { inherit config mkIcon; }; + "network" = import ./network.nix { inherit config mkIcon; }; + "clock#time" = import ./time.nix { inherit config mkIcon; }; + "pulseaudio" = import ./volume.nix { inherit config mkIcon; }; "custom/vpn" = import ./vpn.nix { inherit config @@ -21,10 +23,7 @@ in mkIcon ; }; - "network" = import ./network.nix { inherit config mkIcon; }; - "clock#time" = import ./time.nix { inherit config mkIcon; }; - "memory" = import ./memory.nix { inherit config mkIcon; }; - "cpu" = import ./cpu.nix { inherit config mkIcon; }; - "clock#date" = import ./date.nix { inherit config mkIcon; }; + "hyprland/window" = import ./window.nix { inherit config; }; + "hyprland/workspaces" = import ./workspaces.nix { inherit config lib; }; }; } |