From 97fdb7632811db027246a60d8ca6cf5c627ebfb6 Mon Sep 17 00:00:00 2001
From: Noah Masur <7386960+nmasur@users.noreply.github.com>
Date: Sat, 8 Mar 2025 19:13:42 -0500
Subject: [PATCH] fixes to zoxide

---
 .../home-manager/modules/nmasur/presets/programs/zoxide.nix | 6 ++++++
 .../home-manager/modules/nmasur/profiles/power-user.nix     | 2 +-
 platforms/home-manager/modules/nmasur/profiles/work.nix     | 1 +
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/platforms/home-manager/modules/nmasur/presets/programs/zoxide.nix b/platforms/home-manager/modules/nmasur/presets/programs/zoxide.nix
index b6cff0d..a5faff0 100644
--- a/platforms/home-manager/modules/nmasur/presets/programs/zoxide.nix
+++ b/platforms/home-manager/modules/nmasur/presets/programs/zoxide.nix
@@ -18,6 +18,12 @@ in
       enable = true;
       enableFishIntegration = true;
       enableBashIntegration = true;
+      options = [ "--no-cmd" ]; # Disables key mapping
+    };
+
+    programs.fish.shellAliases = {
+      cd = "__zoxide_z";
+      cdi = "__zoxide_zi";
     };
 
   };
diff --git a/platforms/home-manager/modules/nmasur/profiles/power-user.nix b/platforms/home-manager/modules/nmasur/profiles/power-user.nix
index 0aa35c3..49552bd 100644
--- a/platforms/home-manager/modules/nmasur/profiles/power-user.nix
+++ b/platforms/home-manager/modules/nmasur/profiles/power-user.nix
@@ -37,7 +37,6 @@ in
     ];
 
     programs.fish.shellAliases = {
-      "cd" = lib.mkDefault (lib.getExe pkgs.zoxide);
       "du" = lib.mkDefault (lib.getExe pkgs.dua);
       "ncdu" = lib.mkDefault (lib.getExe pkgs.du-dust);
       "df" = lib.mkDefault (lib.getExe pkgs.duf);
@@ -57,6 +56,7 @@ in
       fd.enable = lib.mkDefault true;
       fish.enable = lib.mkDefault true;
       fzf.enable = lib.mkDefault true;
+      git.enable = lib.mkDefault true;
       nix-index.enable = lib.mkDefault true;
       nixpkgs.enable = lib.mkDefault true;
       prettyping.enable = lib.mkDefault true;
diff --git a/platforms/home-manager/modules/nmasur/profiles/work.nix b/platforms/home-manager/modules/nmasur/profiles/work.nix
index cb89682..f1eb697 100644
--- a/platforms/home-manager/modules/nmasur/profiles/work.nix
+++ b/platforms/home-manager/modules/nmasur/profiles/work.nix
@@ -40,6 +40,7 @@ in
     ];
 
     nmasur.presets = {
+      fonts.enable = lib.mkDefault true;
       programs = {
         _1password.enable = lib.mkDefault true;
         atuin.enable = lib.mkDefault true;