argparsers: organize paths

ultrabug · Mar 4, 2019 · 9cf03dd · 9cf03dd
1 parent 64e2ef6
commit 9cf03dd
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/py3status/argparsers.py b/py3status/argparsers.py
@@ -29,9 +29,9 @@ def parse_cli_args():
     # respect i3status' file detection order wrt issue #43
     i3status_config_file_candidates = [
         "{}/py3status/py3status.conf".format(xdg_home_path),
-        "{}/.i3status.conf".format(home_path),
         "{}/i3status/config".format(xdg_home_path),
-        "{}/.config/i3/i3status.conf".format(home_path),
+        "{}/i3/i3status.conf".format(xdg_home_path),
+        "{}/.i3status.conf".format(home_path),
         "{}/.i3/i3status.conf".format(home_path),
         "{}/i3status/config".format(xdg_dirs_path),
         "/etc/i3status.conf",
@@ -178,10 +178,9 @@ def _format_action_invocation(self, action):
     if not options.include_paths:
         options.include_paths = [
             "{}/py3status/modules".format(xdg_home_path),
-            "{}/.i3/py3status".format(home_path),
-            "{}/.config/i3/py3status".format(home_path),
             "{}/i3status/py3status".format(xdg_home_path),
             "{}/i3/py3status".format(xdg_home_path),
+            "{}/.i3/py3status".format(home_path),
         ]
 
     include_paths = []

diff --git a/py3status/command.py b/py3status/command.py
@@ -465,10 +465,10 @@ def parse_list_or_docstring(options, sps):
     home_path = os.path.expanduser("~")
     xdg_home_path = os.environ.get("XDG_CONFIG_HOME", "{}/.config".format(home_path))
     options.include_paths = [
-        "{}/.i3/py3status/".format(home_path),
-        "{}/.config/i3/py3status/".format(home_path),
+        "{}/py3status/modules".format(xdg_home_path),
         "{}/i3status/py3status".format(xdg_home_path),
         "{}/i3/py3status".format(xdg_home_path),
+        "{}/.i3/py3status".format(home_path),
     ]
     include_paths = []
     for path in options.include_paths: