diff --git a/.chezmoitemplates/nu-config.nu b/.chezmoitemplates/nu-config.nu
index 357a1cc..1711aa4 100644
--- a/.chezmoitemplates/nu-config.nu
+++ b/.chezmoitemplates/nu-config.nu
@@ -236,34 +236,36 @@ $env.config = {
     use_ansi_coloring: true
     bracketed_paste: true # enable bracketed paste, currently useless on windows
     edit_mode: emacs # 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
-        # osc7 is a way to communicate the path to the terminal, this is helpful for spawning new tabs in the same directory
-        osc7: true
-        # osc8 is also implemented as the deprecated setting ls.show_clickable_links, it shows clickable links in ls output if your terminal supports it. show_clickable_links is deprecated in favor of osc8
-        osc8: true
-        # osc9_9 is from ConEmu and is starting to get wider support. It's similar to osc7 in that it communicates the path to the terminal
-        osc9_9: false
-        # osc133 is several escapes invented by Final Term which include the supported ones below.
-        # 133;A - Mark prompt start
-        # 133;B - Mark prompt end
-        # 133;C - Mark pre-execution
-        # 133;D;exit - Mark execution finished with exit code
-        # This is used to enable terminals to know where the prompt is, the command is, where the command finishes, and where the output of the command is
-        osc133: true
-        # osc633 is closely related to osc133 but only exists in visual studio code (vscode) and supports their shell integration features
-        # 633;A - Mark prompt start
-        # 633;B - Mark prompt end
-        # 633;C - Mark pre-execution
-        # 633;D;exit - Mark execution finished with exit code
-        # 633;E - NOT IMPLEMENTED - Explicitly set the command line with an optional nonce
-        # 633;P;Cwd=<path> - Mark the current working directory and communicate it to the terminal
-        # and also helps with the run recent menu in vscode
-        osc633: true
-        # reset_application_mode is escape \x1b[?1l and was added to help ssh work better
-        reset_application_mode: true
-    }
+    shell_integration: true
+    # {
+    #     # 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
+    #     # osc7 is a way to communicate the path to the terminal, this is helpful for spawning new tabs in the same directory
+    #     osc7: true
+    #     # osc8 is also implemented as the deprecated setting ls.show_clickable_links, it shows clickable links in ls output if your terminal supports it. show_clickable_links is deprecated in favor of osc8
+    #     osc8: true
+    #     # osc9_9 is from ConEmu and is starting to get wider support. It's similar to osc7 in that it communicates the path to the terminal
+    #     osc9_9: false
+    #     # osc133 is several escapes invented by Final Term which include the supported ones below.
+    #     # 133;A - Mark prompt start
+    #     # 133;B - Mark prompt end
+    #     # 133;C - Mark pre-execution
+    #     # 133;D;exit - Mark execution finished with exit code
+    #     # This is used to enable terminals to know where the prompt is, the command is, where the command finishes, and where the output of the command is
+    #     osc133: true
+    #     # osc633 is closely related to osc133 but only exists in visual studio code (vscode) and supports their shell integration features
+    #     # 633;A - Mark prompt start
+    #     # 633;B - Mark prompt end
+    #     # 633;C - Mark pre-execution
+    #     # 633;D;exit - Mark execution finished with exit code
+    #     # 633;E - NOT IMPLEMENTED - Explicitly set the command line with an optional nonce
+    #     # 633;P;Cwd=<path> - Mark the current working directory and communicate it to the terminal
+    #     # and also helps with the run recent menu in vscode
+    #     osc633: true
+    #     # reset_application_mode is escape \x1b[?1l and was added to help ssh work better
+    #     reset_application_mode: true
+    # }
+
     render_right_prompt_on_last_line: false # true or false to enable or disable right prompt to be rendered on last line of the prompt.
     use_kitty_protocol: false # enables keyboard enhancement protocol implemented by kitty console, only if your terminal support this.
     highlight_resolved_externals: false # true enables highlighting of external commands in the repl resolved by which.
