diff --git a/homes/aarch64-darwin/yadunut@yadunut-mbp/default.nix b/homes/aarch64-darwin/yadunut@yadunut-mbp/default.nix
index d5952be..3fc8f0e 100644
--- a/homes/aarch64-darwin/yadunut@yadunut-mbp/default.nix
+++ b/homes/aarch64-darwin/yadunut@yadunut-mbp/default.nix
@@ -5,6 +5,20 @@
   ...
 }:
 {
+
+  nix = {
+    package = pkgs.nix;
+    settings = {
+      substituters = [
+        "https://nix-community.cachix.org"
+        "https://cache.nixos.org"
+      ];
+      trusted-public-keys = [
+        "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
+        "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
+      ];
+    };
+  };
   home.packages = [
     # pkgs.dive
     pkgs.entr
@@ -13,6 +27,8 @@
     pkgs.rsync
     pkgs.claude-code
     pkgs.dive
+    pkgs.cachix
+    pkgs.ouch
   ];
 
   home.sessionVariables = {
@@ -27,7 +43,7 @@
   ];
 
   zsh.enable = true;
-  nushell.enable = false;
+  nushell.enable = true;
   neovim.enable = true;
   git = {
     enable = true;
diff --git a/homes/x86_64-linux/yadunut@penguin/default.nix b/homes/x86_64-linux/yadunut@penguin/default.nix
index ef38a92..47eaa71 100644
--- a/homes/x86_64-linux/yadunut@penguin/default.nix
+++ b/homes/x86_64-linux/yadunut@penguin/default.nix
@@ -14,6 +14,7 @@
     signingKey = "~/.ssh/id_ed25519.pub";
   };
   zsh.enable = true;
+  nushell.enable = true;
   neovim.enable = true;
 
   services = {
diff --git a/modules/home/git/default.nix b/modules/home/git/default.nix
index 37d3f54..f7a297e 100644
--- a/modules/home/git/default.nix
+++ b/modules/home/git/default.nix
@@ -35,6 +35,11 @@ in
 
     programs.zsh.shellAliases = {
       lg = "lazygit";
+      js = "jj status";
+      jd = "jj diff";
+      jn = "jj new";
+      jf = "jj git fetch";
+      jp = "jj git push";
     };
     programs.git = {
       ignores = [
diff --git a/modules/home/nushell/default.nix b/modules/home/nushell/default.nix
index 93caf8c..0c4bc92 100644
--- a/modules/home/nushell/default.nix
+++ b/modules/home/nushell/default.nix
@@ -18,6 +18,11 @@ in
     programs = {
       nushell = {
         enable = true;
+        configFile.text = ''
+          $env.config.edit_mode = "vi"
+          $env.config.buffer_editor = "nvim"
+          $env.config.show_banner = false
+          '';
       };
       nix-your-shell = {
         enable = true;
@@ -33,12 +38,12 @@ in
       };
       eza = {
         enable = true;
-        enableNushellIntegration = true;
+        enableNushellIntegration = false;
         extraOptions = [ "--group-directories-first" ];
       };
       starship = {
         enable = true;
-        enableNushellIntegration = false;
+        enableNushellIntegration = true;
         settings = {
           nodejs.disabled = true;
           package.disabled = true;
@@ -48,7 +53,7 @@ in
       };
 
       zoxide = {
-        enableNushellIntegration = false;
+        enableNushellIntegration = true;
       };
     };
   };