Refactor Nushell script

jdx · Mar 10, 2024 · 6c90f5c · 6c90f5c
1 parent 5562fcf
commit 6c90f5c
Showing 1 changed file with 20 additions and 21 deletions.
diff --git a/src/shell/nushell.rs b/src/shell/nushell.rs
@@ -26,31 +26,30 @@ impl Shell for Nushell {
 
         formatdoc! {r#"
           export-env {{
-            $env.MISE_SHELL = "nu"
-            
-            $env.config = ($env.config | upsert hooks {{
-                pre_prompt: ($env.config.hooks.pre_prompt ++
-                [{{
-                condition: {{|| "MISE_SHELL" in $env }}
-                code: {{|| mise_hook }}
-                }}])
-                env_change: {{
-                    PWD: ($env.config.hooks.env_change.PWD ++
-                    [{{
-                    condition: {{|| "MISE_SHELL" in $env }}
-                    code: {{|| mise_hook }}
-                    }}])
-                }}
-            }})
+            load-env {{ MISE_SHELL: "nu" }}
+            add-hook pre_prompt {{
+              condition: {{ "MISE_SHELL" in $env }}
+              code: {{ mise_hook }}
+            }}
+            add-hook env_change.PWD {{
+              condition: {{ "MISE_SHELL" in $env }}
+              code: {{ mise_hook }}
+            }}
+          }}
+
+          def --env add-hook [path hook] {{
+            let path = $path | split row . | prepend hooks | into cell-path
+            let hooks = $env.config | get --ignore-errors $path | default []
+            $env.config = ($env.config | upsert $path ($hooks ++ $hook))
           }}
-            
+
           def "parse vars" [] {{
             $in | lines | parse "{{op}},{{name}},{{value}}"
           }}
-            
-          def --wrapped mise [command?: string, --help, ...rest: string] {{
+
+          export def --wrapped main [command?: string, --help, ...rest: string] {{
             let commands = ["shell", "deactivate"]
-            
+
             if ($command == null) {{
               ^"{exe}"
             }} else if ($command == "activate") {{
@@ -63,7 +62,7 @@ impl Shell for Nushell {
               ^"{exe}" $command ...$rest
             }}
           }}
-            
+
           def --env "update-env" [] {{
             for $var in $in {{
               if $var.op == "set" {{