micropython
diff --git a/‎docs/reference/mpremote.rst
Lines changed: 2 additions & 1 deletion b/‎docs/reference/mpremote.rst
Lines changed: 2 additions & 1 deletion
diff --git a/‎tools/mpremote/mpremote/main.py
Lines changed: 31 additions & 17 deletions b/‎tools/mpremote/mpremote/main.py
Lines changed: 31 additions & 17 deletions
@@ -222,7 +222,8 @@ Shortcuts can be defined using the macro system.  Built-in shortcuts are::
 - ``bootloader``: make the device enter its bootloader
 
 Any user configuration, including user-defined shortcuts, can be placed in the file
-``.config/mpremote/config.py``. For example:
+``.config/mpremote/config.py`` (relative to the ``XDG_CONFIG_HOME``, ``HOME``, or ``USERPROFILE`` environment variable). 
+For example:
 
 .. code-block:: python3
 
 
@@ -18,7 +18,8 @@
 """
 
 import argparse
-import os, sys
+import os
+import sys
 from collections.abc import Mapping
 from textwrap import dedent
 
@@ -27,14 +28,14 @@
     do_connect,
     do_disconnect,
     do_edit,
+    do_eval,
+    do_exec,
     do_filesystem,
     do_mount,
-    do_umount,
-    do_exec,
-    do_eval,
-    do_run,
     do_resume,
+    do_run,
     do_soft_reset,
+    do_umount,
 )
 from .mip import do_mip
 from .repl import do_repl
@@ -93,7 +94,9 @@ def _bool_flag(cmd_parser, name, short_name, default, description):
 def argparse_connect():
     cmd_parser = argparse.ArgumentParser(description="connect to given device")
     cmd_parser.add_argument(
-        "device", nargs=1, help="Either list, auto, id:x, port:x, or any valid device name/path"
+        "device",
+        nargs=1,
+        help="Either list, auto, id:x, port:x, or any valid device name/path",
     )
     return cmd_parser
 
@@ -126,7 +129,10 @@ def argparse_repl():
         help="saves a copy of the REPL session to the specified path",
     )
     cmd_parser.add_argument(
-        "--inject-code", type=str, required=False, help="code to be run when Ctrl-J is pressed"
+        "--inject-code",
+        type=str,
+        required=False,
+        help="code to be run when Ctrl-J is pressed",
     )
     cmd_parser.add_argument(
         "--inject-file",
@@ -146,7 +152,11 @@ def argparse_eval():
 def argparse_exec():
     cmd_parser = argparse.ArgumentParser(description="execute the string")
     _bool_flag(
-        cmd_parser, "follow", "f", True, "follow output until the expression completes (default)"
+        cmd_parser,
+        "follow",
+        "f",
+        True,
+        "follow output until the expression completes (default)",
     )
     cmd_parser.add_argument("expr", nargs=1, help="expression to execute")
     return cmd_parser
@@ -155,7 +165,11 @@ def argparse_exec():
 def argparse_run():
     cmd_parser = argparse.ArgumentParser(description="run the given local script")
     _bool_flag(
-        cmd_parser, "follow", "f", True, "follow output until the script completes (default)"
+        cmd_parser,
+        "follow",
+        "f",
+        True,
+        "follow output until the script completes (default)",
     )
     cmd_parser.add_argument("path", nargs=1, help="path to script to execute")
     return cmd_parser
@@ -333,21 +347,21 @@ def load_user_config():
     config.commands = {}
 
     # Get config file name.
-    path = os.getenv("XDG_CONFIG_HOME")
+    path = None
+    for var in ["XDG_CONFIG_HOME", "HOME", "USERPROFILE"]:
+        path = os.getenv(var)
+        if path:
+            break
     if path is None:
-        path = os.getenv("HOME")
-        if path is None:
-            return config
-        path = os.path.join(path, ".config")
-    path = os.path.join(path, _PROG)
-    config_file = os.path.join(path, "config.py")
+        return config
+    config_file = os.path.join(path, ".config", _PROG, "config.py")
 
     # Check if config file exists.
     if not os.path.exists(config_file):
         return config
 
     # Exec the config file in its directory.
-    with open(config_file) as f:
+    with open(config_file, encoding="utf-8") as f:
         config_data = f.read()
     prev_cwd = os.getcwd()
     os.chdir(path)