@@ -892,4 +894,24 @@ $env.config = {
             event: { edit: selectall }
         }
     ]
-}
\ No newline at end of file
+}
+
+use ~/.cache/starship/init.nu
+source ~/.zoxide.nu
+
+alias ga = git add
+alias gaa = git add --all
+alias gc = git commit
+alias gcam = git commit -a -m
+alias gco = git checkout
+alias gd = git diff
+alias gl = git pull
+alias glg = git lg
+alias gp = git push
+alias grb = git rebase
+alias grba = git rebase --abort
+alias grbc = git rebase --continue
+alias grm = git rm
+alias grmc = git rm --cached
+alias gsh = git show
+alias gst = git status
\ No newline at end of file
diff --git a/.chezmoitemplates/nu-env.nu b/.chezmoitemplates/nu-env.nu
index 4c6a03a..e5a8328 100644
--- a/.chezmoitemplates/nu-env.nu
+++ b/.chezmoitemplates/nu-env.nu
@@ -2,6 +2,8 @@
 #
 # version = "0.91.0"
 
+use std "path add"
+
 def create_left_prompt [] {
     let dir = match (do --ignore-shell-errors { $env.PWD | path relative-to $nu.home-path }) {
         null => $env.PWD
@@ -100,16 +102,16 @@ $env.NU_PLUGIN_DIRS = [
 # source ($nu.default-config-dir | path join 'custom.nu')
 
 $env.ANDROID_HOME = '/Users/michael/Library/Android/sdk'
-$env.PATH = ($env.PATH | split row (char esep) | prepend '/opt/homebrew/bin')
-$env.PATH = ($env.PATH | split row (char esep) | prepend '/usr/local/bin')
-$env.PATH = ($env.PATH | split row (char esep) | prepend '~/go/bin')
-$env.PATH = ($env.PATH | split row (char esep) | prepend '~/opt/flutter/bin')
-$env.PATH = ($env.PATH | split row (char esep) | prepend '~/.nix-profile/bin')
-$env.PATH = ($env.PATH | split row (char esep) | prepend '/nix/var/nix/profiles/default/bin')
-$env.PATH = ($env.PATH | split row (char esep) | prepend `~/.cargo/bin`)
-$env.PATH = ($env.PATH | split row (char esep) | prepend `~/Library/Application Support/fnm/aliases/default/bin/`)
-$env.PATH = ($env.PATH | split row (char esep) | prepend `~/.bun/bin`)
-$env.PATH = ($env.PATH | split row (char esep) | prepend `~/.ghcup/bin`)
+path add '/opt/homebrew/bin'
+path add '/usr/local/bin'
+path add '~/go/bin'
+path add '~/opt/flutter/bin'
+path add '~/.nix-profile/bin'
+path add '/nix/var/nix/profiles/default/bin'
+path add `~/.cargo/bin`
+path add `~/Library/Application Support/fnm/aliases/default/bin/`
+path add `~/.bun/bin`
+path add `~/.ghcup/bin`
 
 mkdir ~/.cache/starship
 starship init nu | save -f ~/.cache/starship/init.nu
diff --git a/AppData/Roaming/nushell/config.nu.tmpl b/AppData/Roaming/nushell/config.nu.tmpl
new file mode 100644
index 0000000..eb8364a
--- /dev/null
+++ b/AppData/Roaming/nushell/config.nu.tmpl
@@ -0,0 +1 @@
+{{- template "nu-config.nu" . -}}
\ No newline at end of file
diff --git a/AppData/Roaming/nushell/env.nu.tmpl b/AppData/Roaming/nushell/env.nu.tmpl
new file mode 100644
index 0000000..2a602cd
--- /dev/null
+++ b/AppData/Roaming/nushell/env.nu.tmpl
@@ -0,0 +1 @@
+{{- template "nu-env.nu" . -}}
\ No newline at end of file