diff --git a/config/nix/Makefile b/config/nix/Makefile
index f2ae2981..87f6fa92 100644
--- a/config/nix/Makefile
+++ b/config/nix/Makefile
@@ -1,6 +1,5 @@
 .PHONY: run build
 switch:
+	nix run home-manager/master switch --flake ~/.local/share/dotfiles/config/nix
+init:
 	nix run home-manager/master -- init --switch ~/.local/share/dotfiles/config/nix
-
-build:
-	nix run home-manager/master -- init ~/.local/share/dotfiles/config/nix
diff --git a/config/nix/home.nix b/config/nix/home.nix
index 5cddc25a..b03a973d 100644
--- a/config/nix/home.nix
+++ b/config/nix/home.nix
@@ -1,5 +1,5 @@
 { config, pkgs, ... }:
-
+# https://mipmip.github.io/home-manager-option-search/
 {
   # Home Manager needs a bit of information about you and the paths it should
   # manage.
@@ -26,11 +26,18 @@
         ls = "exa";
       };
       interactiveShellInit = ''
-        # Add the following line to your ~/.config/fish/config.fish to enable
-        # Home Manager's Fish integration.
-        # source ${config.home.homeDirectory}/.nix-profile/share/hm-session-vars/hm-session-vars.fish
         set fish_greeting
-        # macchina
+        ${pkgs.macchina.outPath}/bin/macchina
+      '';
+    };
+    nushell = {
+      enable = true;
+      shellAliases = {
+        "cd" = "z";
+      };
+      package = pkgs.nushellFull;
+      configFile.text = ''
+        show_banner: false,
       '';
     };
     zoxide = {
@@ -54,18 +61,11 @@
       enableFishIntegration = true;
       enableNushellIntegration = true;
     };
-    nushell = {
-      enable = true;
-      package = pkgs.nushellFull;
-      shellAliases = {
-        "cd" = "z";
-      };
-    };
     fzf = {
         enable = true;
         package = pkgs.fzf;
         enableFishIntegration = true;
-        enableShellIntegration = true;
+        tmux.enableShellIntegration = true;
     };
     keychain = {
       enable = true;
@@ -73,7 +73,11 @@
       enableFishIntegration = true;
       enableNushellIntegration = true;
     };
-
+    yazi = {
+        enable = true;
+        enableFishIntegration = true;
+        enableNushellIntegration = true;
+    };
 
   };
 
@@ -112,6 +116,7 @@
 
   home.sessionVariables = {
     EDITOR = "nvim";
+    SHELL = "${pkgs.fish.outPath}/bin/fish";
   };
 
   # Let Home Manager install and manage itself.
diff --git a/config/nix/tmux.nix b/config/nix/tmux.nix
index b54a42a3..9e86078f 100644
--- a/config/nix/tmux.nix
+++ b/config/nix/tmux.nix
@@ -49,7 +49,6 @@ in
       bind j select-pane -D
       bind k select-pane -U
       bind l select-pane -R
-      bind h set status
       set -g allow-passthrough on
       set -ga update-environment TERM
       set -ga update-environment TERM_PROGRAM