diff --git a/modules/filesystem/bm.nu b/modules/filesystem/bm.nu
index 0f8e3a44..80b22009 100644
--- a/modules/filesystem/bm.nu
+++ b/modules/filesystem/bm.nu
@@ -103,7 +103,7 @@ def marks [] {
 }
 
 # Goto your bookmark
-export def-env goto [
+export def --env goto [
   pth: path@marks # Path to "go to"
   ] {
   let prev = $env.PWD
@@ -112,7 +112,7 @@ export def-env goto [
 }
 
 # Experimental use of `input` instead of completion
-export def-env goto_alternative [] {
+export def --env goto_alternative [] {
   let prev = $env.PWD
   list | input list -f | cd $in.path
   change_prev $prev
diff --git a/modules/rbenv/rbenv.nu b/modules/rbenv/rbenv.nu
index aa024443..0e2c79aa 100644
--- a/modules/rbenv/rbenv.nu
+++ b/modules/rbenv/rbenv.nu
@@ -8,7 +8,7 @@ export-env {
     }
 }
 
-export def-env main [
+export def --env main [
 	command?: string@'nu-complete rbenv',
 	...args
 ] {
diff --git a/modules/virtual_environments/auto-venv/venvs/python-venv.nu b/modules/virtual_environments/auto-venv/venvs/python-venv.nu
index f0b3146c..b978f065 100644
--- a/modules/virtual_environments/auto-venv/venvs/python-venv.nu
+++ b/modules/virtual_environments/auto-venv/venvs/python-venv.nu
@@ -5,7 +5,7 @@
 
 # adapted from https://github.com/pypa/virtualenv/blob/46f68d67c79f2280554f47f3c21265b3a1e899a4/src/virtualenv/activation/nushell/activate.nu
 
-export def-env auto-venv-on-enter [
+export def --env auto-venv-on-enter [
     _env: record,
 ] {
 
diff --git a/modules/virtual_environments/conda.nu b/modules/virtual_environments/conda.nu
index 4b06e7db..70fd4f53 100644
--- a/modules/virtual_environments/conda.nu
+++ b/modules/virtual_environments/conda.nu
@@ -1,5 +1,5 @@
 # Activate conda environment
-export def-env activate [
+export def --env activate [
     env_name?: string@'nu-complete conda envs' # name of the environment
 ] {
     let conda_info = (conda info --envs --json | from json)
@@ -73,7 +73,7 @@ export def-env activate [
 }
 
 # Deactivate currently active conda environment
-export def-env deactivate [] {
+export def --env deactivate [] {
     let path_name = if "PATH" in $env { "PATH" } else { "Path" }
     $env.$path_name = $env.CONDA_OLD_PATH
 
diff --git a/modules/virtual_environments/nu_conda/nu_conda.nu b/modules/virtual_environments/nu_conda/nu_conda.nu
index 3134d99a..89a9b4d0 100644
--- a/modules/virtual_environments/nu_conda/nu_conda.nu
+++ b/modules/virtual_environments/nu_conda/nu_conda.nu
@@ -22,7 +22,7 @@ export-env {
   $env.CONDA_CURR = null
 }
 
-export def-env activate [name: string] {
+export def --env activate [name: string] {
   if ($env.CONDA_ROOT | is-empty) {
     print "Neither Conda nor Mamba is valid."
     return
@@ -44,7 +44,7 @@ export def-env activate [name: string] {
   load-env ({CONDA_CURR: $name} | merge $new_path)
 }
 
-export def-env deactivate [] {
+export def --env deactivate [] {
   if ($env.CONDA_ROOT | is-empty) {
     print "Neither Conda nor Mamba is valid."
     return
@@ -55,7 +55,7 @@ export def-env deactivate [] {
   load-env {Path: $env.CONDA_BASE_PATH, PATH: $env.CONDA_BASE_PATH}
 }
 
-export def-env list [] {
+export def --env list [] {
   $env.CONDA_ENVS | 
     flatten | 
     transpose | 
diff --git a/modules/virtual_environments/nu_msvs/nu_msvs.nu b/modules/virtual_environments/nu_msvs/nu_msvs.nu
index 6ff1c2a5..79b88c23 100644
--- a/modules/virtual_environments/nu_msvs/nu_msvs.nu
+++ b/modules/virtual_environments/nu_msvs/nu_msvs.nu
@@ -35,7 +35,7 @@ export-env {
   ] | str join ";")
 }
 
-export def-env activate [
+export def --env activate [
     --host   (-h): string = "x64",    # Host architecture, must be x64 or x86 (case insensitive)
     --target (-t): string = "x64",    # Target architecture, must be x64 or x86 (case insensitive)
     --sdk    (-s): string = "latest"  # Version of Windows SDK, must be "latest" or a valid version string
@@ -133,7 +133,7 @@ export def-env activate [
   hide-env MSVS_INCLUDE_PATH
 }
 
-export def-env deactivate [] {
+export def --env deactivate [] {
   if (($env.MSVS_ROOT | is-empty) or ($env.MSVS_MSVC_ROOT | is-empty)) {
     print "Either Microsoft Visual Studio or MSVC is valid."
     return
diff --git a/modules/weather/timed_weather_run_env.nu b/modules/weather/timed_weather_run_env.nu
index 75cab907..c79904f3 100644
--- a/modules/weather/timed_weather_run_env.nu
+++ b/modules/weather/timed_weather_run_env.nu
@@ -12,7 +12,7 @@ use get-weather.nu get_weather
 $env.WEATHER = (get_weather | upsert last_run_time { (date now | format date '%Y-%m-%d %H:%M:%S %z')})
 
 #command to run at interval
-def-env timed_weather_run [
+def --env timed_weather_run [
     --interval(-i): duration # The interval duration
     ] {
 
diff --git a/modules/weather/weatherdark.nu b/modules/weather/weatherdark.nu
index 27c2828f..a1d65c8e 100644
--- a/modules/weather/weatherdark.nu
+++ b/modules/weather/weatherdark.nu
@@ -3,7 +3,7 @@
 # - Air polution condition using airvisual api
 # - Street address using google maps api
 # - Version 2.0
-export def-env weatherds [] {
+export def --env weatherds [] {
     get_weather (get_location 0)
 }
 
@@ -122,7 +122,7 @@ def get_weather [loc] {
 
 
 # Get weather for right command prompt (set in config.nu)
-export def-env get_weather_by_interval [INTERVAL_WEATHER] {
+export def --env get_weather_by_interval [INTERVAL_WEATHER] {
     let weather_runtime_file = (($env.HOME) | path join .weather_runtime_file.json)
 
     if ($weather_runtime_file | path exists) {
@@ -189,4 +189,4 @@ def get_weather_icon [icon: string] {
      "thunderstorm": {"🌩️"},
      "tornado": {"🌪️"}
     }
-}
\ No newline at end of file
+}
diff --git a/nu-hooks/filesystem/autojump.nu b/nu-hooks/filesystem/autojump.nu
index afaa9d6b..c028e5b9 100644
--- a/nu-hooks/filesystem/autojump.nu
+++ b/nu-hooks/filesystem/autojump.nu
@@ -14,7 +14,7 @@ def autojump_add_to_database [dir] {
         $env.AUTOJUMP_SOURCED = 1
         autojump --add $dir
 }
-def-env j [dir] {
+def --env j [dir] {
         $env.AUTOJUMP_SOURCED = 1
         cd (autojump $dir)
 }
diff --git a/sourced/filesystem/cdpath.nu b/sourced/filesystem/cdpath.nu
index 8abcadf8..1f556d0d 100644
--- a/sourced/filesystem/cdpath.nu
+++ b/sourced/filesystem/cdpath.nu
@@ -115,7 +115,7 @@ module cdpath {
   }
 
   # Change directory with $env.CDPATH
-  export def-env c [dir = "": string@complete] {
+  export def --env c [dir = "": string@complete] {
     let span = (metadata $dir).span
       let default = if $nu.os-info.name == "windows" {
         $env.USERPROFILE
diff --git a/sourced/filesystem/up.nu b/sourced/filesystem/up.nu
index 43a1ddaf..db978193 100755
--- a/sourced/filesystem/up.nu
+++ b/sourced/filesystem/up.nu
@@ -1,7 +1,7 @@
 use std repeat;
 
 # Go up a number of directories
-def-env up [
+def --env up [
     limit = 1: int # The number of directories to go up (default is 1)
   ] {
     cd ("." | repeat ($limit + 1) | str join)
diff --git a/sourced/imaging/imgcat.nu b/sourced/imaging/imgcat.nu
index a503ad48..66e1d3ca 100644
--- a/sourced/imaging/imgcat.nu
+++ b/sourced/imaging/imgcat.nu
@@ -16,11 +16,11 @@ def print_st [] {
     }
 }
 
-def-env b64_encode [fn] {
+def --env b64_encode [fn] {
     open $fn | encode base64
 }
 
-def-env b64_decode [fn] {
+def --env b64_decode [fn] {
     $fn | decode base64 -b
 }
 
@@ -88,4 +88,4 @@ def imgcat [
     } else {
         print $"imgcat: ($filename): No such file or directory"
     }
-}
\ No newline at end of file
+}
diff --git a/sourced/misc/nu_defs.nu b/sourced/misc/nu_defs.nu
index ba1cb266..00f0d5bf 100644
--- a/sourced/misc/nu_defs.nu
+++ b/sourced/misc/nu_defs.nu
@@ -112,7 +112,7 @@ def 'nu-sloc' [] {
 }
 
 #go to dir (via pipe)
-def-env goto [] {
+def --env goto [] {
     let input = $in
     cd (
         if ($input | path type) == file {
@@ -124,12 +124,12 @@ def-env goto [] {
 }
 
 #go to custom bash bin path, must be added last in config.nu
-def-env goto-bash [] {
+def --env goto-bash [] {
     cd ($env.PATH | last)
 }
 
 #cd to the folder where a binary is located
-def-env which-cd [program] {
+def --env which-cd [program] {
   let dir = (which $program | get path | path dirname | str trim)
   cd $dir.0
 }
@@ -415,7 +415,7 @@ def dmy [] {
 }
 
 # create directory and cd into it.
-def-env md [dir] {
+def --env md [dir] {
   mkdir $dir
   cd $dir
 }
diff --git a/sourced/todo.nu b/sourced/todo.nu
index e450b199..a661fb56 100644
--- a/sourced/todo.nu
+++ b/sourced/todo.nu
@@ -2,7 +2,7 @@
 
 # This first command looks for the file with the todo list and
 # prints it to the screen.
-def-env printer [] {
+def --env printer [] {
     let contents = (
         # if you haven't setup this environment var,
         # replace `$env.TODO` with the path to your 
diff --git a/sourced/update-path.nu b/sourced/update-path.nu
index ec6a095c..e5a784c9 100644
--- a/sourced/update-path.nu
+++ b/sourced/update-path.nu
@@ -31,7 +31,7 @@ module update-path {
         | parse-paths
         | append (registry query --hklm 'SYSTEM\CurrentControlSet\Control\Session Manager\Environment'| parse-paths)
     }
-    export def-env update-path [] {
+    export def --env update-path [] {
         $env.Path = ($env.Path|append (get-paths-from-registry)|uniq)
     }
-}
\ No newline at end of file
+}