From 90ad94366f2ace47353d143ab25921a02c9ed729 Mon Sep 17 00:00:00 2001
From: iFargle <albert@sysctl.io>
Date: Mon, 28 Aug 2023 18:13:36 +0900
Subject: [PATCH] Reorder waybar

---
 .../desktops/hyprland/gruvbox/waybar/waybar-conf2.nix     | 8 ++++----
 nixos/common/desktops/hyprland/default.nix                | 1 +
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/home-manager/hosts/nixos-laptop/desktops/hyprland/gruvbox/waybar/waybar-conf2.nix b/home-manager/hosts/nixos-laptop/desktops/hyprland/gruvbox/waybar/waybar-conf2.nix
index b95da577..00665b0f 100644
--- a/home-manager/hosts/nixos-laptop/desktops/hyprland/gruvbox/waybar/waybar-conf2.nix
+++ b/home-manager/hosts/nixos-laptop/desktops/hyprland/gruvbox/waybar/waybar-conf2.nix
@@ -72,7 +72,7 @@
 
             "pulseaudio": {
                 "scroll-step": 1,
-                "format": "{volume}% {icon} {format_source}",
+                "format": "{icon} {format_source}",
                 "format-bluetooth": "{volume}% {icon} {format_source}",
                 "format-bluetooth-muted": "<span foreground='#f2594b'>  {format_source}</span>",
                 "format-muted": "<span foreground='#f2594b'>󰝟</span> {format_source}",
@@ -108,9 +108,9 @@
                     "warning": 35,
                     "critical": 20
                 },
-                "format": "{capacity}% {icon}",
-                "format-charging": "{capacity}% 󰂄",
-                "format-plugged": "{capacity}% ",
+                "format": "{icon} {capacity}%",
+                "format-charging": "󰂄 {capacity}%",
+                "format-plugged": " {capacity}%",
                 "format-icons": ["", "", "", "", ""]
             },
         }
diff --git a/nixos/common/desktops/hyprland/default.nix b/nixos/common/desktops/hyprland/default.nix
index bbb640f5..f09eefe0 100644
--- a/nixos/common/desktops/hyprland/default.nix
+++ b/nixos/common/desktops/hyprland/default.nix
@@ -93,6 +93,7 @@
     pkgs.bitwarden-cli        # Bitwarden for rofi
     pkgs.bitwarden-menu       # Bitwarden for rofi
     pkgs.pulsemixer           # TUI Pipewire  / volume management
+    pkgs.calcurse             # TUI Calendar app
 
     # Themes
     pkgs.gruvbox-gtk-theme    # Gruvbox Theme