From d59692c8138b8bf2c20c828aace1eaf74ee213b1 Mon Sep 17 00:00:00 2001
From: Noah Masur <7386960+nmasur@users.noreply.github.com>
Date: Wed, 7 May 2025 08:47:45 -0400
Subject: [PATCH] fix pipewire and zellij on linux

---
 .../nmasur/presets/programs/zellij.nix        | 20 ++++++++++++++++---
 .../nmasur/presets/services/pipewire.nix      |  2 +-
 .../nixos/modules/nmasur/profiles/gui.nix     |  1 +
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/platforms/home-manager/modules/nmasur/presets/programs/zellij.nix b/platforms/home-manager/modules/nmasur/presets/programs/zellij.nix
index 5c20fda..034b74d 100644
--- a/platforms/home-manager/modules/nmasur/presets/programs/zellij.nix
+++ b/platforms/home-manager/modules/nmasur/presets/programs/zellij.nix
@@ -127,15 +127,29 @@ in
             "bind \"Ctrl Shift Tab\"" = {
               GoToPreviousTab = { };
             };
-            "bind \"Super t\"" = {
+            "bind \"Super t\"" = lib.mkIf pkgs.stdenv.isDarwin {
               NewTab = { };
             };
-            "bind \"Super k\"" = {
+            "bind \"Alt t\"" = lib.mkIf pkgs.stdenv.isLinux {
+              NewTab = { };
+            };
+            "bind \"Super k\"" = lib.mkIf pkgs.stdenv.isDarwin {
               SwitchToMode = {
                 _args = [ "scroll" ];
               };
             };
-            "bind \"Super Shift e\"" = {
+            "bind \"Alt k\"" = lib.mkIf pkgs.stdenv.isLinux {
+              SwitchToMode = {
+                _args = [ "scroll" ];
+              };
+            };
+            "bind \"Super Shift e\"" = lib.mkIf pkgs.stdenv.isDarwin {
+              EditScrollback = { };
+              SwitchToMode = {
+                _args = [ "locked" ];
+              };
+            };
+            "bind \"Alt Shift e\"" = lib.mkIf pkgs.stdenv.isLinux {
               EditScrollback = { };
               SwitchToMode = {
                 _args = [ "locked" ];
diff --git a/platforms/nixos/modules/nmasur/presets/services/pipewire.nix b/platforms/nixos/modules/nmasur/presets/services/pipewire.nix
index 8c8719b..18ecfa7 100644
--- a/platforms/nixos/modules/nmasur/presets/services/pipewire.nix
+++ b/platforms/nixos/modules/nmasur/presets/services/pipewire.nix
@@ -27,7 +27,7 @@ in
     # These aren't necessary, but helpful for the user
     environment.systemPackages = with pkgs; [
       pamixer # Audio control
-      volnoti # Volume notifications
+      nmasur.volnoti # Volume notifications
     ];
   };
 }
diff --git a/platforms/nixos/modules/nmasur/profiles/gui.nix b/platforms/nixos/modules/nmasur/profiles/gui.nix
index 5bd4137..ed296af 100644
--- a/platforms/nixos/modules/nmasur/profiles/gui.nix
+++ b/platforms/nixos/modules/nmasur/profiles/gui.nix
@@ -19,6 +19,7 @@ in
     nmasur.presets.services.kanata.enable = lib.mkDefault true;
     nmasur.presets.services.lightdm.enable = lib.mkDefault true;
     nmasur.presets.programs.nautilus.enable = lib.mkDefault true;
+    nmasur.presets.services.pipewire.enable = lib.mkDefault true;
 
     # Mouse customization
     services.ratbagd.enable = lib.mkDefault true;