diff --git a/users/tao/helix.nix b/users/tao/helix.nix
index 4d11e19..b47e1b3 100644
--- a/users/tao/helix.nix
+++ b/users/tao/helix.nix
@@ -7,6 +7,10 @@
     settings = {
       theme = "gruvbox_dark_hard";
       editor = {
+        end-of-line-diagnostics = "hint";
+        inline-diagnostics = {
+          cursor-line = "warning";
+        };
         auto-save = {
           focus-lost = true;
           after-delay.enable = true;
@@ -34,6 +38,7 @@
         lsp = {
           display-messages = true;
           display-inlay-hints = true;
+          display-progress-messages = true;
         };
         soft-wrap.enable = true;
         smart-tab.supersede-menu = false;
diff --git a/users/tao/nushell/config.nu b/users/tao/nushell/config.nu
index a927529..58b70e7 100644
--- a/users/tao/nushell/config.nu
+++ b/users/tao/nushell/config.nu
@@ -73,73 +73,6 @@ let dark_theme = {
     shape_raw_string: light_purple
 }
 
-let light_theme = {
-    # color for nushell primitives
-    separator: dark_gray
-    leading_trailing_space_bg: { attr: n } # no fg, no bg, attr none effectively turns this off
-    header: green_bold
-    empty: blue
-    # Closures can be used to choose colors for specific values.
-    # The value (in this case, a bool) is piped into the closure.
-    # eg) {|| if $in { 'dark_cyan' } else { 'dark_gray' } }
-    bool: dark_cyan
-    int: dark_gray
-    filesize: cyan_bold
-    duration: dark_gray
-    date: purple
-    range: dark_gray
-    float: dark_gray
-    string: dark_gray
-    nothing: dark_gray
-    binary: dark_gray
-    cell-path: dark_gray
-    row_index: green_bold
-    record: dark_gray
-    list: dark_gray
-    block: dark_gray
-    hints: dark_gray
-    search_result: { fg: white bg: red }
-    shape_and: purple_bold
-    shape_binary: purple_bold
-    shape_block: blue_bold
-    shape_bool: light_cyan
-    shape_closure: green_bold
-    shape_custom: green
-    shape_datetime: cyan_bold
-    shape_directory: cyan
-    shape_external: cyan
-    shape_externalarg: green_bold
-    shape_external_resolved: light_purple_bold
-    shape_filepath: cyan
-    shape_flag: blue_bold
-    shape_float: purple_bold
-    # shapes are used to change the cli syntax highlighting
-    shape_garbage: { fg: white bg: red attr: b }
-    shape_glob_interpolation: cyan_bold
-    shape_globpattern: cyan_bold
-    shape_int: purple_bold
-    shape_internalcall: cyan_bold
-    shape_keyword: cyan_bold
-    shape_list: cyan_bold
-    shape_literal: blue
-    shape_match_pattern: green
-    shape_matching_brackets: { attr: u }
-    shape_nothing: light_cyan
-    shape_operator: yellow
-    shape_or: purple_bold
-    shape_pipe: purple_bold
-    shape_range: yellow_bold
-    shape_record: cyan_bold
-    shape_redirection: purple_bold
-    shape_signature: green_bold
-    shape_string: green
-    shape_string_interpolation: cyan_bold
-    shape_table: blue_bold
-    shape_variable: purple
-    shape_vardecl: purple
-    shape_raw_string: light_purple
-}
-
 # External completer example
 # let carapace_completer = {|spans|
 #     carapace $spans.0 nushell ...$spans | from json
@@ -220,8 +153,8 @@ $env.config = {
 
     cursor_shape: {
         emacs: line # block, underscore, line, blink_block, blink_underscore, blink_line, inherit to skip setting cursor shape (line is the default)
-        vi_insert: block # block, underscore, line, blink_block, blink_underscore, blink_line, inherit to skip setting cursor shape (block is the default)
-        vi_normal: underscore # block, underscore, line, blink_block, blink_underscore, blink_line, inherit to skip setting cursor shape (underscore is the default)
+        vi_insert: line # block, underscore, line, blink_block, blink_underscore, blink_line, inherit to skip setting cursor shape (block is the default)
+        vi_normal: block # block, underscore, line, blink_block, blink_underscore, blink_line, inherit to skip setting cursor shape (underscore is the default)
     }
 
     color_config: $dark_theme # if you want a more interesting theme, you can replace the empty record with `$dark_theme`, `$light_theme` or another custom record
@@ -231,7 +164,7 @@ $env.config = {
     buffer_editor: null # command that will be used to edit the current line buffer with ctrl+o, if unset fallback to $env.EDITOR and $env.VISUAL
     use_ansi_coloring: true
     bracketed_paste: true # enable bracketed paste, currently useless on windows
-    edit_mode: emacs # emacs, vi
+    edit_mode: vi # emacs, vi
     shell_integration: {
         # osc2 abbreviates the path if in the home_dir, sets the tab/window title, shows the running command in the tab/window title
         osc2: true
@@ -889,3 +822,5 @@ $env.config = {
         }
     ]
 }
+mkdir ($nu.data-dir | path join "vendor/autoload")
+starship init nu | save -f ($nu.data-dir | path join "vendor/autoload/starship.nu")
diff --git a/users/tao/nushell/env.nu b/users/tao/nushell/env.nu
index c08ac06..9171d7e 100644
--- a/users/tao/nushell/env.nu
+++ b/users/tao/nushell/env.nu
@@ -49,8 +49,8 @@ $env.PROMPT_COMMAND = {|| create_left_prompt }
 # The prompt indicators are environmental variables that represent
 # the state of the prompt
 $env.PROMPT_INDICATOR = {|| " > " }
-$env.PROMPT_INDICATOR_VI_INSERT = {|| " : " }
-$env.PROMPT_INDICATOR_VI_NORMAL = {|| " > " }
+$env.PROMPT_INDICATOR_VI_INSERT = {|| "" }
+$env.PROMPT_INDICATOR_VI_NORMAL = {|| " NOR " }
 $env.PROMPT_MULTILINE_INDICATOR = {|| "::: " }
 
 # Specifies how environment variables are:
diff --git a/users/tao/nushell/extras/alias.nu b/users/tao/nushell/extras/alias.nu
index b67271e..199de9a 100644
--- a/users/tao/nushell/extras/alias.nu
+++ b/users/tao/nushell/extras/alias.nu
@@ -26,9 +26,12 @@ alias jd = jj diff
 alias je = jj edit
 alias jf = jj git fetch
 alias jg = jj git clone --colocate
-alias jm = jj bookmark set main
+# alias jm = jj bookmark set main
 alias jp = jj git push
 alias js = jj status
 alias jw = jj workspace update-stale
 
-
+def jm [] {
+  jj bookmark set main
+  jj git push
+}
diff --git a/users/tao/nushell/extras/stuff.nu b/users/tao/nushell/extras/stuff.nu
index bfd2145..d9534ea 100644
--- a/users/tao/nushell/extras/stuff.nu
+++ b/users/tao/nushell/extras/stuff.nu
@@ -53,7 +53,7 @@ def fixme [] {
     | each {$"($in.text):($in.line_number)"}
     | hx ...$in
 }
-source ~/.cache/starship/init.nu
+# source ~/.cache/starship/init.nu
 # source ~/.cache/carapace/init.nu
 source ~/.zoxide.nu
 def --env z [path: string = "~"] {