diff --git a/home/baseline/nushell.nix b/home/baseline/nushell.nix
index 5bf9fe4..4c65708 100644
--- a/home/baseline/nushell.nix
+++ b/home/baseline/nushell.nix
@@ -9,6 +9,10 @@
       enable = true;
       enableNushellIntegration = true;
     };
+    direnv = {
+      enable = true;
+      enableNushellIntegration = true;
+    };
     nushell = {
       enable = true;
       environmentVariables = {
@@ -17,7 +21,7 @@
         GOBIN = "${config.home.homeDirectory}/src/bin";
         LIBMYSQL_ENABLE_CLEARTEXT_PLUGIN = "1";
         SWORD_PATH = "${config.home.homeDirectory}/.sword/";
-        TIMEFORMAT = "%3Uu %3Ss %3lR %P%%";
+        #TIMEFORMAT = "%3Uu %3Ss %3lR %P%%";
         VIRTUALENV_HOME = "${config.home.homeDirectory}/venv/";
       };
       extraConfig = ''
diff --git a/home/baseline/xonsh.nix b/home/baseline/xonsh.nix
index dd15ea8..86960f1 100644
--- a/home/baseline/xonsh.nix
+++ b/home/baseline/xonsh.nix
@@ -40,7 +40,7 @@
         OS_CLOUD = "default";
         PROMPT = "{vte_new_tab_cwd}{env_name}{BOLD_GREEN}{user}@{hostname}{BOLD_BLUE} {short_cwd}{branch_color}{curr_branch: {}}{RESET} {BOLD_BLUE}{prompt_end}{RESET} ";
         SWORD_PATH = "${config.home.homeDirectory}/.sword/";
-        TIMEFORMAT = "%3Uu %3Ss %3lR %P%%";
+        #TIMEFORMAT = "%3Uu %3Ss %3lR %P%%";
         # Tells vox where to find virtualenvs
         VIRTUALENV_HOME = "${config.home.homeDirectory}/venv/";
         XONSH_COLOR_STYLE = "default";
diff --git a/home/home.nix b/home/home.nix
index 1125e3a..3d82e55 100644
--- a/home/home.nix
+++ b/home/home.nix
@@ -50,11 +50,33 @@ in
     stateVersion = "25.05";
   };
 
-  programs.tmux = {
-    enable = true;
-    keyMode = "vi";
-    terminal = "xterm-256color";
-    customPaneNavigationAndResize = true;
-    extraConfig = (lib.strings.concatStringsSep "\n" [ "bind P paste-buffer" ]);
+  programs = {
+    broot = {
+      enable = true;
+      enableNushellIntegration = true;
+      enableZshIntegration = pkgs.stdenv.hostPlatform.isDarwin;
+    };
+    keychain = {
+      enable = true;
+      enableNushellIntegration = true;
+      enableZshIntegration = pkgs.stdenv.hostPlatform.isDarwin;
+      keys = [
+        "id_rsa"
+        "id_ed25519"
+        "personal_ed25519"
+      ];
+    };
+    tmux = {
+      enable = true;
+      keyMode = "vi";
+      terminal = "xterm-256color";
+      customPaneNavigationAndResize = true;
+      extraConfig = (lib.strings.concatStringsSep "\n" [ "bind P paste-buffer" ]);
+    };
+    yazi = {
+      enable = true;
+      enableNushellIntegration = true;
+      enableZshIntegration = pkgs.stdenv.hostPlatform.isDarwin;
+    };
   };
 }