diff --git a/hand7s/programs/nushell.nix b/hand7s/programs/nushell.nix
index 296a012..d6c06b1 100644
--- a/hand7s/programs/nushell.nix
+++ b/hand7s/programs/nushell.nix
@@ -1,4 +1,5 @@
 {
+  config,
   pkgs,
   lib,
   ...
@@ -6,17 +7,42 @@
   programs = {
     nushell = {
       enable = true;
+      settings = {
+        show_banner = false;
+        edit_mode = "vi";
+        cursor_shape = {
+          vi_insert = "block";
+          vi_normal = "underscore";
+        };
+
+        completions = {
+          external = {
+            enable = true;
+            max_results = 200;
+          };
+        };
+      };
+
       extraEnv = ''
         $env.EDITOR = "hx"
+        $env.config.buffer_editor = "hx"
+
+        $env.PROMPT_INDICATOR_VI_INSERT = {|| "" }
+        $env.PROMPT_INDICATOR_VI_NORMAL = {|| "" }
+
+        $env.CARAPACE_BRIDGES = "fish,inshellisense"
+        $env.CARAPACE_MATCH = "2"
+        $env.CARAPACE_LENIENT = "1"
+        $env.CARAPACE_HIDDEN = "1"
       '';
 
       extraConfig = ''
-        $env.config.show_banner = false
-
-        $env.config.buffer_editor = "hx"
+        if $nu.is-interactive {
+          ^${lib.getExe pkgs.microfetch}
+        }
 
         def fish-run [cmd: string] {
-            ^${lib.getExe pkgs.fish} -c $cmd
+            ^${lib.getExe config.programs.fish.package} -c $cmd
         }
       '';
     };