From 01ed9f886597b7be16a4952534aebbbbaac810b1 Mon Sep 17 00:00:00 2001
From: Arpit Chakladar <arpit@chakladar.me>
Date: Sat, 10 Oct 2026 04:38:01 +0530
Subject: feat(office): migrate calendar module to khal

---
 modules/desktop/icons/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'modules/desktop')

diff --git a/modules/desktop/icons/default.nix b/modules/desktop/icons/default.nix
index d310268..e4f7d7b 100644
--- a/modules/desktop/icons/default.nix
+++ b/modules/desktop/icons/default.nix
@@ -10,6 +10,11 @@ in
 {
   options.desktop.icons = {
     apps = {
+      khal = lib.mkOption {
+        type = lib.types.str;
+        default = "calendar";
+        description = "Icon for khal calendar app";
+      };
       calcurse = lib.mkOption {
         type = lib.types.str;
         default = "calendar";
@@ -164,6 +169,7 @@ in
   config = lib.mkIf cfg.enable {
     desktop.icons = {
       apps = {
+        khal = "calendar";
         calcurse = "calendar";
         git = "git";
         gopass = "password-manager";
-- 
cgit v1.2.3


From efa04e5c3ead00ce288a806ea649f9fd3e4a6ffa Mon Sep 17 00:00:00 2001
From: Arpit Chakladar <arpit@chakladar.me>
Date: Sat, 10 Oct 2026 04:38:07 +0530
Subject: fix(audio): support volume boost controls

---
 modules/desktop/eww/bar/system-stats.lua | 2 +-
 modules/desktop/niri/keybindings.nix     | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'modules/desktop')

diff --git a/modules/desktop/eww/bar/system-stats.lua b/modules/desktop/eww/bar/system-stats.lua
index b651e2d..6085f39 100644
--- a/modules/desktop/eww/bar/system-stats.lua
+++ b/modules/desktop/eww/bar/system-stats.lua
@@ -483,7 +483,7 @@ local function get_sound_state()
   if pout then
     local num = tonumber(pout:match("^(%-?%d+)"))
     if num then
-      percent = math.max(0, math.min(100, num))
+      percent = math.max(0, num)
     end
   end
 
diff --git a/modules/desktop/niri/keybindings.nix b/modules/desktop/niri/keybindings.nix
index de2f144..946bdc0 100644
--- a/modules/desktop/niri/keybindings.nix
+++ b/modules/desktop/niri/keybindings.nix
@@ -140,6 +140,7 @@ in
       _props.allow-when-locked = true;
       spawn = [
         (lib.getExe config.media.pamixer.package)
+        "--allow-boost"
         "--decrease"
         "5"
       ];
@@ -148,6 +149,7 @@ in
       _props.allow-when-locked = true;
       spawn = [
         (lib.getExe config.media.pamixer.package)
+        "--allow-boost"
         "--increase"
         "5"
       ];
-- 
cgit v1.2.3


From fa625f473a4b6cda62ec0f0eb2eb1293ced27573 Mon Sep 17 00:00:00 2001
From: Arpit Chakladar <arpit@chakladar.me>
Date: Sat, 10 Oct 2026 05:01:42 +0530
Subject: fix(desktop/eww): using scroll for volume uses boost

---
 modules/desktop/eww/bar/bar.nix  | 2 ++
 modules/desktop/eww/bar/bar.yuck | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'modules/desktop')

diff --git a/modules/desktop/eww/bar/bar.nix b/modules/desktop/eww/bar/bar.nix
index 3f322e4..009b28c 100644
--- a/modules/desktop/eww/bar/bar.nix
+++ b/modules/desktop/eww/bar/bar.nix
@@ -90,10 +90,12 @@
       in
       builtins.replaceStrings
         [
+          "@@bash@@"
           "@@niri-status-script@@"
           "@@system-stats-script@@"
         ]
         [
+          (lib.getExe config.terminal.bash.package)
           (lib.getExe niri-status)
           (lib.getExe system-stats)
         ]
diff --git a/modules/desktop/eww/bar/bar.yuck b/modules/desktop/eww/bar/bar.yuck
index 66e552f..c2fb09d 100644
--- a/modules/desktop/eww/bar/bar.yuck
+++ b/modules/desktop/eww/bar/bar.yuck
@@ -127,7 +127,7 @@
       (label :class "system-label"
              :text "${system_stats.battery.present ? (system_stats.battery.percent + '%') : '-'}"))
     (eventbox :onclick "pamixer --toggle-mute"
-              :onscroll "bash -c '[ \"{}\" = \"up\" ] && pamixer --increase 5 --unmute || pamixer --decrease 5'"
+              :onscroll "@@bash@@ -c '[ \"{}\" = \"up\" ] && pamixer --allow-boost --increase 5 --unmute || pamixer --allow-boost --decrease 5'"
               :cursor "pointer"
               :halign "fill"
       (box :orientation "v"
-- 
cgit v1.2.3