platforms/home-manager/modules/nmasur/presets/programs/firefox.nix

@@ -23,7 +23,7 @@ in
 
     programs.firefox = {
       enable = true;
-      package = pkgs.firefox;
+      package = if pkgs.stdenv.isDarwin then pkgs.firefox-unwrapped else pkgs.firefox;
       profiles.default = {
         id = 0;
         name = "default";

platforms/home-manager/modules/nmasur/presets/programs/helix.nix

@@ -137,9 +137,6 @@ in
 
         keys.normal = {
 
-          # Use the enter key to save the file
-          ret = ":write";
-
           # Get out of multiple cursors and selection
           esc = [
             "collapse_selection"

platforms/home-manager/modules/nmasur/presets/programs/zellij.nix

@@ -127,29 +127,15 @@ in
             "bind \"Ctrl Shift Tab\"" = {
               GoToPreviousTab = { };
             };
-            "bind \"Super t\"" = lib.mkIf pkgs.stdenv.isDarwin {
+            "bind \"Super t\"" = {
               NewTab = { };
             };
-            "bind \"Alt t\"" = lib.mkIf pkgs.stdenv.isLinux {
+            "bind \"Super k\"" = {
-              NewTab = { };
-            };
-            "bind \"Super k\"" = lib.mkIf pkgs.stdenv.isDarwin {
               SwitchToMode = {
                 _args = [ "scroll" ];
               };
             };
-            "bind \"Alt k\"" = lib.mkIf pkgs.stdenv.isLinux {
+            "bind \"Super Shift e\"" = {
-              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" ];

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
-      nmasur.volnoti # Volume notifications
+      volnoti # Volume notifications
     ];
   };
 }

platforms/nixos/modules/nmasur/profiles/gui.nix

@@ -19,7 +19,6 @@ 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;