diff --git a/src/apps/personal/cat.nix b/src/apps/personal/cat.nix
index c3f544f..3d8ee18 100644
--- a/src/apps/personal/cat.nix
+++ b/src/apps/personal/cat.nix
@@ -4,6 +4,6 @@
   ];
 
   home.shellAliases = {
-    cat = "${pkgs.bat}/bin/bat $@";
+    cat = "${pkgs.bat}/bin/bat --wrap never --pager \"less -+S\"";
   };
 }
diff --git a/src/apps/personal/ls.nix b/src/apps/personal/ls.nix
index 13204e3..4167b71 100644
--- a/src/apps/personal/ls.nix
+++ b/src/apps/personal/ls.nix
@@ -3,7 +3,9 @@
     pkgs.exa
   ];
 
-  home.shellAliases = {
-    ls = "${pkgs.exa}/bin/exa --icons -lghF --git --group-directories-first --color always $@ | less --quit-if-one-screen";
-  };
+  programs.zsh.initExtra = ''
+    function ls {
+      ${pkgs.exa}/bin/exa --icons -lghF --git --group-directories-first "$@" --color=always | less --quit-if-one-screen
+    }
+  '';
 }